Changeset 7617

Timestamp:

9 Feb 2012, 08:04:54 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix getTitle method.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py

@@ -63 +63 @@
     def getTitle(self, context, value):
         if context.certificate is not None:
+            start_level = int(context.certificate.start_level)
             end_level = int(context.certificate.end_level)
         else:
+            start_level = 10
             end_level = 800
+        if value < start_level or value > end_level + 110:
+            return "Error: level id %s out of range" % value
+        if value == 10:
+            return course_levels.by_value[value].title
         level,repeat = divmod(value, 100)
         level = level * 100
@@ -71 +77 @@
         title = course_levels.by_value[level].title
         if level > end_level and repeat:
-            title = course_levels.by_value[level-100].title
-            title = "%s 2nd spillover" % title
-        elif level > end_level:
-            title = course_levels.by_value[level-100].title
-            title = "%s spillover" % title
-        elif repeat:
-            title = "%s on %d. probation" % (title, repeat)
+            title = course_levels.by_value[level - 100].title
+            return "%s 2nd spillover" % title
+        if level > end_level:
+            title = course_levels.by_value[level - 100].title
+            return  "%s spillover" % title
+        if repeat:
+            return "%s on %d. probation" % (title, repeat)
         return title