Changeset 3961 for WAeUP_SRP

Timestamp:

12 Feb 2009, 07:35:52 (16 years ago)

Author:

Henrik Bettermann

Message:

Widgets.admitOneStudent: entry_session and session must start with '0'
fixSessionKey.py: fix students_catalog, won't be used, because we will import fresh student data with session and entry_session columns. Only 08 students are affected.

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (3 diffs)
• Widgets.py (modified) (2 diffs)
• skins/waeup_utilities/checkApprovedAmount.py (modified) (1 diff)
• skins/waeup_utilities/fixSessionKey.py (added)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -963 +963 @@
             logger.info('no entry_session for %s provided' % (reg_no))
             return
+        else:
+            es = brain.entry_session
+        if len(es) == 1:
+            es = '0%c' % es
 
         if not hasattr(self,"_v_certificates"):
@@ -1042 +1046 @@
 
         #da['entry_session'] = entry_session
-        da['entry_session'] = brain.entry_session
+        da['entry_session'] = es
         da['jamb_lastname'] = brain.lastname
         da['jamb_middlename'] = brain.middlenames   # different field names!
@@ -1106 +1110 @@
         else:
             dsc['current_level'] = '100'
-        dsc['current_session'] = brain.entry_session
+        dsc['current_session'] = es
         studycourse.getContent().edit(mapping=dsc)
         self.do_timing()

WAeUP_SRP/trunk/Widgets.py

@@ -295 +295 @@
             v = str(value)
         except ValueError:
-            datastructure.setError(widget_id, "'%s' not a valid session key" % value)
+            datastructure.setError(widget_id, "'%s' not a valid mode key" % value)
             return 0
         studymodes = self._getStudyModes()
@@ -302 +302 @@
         #import pdb;pdb.set_trace()
         if not studymodes.has_key(value):
-            datastructure.setError(widget_id, "'%s' not a valid session key" % v)
+            datastructure.setError(widget_id, "'%s' not a valid mode key" % v)
             return 0
         if self.is_required and not len(v):
-            datastructure.setError(widget_id, "session key required")
+            datastructure.setError(widget_id, "mode key required")
             return 0
 

WAeUP_SRP/trunk/skins/waeup_utilities/checkApprovedAmount.py

@@ -42 +42 @@
         continue
     counter +=1
-    if counter == 5:
-        break
     logger.info('%s, %s, %s, %s, %s ,%s' % (payment.student_id, payment.order_id, payment.amount, payment.resp_approved_amount, payment.surcharge, payment.resp_desc))