Changeset 2456 for WAeUP_SRP/base/skins/waeup_student

Timestamp:

28 Oct 2007, 07:09:46 (17 years ago)

Author:

Henrik Bettermann

Message:

mark deprecated vocabulary
use '000' for pre-studies (no longer missing value)
improve fixReturningSession.py (do not replace level by '000')
fix getNextInfo.py
fix logged_in.py

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• getNextInfo.py (modified) (1 diff)
• getStudyCourseInfo.py (modified) (1 diff)
• get_levels_voc.py (deleted)

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -26 +26 @@
     info['next_transition'] = "pay_school_fee"
 elif review_state == 'returning':
-    info['next_level_id'] = "%s" % (int(level_id) + 100)
-    info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
-    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 level_id:
+        info['next_level_id'] = "%s" % (int(level_id) + 100)
+    if session_id:
+        info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
+        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
 
 info['next_session_str'] = context.sessions_voc(next_session_id)

WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

@@ -77 +77 @@
     row = {}
     row['id'] = l
-    #row['title'] = "Level %s" % l
-    row['title'] = context.portal_vocabularies.levels_voc[l]
+    row['title'] = "Level %s" % l
+    #row['title'] = context.portal_vocabularies.levels_voc[l]
     row['url'] = "%s/%s" % (context.absolute_url(),l)
     items.append(row)