Changeset 8940 for main/waeup.kofa/trunk/src/waeup

Timestamp:

8 Jul 2012, 06:01:16 (12 years ago)

Author:

Henrik Bettermann

Message:

Add 999 to study_levels.

Check conversion of level only if in row.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• batching.py (modified) (1 diff)
• vocabularies.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -425 +425 @@
             StudentStudyCourseProcessor, self).checkConversion(row, mode=mode)
         # We have to check if current_level is in range of certificate.
-        if conv_dict.has_key('certificate'):
-          cert = conv_dict['certificate']
-          if conv_dict['current_level'] < cert.start_level or \
-              conv_dict['current_level'] > cert.end_level+120:
-              errs.append(('current_level','not in range'))
+        if conv_dict.has_key('certificate') and \
+            conv_dict.has_key('current_level'):
+            cert = conv_dict['certificate']
+            level = conv_dict['current_level']
+            if level < cert.start_level or level > cert.end_level+120:
+                errs.append(('current_level','not in range'))
         return errs, inv_errs, conv_dict
 

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

@@ -51 +51 @@
         # default level range
         levels = [level for level in range(100,1000,10) if level % 100 < 30]
+        levels.append(999)
     return levels