Changeset 2464

Timestamp:

28 Oct 2007, 17:42:26 (17 years ago)

Author:

joachim

Message:

fix view

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/payments_view.pt (modified) (1 diff)
• waeup_student/getNextInfo.py (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_epayment/payments_view.pt

@@ -78 +78 @@
             You are not able to pay your schoolfee because: <br />
             <ul>
-              <li tal:repeat="reason info/reasons" />
+              <span tal:repeat="reason info/reasons" tal:omit-tag="">
+                <li tal:content="reason" />
+              </span>
             </ul>
           </div>

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -12 +12 @@
 return the students next info
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 
 info = {}
@@ -26 +31 @@
 if review_state == 'cleared_and_validated':
     info['next_transition'] = "pay_school_fee"
-elif review_state == 'returning' and verdict and level_id and session:
-    info['next_level_id'] = "%s" % (int(level_id) + 100)
-    info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
+elif review_state == 'returning' and verdict and level_id and student_brain.session:
     if int(session_id) > int(context.getSessionId()[0]) -2:
-        info['next_transition'] = "pay_school_fee"
         if verdict not in ('A','B',):
             info['next_level_id'] = level_id
             if not verdict:
-                reasons += "There is no verdict."
+                reasons += "There is no verdict.",
             else:
-                reasons += "Your are not a %s" % verdicts_voc.get('A') 
-                reasons += "or not a %s" % verdicts_voc.get('B') 
+                reasons += "Your are not a %s" % verdicts_voc.get('A'),
+                reasons += "or not a %s" % verdicts_voc.get('B'),
         else:
+            info['next_level_id'] = "%s" % (int(level_id) + 100)
+            info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
             info['next_transition'] = "pay_school_fee"
 info['reasons'] = reasons