Changeset 9133

Timestamp:

31 Aug 2012, 14:54:18 (12 years ago)

Author:

Henrik Bettermann

Message:

When transferring students StudyLevelSource? will be called in the context of a student. Thus study_levels is not necessarily a function of a studycourse.

Location:

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

Files:

• tests/test_vocabularies.py (modified) (1 diff)
• vocabularies.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_vocabularies.py

@@ -21 +21 @@
 
 
-class FakeStudyCourse(object):
+class FakeStudyCourse(dict):
 
-    def __init__(self):
+    def __init__(object):
         cert = Certificate(code="CERT1")
         cert.start_level = 100
         cert.end_level = 500
         self.certificate = cert
+
+    def get(self, attr, default=None):
+        try:
+            return self.__getattribute__(attr)
+        except AttributeError:
+            return default
 
 class VocabularyTests(unittest.TestCase):

main/waeup.kofa/trunk/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):
+    if context.get('certificate', None) is not None:
+        start_level = int(context.certificate.start_level)
+        end_level = int(context.certificate.end_level)
         if start_level == 999 or end_level == 999:
             levels = [999]
@@ -69 +69 @@
 
     def getTitle(self, context, value):
-        if context.certificate is not None:
+        if context.get('certificate', None) is not None:
             start_level = int(context.certificate.start_level)
             end_level = int(context.certificate.end_level)
@@ -80 +80 @@
                 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: