Changeset 2656

Timestamp:

14 Nov 2007, 21:28:30 (17 years ago)

Author:

Henrik Bettermann

Message:

Several modifications made to enable payment for all sessions, all payment modes and both portals I tested all combinations.

'N/A' replaced by in level, verdict and session widgets. A missing value is now always .

Location:

WAeUP_SRP/base

Files:

• WAeUPTool.py (modified) (4 diffs)
• Widgets.py (modified) (2 diffs)
• skins/waeup_accommodation/getAccommodationInfo.py (modified) (2 diffs)
• skins/waeup_epayment/approve_epayment.py (modified) (2 diffs)
• skins/waeup_student/getNextInfo.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -312 +312 @@
         log_after = 100
         for student in res:
-            if not count % log_after: 
+            if not count % log_after:
                 logger.info("processed %d total %d" % (log_after,count))
             count += 1
@@ -357 +357 @@
         csv_writer.writerows(l)
     ###)
-    
+
     security.declareProtected(ManagePortal, 'removeDeletedDocIds') ###(
     def removeDeletedDocIds(self, max=1000):
@@ -630 +630 @@
         else:
             logger.info('matric_no %s not found in results_import' % student.matric_no)
-            level = 0
-            verdict = 'N/A'
+            level = ''
+            verdict = ''
         #student should not be allowed to perform this transition
         #wftool = self.portal_workflow
@@ -838 +838 @@
                                                              brain.reg_no,
                                                              app_picture))
-            
+
         return student_id
     ###)

WAeUP_SRP/base/Widgets.py

@@ -254 +254 @@
 
 class WAeUPSessionWidget(CPSSelectWidget): ###(
-    """WAeUP Session Widget."""
+    """WAeUP Session Widget for import only"""
     meta_type = 'WAeUP Session Widget'
 
     def _getSessions(self):
         current_year = DateTime().year()
-        d = {'-1': 'N/A'}
+        d = {'': ''}
         for y in range(current_year - 9,current_year + 1):
             d['%s' % str(y)[-2:]] = '%4d/%4d' % (y,y+1)
@@ -293 +293 @@
         return 1
 
+    # rendering is not used, instead we use a select widget with dynamic vocabulary
     def render(self, mode, datastructure, **kw):
         """Render in mode from datastructure."""

WAeUP_SRP/base/skins/waeup_accommodation/getAccommodationInfo.py

@@ -64 +64 @@
 info['email']=s_brain.email
 info['level']=s_brain.level
-info['verdict']=getattr(s_brain,"verdict","N/A")
+info['verdict']=getattr(s_brain,'verdict','')
 
 
@@ -90 +90 @@
     info['acco'] = None
     return info
-info['session'] = session = context.getSessionId()  
+info['session'] = session = context.getSessionId()
 acco_id = 'accommodation_' + session[0]
 acco = getattr(student,acco_id,None)

WAeUP_SRP/base/skins/waeup_epayment/approve_epayment.py

@@ -30 +30 @@
 student = getattr(students,student_id)
 
+s_brain = context.students_catalog(id=student_id)[0]
+session = s_brain.session
+
+next_info = context.getNextInfo(s_brain)
+next_session_id = next_info['next_session_id']
+next_session_str = next_info['next_session_str']
+next_level_id = next_info['next_level_id']
+next_transition = next_info['next_transition']
+next_verdict = next_info['next_verdict']
+
 pd = {}
 #from Products.zdb import set_trace;set_trace()
@@ -39 +49 @@
 pd['resp_desc'] = 'Payment approved by %s, %s' % (member,DateTime.DateTime())
 doc.edit(mapping=pd)
+
 if doc.type_description.startswith('School Fee'):
-    wftool.doActionFor(student,'pay_school_fee')
+    study_course = getattr(student,'study_course')
+    try:
+        wftool.doActionFor(study_course,'open')
+    except:
+        pass
+    verdict = s_brain.verdict
+    if verdict == 'N/A':
+        verdict = ''
+    study_course.getContent().edit(mapping= {'current_level': next_level_id,
+                                             'current_session': next_session_id,
+                                             'current_verdict': next_verdict,
+                                             'previous_verdict': verdict,
+                                             })
+    if next_transition:
+        wftool.doActionFor(student,next_transition)
+
 logger.info('%s approves epayment for %s' % (member,student_id))
 wftool.doActionFor(context,'close')

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -42 +42 @@
     info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
     if int(session_id) > 4:
-        info['next_transition'] = "pay_school_fee"
         info['next_verdict'] = ''
         if verdict in ('A','B',):
@@ -48 +47 @@
         else:
             info['next_level_id'] = level_id
+        if int(session_id) > int(context.getSessionId()[0]) -2:
+            info['next_transition'] = "pay_school_fee"
     else:
         info['next_level_id'] = "%s" % (int(level_id) + 100)