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

Timestamp:

22 Feb 2012, 21:14:09 (13 years ago)

Author:

Henrik Bettermann

Message:

Uses sources instead of vocabularies and feed sources with dictionaries defined in SIRPUtils. This way we can easily customize the sources.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• interfaces.py (modified) (3 diffs)
• workflow.py (modified) (1 diff)

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

@@ -44 +44 @@
     FriendlyDateWidget, FriendlyDateDisplayWidget,
     FriendlyDatetimeDisplayWidget)
-from waeup.sirp.university.vocabularies import study_modes
 from waeup.sirp.students.interfaces import (
     IStudentsContainer, IStudent, IStudentClearance,
@@ -533 +532 @@
     def current_mode(self):
         if self.context.certificate is not None:
-            current_mode = study_modes.getTermByToken(
-                self.context.certificate.study_mode).title
-            return current_mode
+            studymodes_dict = getUtility(ISIRPUtils).getStudyModesDict()
+            return studymodes_dict[self.context.certificate.study_mode]
         return
 

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

@@ -22 +22 @@
 from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from waeup.sirp.interfaces import (
-    ISIRPObject, academic_sessions_vocab, validate_email)
+    ISIRPObject, academic_sessions_vocab, validate_email, ISIRPUtils)
 from waeup.sirp.schema import TextLineChoice
-from waeup.sirp.university.vocabularies import CourseSource, study_modes
+from waeup.sirp.university.vocabularies import CourseSource, StudyModeSource
 from waeup.sirp.students.vocabularies import (
   CertificateSource, StudyLevelSource,
@@ -47 +47 @@
     def getTitle(self, context, value):
         return self.verdicts_dict[value]
+
 
 class IStudentsUtils(Interface):
@@ -278 +279 @@
     entry_mode = schema.Choice(
         title = u'Entry Mode',
-        vocabulary = study_modes,
+        source = StudyModeSource(),
         default = u'ug_ft',
         required = True,

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

@@ -182 +182 @@
     """Append message to student history and log file when transition happened.
 
-      Lock and unlock clearance form.
+    Lock and unlock clearance form.
     """