Changeset 7620

Timestamp:

9 Feb 2012, 19:29:24 (13 years ago)

Author:

Henrik Bettermann

Message:

getVerdictsDict should be part of the students package. The only way to reach this ist to move the VerdictSource? to interfaces in order to avoid circular imports.

Location:

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

Files:

• students/interfaces.py (modified) (2 diffs)
• students/utils.py (modified) (1 diff)
• students/vocabularies.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -17 +17 @@
 ##
 from datetime import datetime
+from zope.component import getUtility
 from zope.interface import Attribute, Interface
 from zope import schema
+from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from waeup.sirp.interfaces import (
     ISIRPObject, academic_sessions_vocab, validate_email)
@@ -24 +26 @@
 from waeup.sirp.university.vocabularies import CourseSource, study_modes
 from waeup.sirp.students.vocabularies import (
-  CertificateSource, VerdictSource, StudyLevelSource,
+  CertificateSource, StudyLevelSource,
   contextual_reg_num_source, contextual_mat_num_source,
   GenderSource, nats_vocab,
   )
 from waeup.sirp.payments.interfaces import IPaymentsContainer, IOnlinePayment
+
+# VerdictSource can't be placed into the vocabularies module because it
+# requires importing IStudentsUtils which then leads to circular imports.
+class VerdictSource(BasicContextualSourceFactory):
+    """A verdicts source delivers all verdicts provided
+    in the portal.
+    """
+    def getValues(self, context):
+        self.verdicts_dict = getUtility(IStudentsUtils).getVerdictsDict()
+        return self.verdicts_dict.keys()
+
+    def getToken(self, context, value):
+        return value
+
+    def getTitle(self, context, value):
+        return self.verdicts_dict[value]
 
 class IStudentsUtils(Interface):

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

@@ -338 +338 @@
             'Content-Type', 'application/pdf')
         return pdf.getpdfdata()
+
+    def getVerdictsDict(self):
+        """Provide a dictionary of verdicts.
+        """
+        return {
+            'A1': 'First Class',
+            '0': 'not yet',
+            'A3': 'Second Class Lower',
+            'A2': 'Second Class Upper',
+            'A5': 'Pass',
+            'A4': 'Third Class',
+            'A7': 'Credit',
+            'A6': 'Distinction',
+            'A8': 'Merit',
+            'A': 'Successful student',
+            'C': 'Student on probation',
+            'B': 'Student with carryover courses',
+            'E': 'Student who were previously on probation',
+            'D': 'Withdrawn from the faculty',
+            'G': 'Absent from examination',
+            'F': 'Medical case',
+            'I': 'Expelled/rusticated/suspended student',
+            'H': 'Withheld results',
+            'K': 'Unregistered student',
+            'J': 'Temporary withdrawn from the university',
+            'M': 'Reinstatement',
+            'L': 'Referred student',
+            'O': 'NCE-III repeater',
+            'N': 'Student on transfer',
+            'Y': 'No previous verdict',
+            'X': 'New 300 level student',
+            'Z': 'Successful student (provisional)'}

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, ISIRPUtils
+from waeup.sirp.interfaces import SimpleSIRPVocabulary
 from waeup.sirp.students.lgas import LGAS
 from waeup.sirp.students.nats import NATS
@@ -85 +85 @@
             return "%s on %d. probation" % (title, repeat)
         return title
-
-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):

main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

@@ -108 +108 @@
         return send_mail(
             from_name,from_addr,rcpt_name,rcpt_addr,subject,body,config)
-
-
-    def getVerdictsDict(self):
-        """Provide a dictionary of verdicts.
-        """
-        return {
-            'A1': 'First Class',
-            '0': 'not yet',
-            'A3': 'Second Class Lower',
-            'A2': 'Second Class Upper',
-            'A5': 'Pass',
-            'A4': 'Third Class',
-            'A7': 'Credit',
-            'A6': 'Distinction',
-            'A8': 'Merit',
-            'A': 'Successful student',
-            'C': 'Student on probation',
-            'B': 'Student with carryover courses',
-            'E': 'Student who were previously on probation',
-            'D': 'Withdrawn from the faculty',
-            'G': 'Absent from examination',
-            'F': 'Medical case',
-            'I': 'Expelled/rusticated/suspended student',
-            'H': 'Withheld results',
-            'K': 'Unregistered student',
-            'J': 'Temporary withdrawn from the university',
-            'M': 'Reinstatement',
-            'L': 'Referred student',
-            'O': 'NCE-III repeater',
-            'N': 'Student on transfer',
-            'Y': 'No previous verdict',
-            'X': 'New 300 level student',
-            'Z': 'Successful student (provisional)'}