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

Timestamp:

9 Feb 2012, 16:22:05 (13 years ago)

Author:

Henrik Bettermann

Message:

Add getVerdictsDict method to SIRPUtils which is used to setup the new VerdictSource?.

Location:

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

Files:

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

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

@@ -24 +24 @@
 from waeup.sirp.university.vocabularies import CourseSource, study_modes
 from waeup.sirp.students.vocabularies import (
-  CertificateSource, verdicts, StudyLevelSource,
+  CertificateSource, VerdictSource, StudyLevelSource,
   contextual_reg_num_source, contextual_mat_num_source,
   GenderSource, nats_vocab,
@@ -257 +257 @@
         )
 
-
     entry_mode = schema.Choice(
         title = u'Entry Mode',
@@ -293 +292 @@
     current_verdict = schema.Choice(
         title = u'Current Verdict',
-        source = verdicts,
+        source = VerdictSource(),
         default = '0',
         required = False,
@@ -300 +299 @@
     previous_verdict = schema.Choice(
         title = u'Previous Verdict',
-        source = verdicts,
+        source = VerdictSource(),
         default = '0',
         required = False,
@@ -322 +321 @@
     level_verdict = schema.Choice(
         title = u'Verdict',
-        source = verdicts,
+        source = VerdictSource(),
         default = '0',
         required = False,

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

@@ -25 +25 @@
 from zc.sourcefactory.basic import BasicSourceFactory
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
-from waeup.sirp.interfaces import SimpleSIRPVocabulary
+from waeup.sirp.interfaces import SimpleSIRPVocabulary, ISIRPUtils
 from waeup.sirp.students.lgas import LGAS
 from waeup.sirp.students.nats import NATS
@@ -86 +86 @@
         return title
 
-verdicts = SimpleSIRPVocabulary(
-    ('not yet','0'),
-    ('Successful student','A'),
-    ('Student with carryover courses','B'),
-    ('Student on probation','C'),
-    ('Withdrawn from the faculty','D'),
-    ('Student who were previously on probation','E'),
-    ('Medical case','F'),
-    ('Absent from examination','G'),
-    ('Withheld results','H'),
-    ('Expelled/rusticated/suspended student','I'),
-    ('Temporary withdrawn from the university','J'),
-    ('Unregistered student','K'),
-    ('Referred student','L'),
-    ('Reinstatement','M'),
-    ('Student on transfer','N'),
-    ('NCE-III repeater','O'),
-    ('New 300 level student','X'),
-    ('No previous verdict','Y'),
-    ('Successful student (provisional)','Z'),
-    ('First Class','A1'),
-    ('Second Class Upper','A2'),
-    ('Second Class Lower','A3'),
-    ('Third Class','A4'),
-    ('Pass','A5'),
-    ('Distinction','A6'),
-    ('Credit','A7'),
-    ('Merit','A8'),
-    )
+class VerdictSource(BasicContextualSourceFactory):
+    """A verdicts source delivers all verdicts provided
+    in the portal.
+    """
 
+    def getValues(self, context):
+        self.verdicts_dict = getUtility(ISIRPUtils).getVerdictsDict()
+        return self.verdicts_dict.keys()
+
+    def getToken(self, context, value):
+        return value
+
+    def getTitle(self, context, value):
+        return self.verdicts_dict[value]
 
 class CertificateSource(BasicContextualSourceFactory):