Changeset 2641

Timestamp:

13 Nov 2007, 14:07:36 (17 years ago)

Author:

joachim

Message:

belongs to previous fix for #207

File:

• WAeUP_SRP/base/skins/waeup_student/getStudentLevelsVoc.py (copied) (copied from WAeUP_SRP/base/skins/waeup_student/get_student_levels.py) (1 diff)

WAeUP_SRP/base/skins/waeup_student/getStudentLevelsVoc.py

@@ -10 +10 @@
         pass
 """
+student_id = context.getStudentId()
+if student_id:
+    end_level = int(context.students_catalog(id = student_id)[0].end_level)
+else:
+    end_level = 600
 
 if key is None:
-    return [("%s" % l,"Level %s" % l) for l in range(100,700,100)]
+    levels = [l for l in range(100,end_level+200,10)
+               if l % 100 < 30 and l < end_level + 110]
+    voc = []
+    for l in levels:
+        level_nr,repeat = divmod(l, 100)
+        if level_nr > end_level/100:
+            voc += ("%s" % l,"%s (spillover)" % context.portal_vocabularies.levels.get("%d00" % (level_nr - 1))),
+        elif repeat > 0:
+            voc += ("%s" % l,"%s (on %d. probation)" % 
+                    (context.portal_vocabularies.levels.get("%d00" % (level_nr)),
+                                                            (repeat // 10))),
+        else:
+            voc += ("%s" % l,"%s" % 
+                    (context.portal_vocabularies.levels.get("%d00" % (level_nr)))),
+    return voc
+        
 ikey = int(key)
 level_nr,repeat = divmod(ikey, 100)
 l = []
-student = context.students_catalog(id = context.getStudentId())[0]
 
 level = context.portal_vocabularies.levels.get("%d00" % level_nr)
-if level_nr > int(student.end_level)/100:
+if level_nr > end_level/100:
     return "%s (spillover)" % context.portal_vocabularies.levels.get("%d00" % (level_nr - 1))