Changeset 2766 for WAeUP_SRP/base/Widgets.py

Timestamp:

26 Nov 2007, 19:18:09 (17 years ago)

Author:

joachim

Message:

M skins/waeup_student/create_level.py
use course_results for carry_overs

M skins/waeup_pins/pins_view.pt
M skins/waeup_pins/search_pins.py
sort batches in select-box

M Widgets.py
M WAeUPTables.py
M WAeUPTool.py
mass_(create,edit)_courseresults edits verdict in level.

M profiles/default/layouts/application_cest.xml
M profiles/default/applicants_catalog.xml
new meta_data field "serial", index must be added manually

File:

• WAeUP_SRP/base/Widgets.py (modified) (7 diffs)

WAeUP_SRP/base/Widgets.py

@@ -24 +24 @@
 #from Products.ExtFile.ExtFile import ExtFile
 import logging,os,re
+import random
 import operator
 p_home = Globals.package_home(globals())
@@ -31 +32 @@
 
 
-class WAeUPPasswordWidget(CPSPasswordWidget):
+class WAeUPPasswordWidget(CPSPasswordWidget): ###(
     """WAeUP Password Widget"""
     meta_type = 'WAeUP Password Widget'
@@ -117 +118 @@
 
 widgetRegistry.register(WAeUPPasswordWidget)
-
+###)
 
 class CPSSelectWidgetForRecord(CPSSelectWidget): ###(
@@ -1320 +1321 @@
 
         while do:
-            ok = pins.searchAndSetRecord(pin,ref,prefix)
+            ok,record = pins.searchAndSetRecord(pin,ref,prefix)
             if ok < -2 or ok > 2:
                 err = 'Unknown error, please report!'
@@ -1473 +1474 @@
     def validate(self, datastructure, **kw): ###(
         """Validate datastructure and update datamodel."""
-        #import pdb;pdb.set_trace()
         s_logger = logging.getLogger('Widgets.ScratchcardPinWidget.validate')
         widget_id = self.getWidgetId()
@@ -1519 +1519 @@
                 s_logger.info('%s/%s entered wrong data together with PIN %s' % (member_id,ref,pin_str))
         while do:
-            ok = pins.searchAndSetRecord(pin,ref,prefix)
+            ok,pin_record = pins.searchAndSetRecord(pin,ref,prefix)
             if ok < -2 or ok > 2:
                 err = 'Unknown error, please report!'
@@ -1556 +1556 @@
                         d['reg_no'] = applicant.reg_no
                         d['pin'] = pin_str
+                        d['serial'] = "%c%05d" % (pin_record.prefix_batch[-1],
+                                                  pin_record.serial)
                         #d['screening_type'] = screening_type
                         #d['status'] = 'entered'