Changeset 9209 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/vocabularies.py

Timestamp:

20 Sep 2012, 08:49:37 (12 years ago)

Author:

uli

Message:

Merge changes from update branch (includes trunk changes until r9107).

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/students/vocabularies.py (modified) (4 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/students/vocabularies.py

@@ -36 +36 @@
 nats_vocab = SimpleKofaVocabulary(*COUNTRIES)
 
-def study_levels(studycourse):
-    if studycourse.certificate is not None:
-        start_level = int(studycourse.certificate.start_level)
-        end_level = int(studycourse.certificate.end_level)
+def study_levels(context):
+    certificate = getattr(context, 'certificate', None)
+    if  certificate is not None:
+        start_level = int(certificate.start_level)
+        end_level = int(certificate.end_level)
         if start_level == 999 or end_level == 999:
             levels = [999]
@@ -50 +51 @@
     else:
         # default level range
-        levels = [level for level in range(100,1000,10) if level % 100 < 30]
+        levels = [10, ]
+        levels += [level for level in range(100,1000,10) if level % 100 < 30]
+        levels.append(999)
     return levels
 
@@ -68 +71 @@
 
     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)
+        certificate = getattr(context, 'certificate', None)
+        if certificate is not None:
+            start_level = int(certificate.start_level)
+            end_level = int(certificate.end_level)
         else:
             # default level range
-            start_level = 100
+            start_level = 10
             end_level = 1000
         if start_level == 999 or end_level == 999:
@@ -79 +83 @@
                 return _('Error: wrong level id ${value}',
                     mapping={'value': value})
+        if value == 999:
             return course_levels.by_value[999].title
         if value < start_level or value > end_level + 120: