Changeset 3869 for WAeUP_SRP/trunk/skins/waeup_student/getStudentLevelsVoc.py

Timestamp:

22 Jan 2009, 22:15:21 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve ticket #584

File:

• WAeUP_SRP/trunk/skins/waeup_student/getStudentLevelsVoc.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getStudentLevelsVoc.py

@@ -15 +15 @@
 if key is None:
     levels = [l for l in range(0,end_level+200,10)
-               if l % 100 < 30 and l < end_level + 110]
+               if l % 100 < 30 and l < end_level + 120]
     voc = [('','')]
     for l in levels:
         level_nr,repeat = divmod(l, 100)
-        if level_nr > end_level/100:
+        if level_nr > end_level/100 and repeat:
+            voc += ("%s" % l,"%s (2nd spillover)" % context.portal_vocabularies.levels.get("%d00" % (level_nr - 1))),
+        elif level_nr > end_level/100:
             voc += ("%s" % l,"%s (spillover)" % context.portal_vocabularies.levels.get("%d00" % (level_nr - 1))),
         elif repeat > 0:
@@ -41 +43 @@
     raise KeyError
     
-if level_nr > end_level/100:
+if level_nr > end_level/100 and repeat:    
+    return "%s 2nd Spillover" % context.portal_vocabularies.levels.get("%d00" % (level_nr - 1))
+elif level_nr > end_level/100:
     return "%s Spillover" % context.portal_vocabularies.levels.get("%d00" % (level_nr - 1))