Changeset 2678 for WAeUP_SRP

Timestamp:

16 Nov 2007, 13:41:44 (17 years ago)

Author:

Henrik Bettermann

Message:

• fix previous_verdict for payments in session 04
• fix missing_data notice

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/interswitch_cb.py (modified) (2 diffs)
• waeup_epayment/pay_by_sc.py (modified) (2 diffs)
• waeup_student/getNextInfo.py (modified) (2 diffs)
• waeup_student/getStudyCourseInfo.py (modified) (2 diffs)
• waeup_student/study_course_view.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_epayment/interswitch_cb.py

@@ -82 +82 @@
 next_transition = next_info['next_transition']
 next_verdict = next_info['next_verdict']
+previous_verdict = next_info['previous_verdict']
 
 if  resp == '00':
@@ -93 +94 @@
             pass
         verdict = s_brain.verdict
-        if verdict == 'N/A':
-            verdict = ''
+        if previous_verdict == 'N/A':
+            previous_verdict = ''
         study_course.getContent().edit(mapping= {'current_level': next_level_id,
                                                  'current_session': next_session_id,
                                                  'current_verdict': next_verdict,
-                                                 'previous_verdict': verdict,
+                                                 'previous_verdict': previous_verdict,
                                                  })
         if next_transition:

WAeUP_SRP/base/skins/waeup_epayment/pay_by_sc.py

@@ -44 +44 @@
 next_transition = next_info['next_transition']
 next_verdict = next_info['next_verdict']
+next_previous_verdict = next_info['next_previous_verdict']
 
 validate = request.has_key("cpsdocument_create_button")
@@ -116 +117 @@
     except:
         pass
-    verdict = s_brain.verdict
     study_course.getContent().edit(mapping= {'current_level': next_level_id,
                                              'current_session': next_session_id,
                                              'current_verdict': next_verdict,
-                                             'previous_verdict': verdict,
+                                             'previous_verdict': next_previous_verdict,
                                              })
     if next_transition:

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -35 +35 @@
 info['next_level_id'] = next_level_id = level_id
 info['next_verdict'] = verdict
+info['next_previous_verdict'] = ''
 verdicts_voc = context.portal_vocabularies.verdicts
 if review_state == 'cleared_and_validated':
@@ -44 +45 @@
         info['next_transition'] = "pay_school_fee"
         info['next_verdict'] = ''
+        info['next_previous_verdict'] = verdict
         if verdict in ('A','B',):
             info['next_level_id'] = "%s" % (int(level_id) + 100)

WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

@@ -94 +94 @@
                current_level == '100' or\
                (sbrain.mode.startswith('de') and current_level == '200'))
-               
+
 missing_data = has_paid and\
                current_level not in levels and\
                not (previous_verdict or sbrain.level) and\
                not (current_level == '100' or\
-               (sbrain.mode.startswith('de') and current_level == '200'))           
+               (sbrain.mode.startswith('de') and current_level == '200'))
 
 info['missing_data'] = missing_data
@@ -105 +105 @@
 info['create_level'] = None
 student_levels_voc = context.portal_vocabularies.student_levels
-if not missing_data:
+if may_register:
     info['create_level'] = current_level
     info['create_level_str'] = student_levels_voc.get(current_level)

WAeUP_SRP/base/skins/waeup_student/study_course_view.pt

@@ -141 +141 @@
     </form>  
     
-    <div tal:condition="not: create_level">
+    <div tal:condition="info/missing_data">
        <font color='red'>
           Your faculty has not yet provided the results and verdict of the previous session.