Changeset 6725 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

13 Sep 2011, 07:28:26 (13 years ago)

Author:

Henrik Bettermann

Message:

Replace the static study_levels vocab by a StudyLevelSource?.

The StudyLevelSource? is based on and extends the
course_levels vocabulary defined in the university package.
Repeating study levels are denoted by increments of 10, the
first spillover level by the certificate's end level plus 100
and the second spillover level by the end level plus 110.

Location:

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

Files:

• interfaces.py (modified) (4 diffs)
• vocabularies.py (modified) (2 diffs)

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

@@ -7 +7 @@
 from waeup.sirp.students.vocabularies import (
   year_range, lgas_vocab, CertificateSource, GenderSource,
-  entry_session_vocab, study_levels, verdicts,
+  entry_session_vocab, verdicts, StudyLevelSource,
   )
 
@@ -137 +137 @@
     current_level = schema.Choice(
         title = u'Current Level',
-        source = study_levels,
+        source = StudyLevelSource(),
         default = None,
-        required = True,
+        required = False,
         )
 
@@ -146 +146 @@
         source = verdicts,
         default = None,
-        required = True,
+        required = False,
         )
 
@@ -153 +153 @@
         source = verdicts,
         default = None,
-        required = True,
+        required = False,
         )
 

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

@@ -8 +8 @@
 from waeup.sirp.interfaces import SimpleWAeUPVocabulary
 from waeup.sirp.students.lgas import LGAS
+from waeup.sirp.university.vocabularies import course_levels
 
 def year_range():
@@ -23 +24 @@
     *sorted([(x[1],x[0]) for x in LGAS]))
 
-# This will become a source with probation and
-# splill-over levels too
-study_levels = SimpleWAeUPVocabulary(
-    ('Pre-Studies',0),
-    ('100 (Year 1)',100),
-    ('200 (Year 2)',200),
-    ('300 (Year 3)',300),
-    ('400 (Year 4)',400),
-    ('500 (Year 5)',500),
-    ('600 (Year 6)',600),
-    ('700 (Year 7)',700),
-    ('800 (Year 8)',800),
-    )
+def study_levels(studycourse):
+    try:
+        start_level = int(studycourse.certificate.start_level)
+        end_level = int(studycourse.certificate.end_level)
+        levels = [level for level in range(start_level,end_level+200,10)
+                   if level % 100 < 30 and level < end_level + 120]
+        return levels
+    except AttributeError:
+        return []
+    
+class StudyLevelSource(BasicContextualSourceFactory):
+    """The StudyLevelSource is based on and extends the
+    course_levels vocabulary defined in the university package.
+    Repeating study levels are denoted by increments of 10, the
+    first spillover level by the certificate's end level plus 100
+    and the second spillover level by the end level plus 110.
+    """
+    def getValues(self, context):
+        return study_levels(context)
+
+    def getToken(self, context, value):
+        return str(value)
+
+    def getTitle(self, context, value):
+        end_level = int(context.certificate.end_level)
+        level,repeat = divmod(value, 100)
+        level = level * 100
+        repeat = repeat//10
+        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)
+        return title
 
 verdicts = SimpleWAeUPVocabulary(