Changeset 7772 for main/waeup.sirp/branches

Timestamp:

7 Mar 2012, 09:06:12 (13 years ago)

Author:

uli

Message:

Move grade and subject sources to central interfaces. They are needed in several submodules.

Location:

main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp

Files:

• applicants/interfaces.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)

main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/applicants/interfaces.py

@@ -31 +31 @@
 from waeup.sirp.schema import TextLineChoice
 from waeup.sirp.interfaces import (
-    ISIRPObject, year_range, validate_email, academic_sessions_vocab)
+    ISIRPObject, year_range, validate_email, academic_sessions_vocab,
+    SubjectSource, GradeSource)
 from waeup.sirp.interfaces import MessageFactory as _
 from waeup.sirp.university.vocabularies import (
@@ -79 +80 @@
 directlyProvides(contextual_reg_num_source, IContextSourceBinder)
 
-SUBJECTS = dict(math=_(u'Math'),
-                bio=_(u'Biology'),
-                eng=_(u'English'),
-                )
-class SubjectSource(BasicSourceFactory):
-    def getValues(self):
-        return sorted(SUBJECTS.keys())
-    def getTitle(self, value):
-        return SUBJECTS.get(value, None)
-
-GRADES = {'A':_(u'Very Good'),
-          'B':_(u'Good'),
-          'C':_(u'Satisfactory'),
-          'D':_(u'Sufficient'),
-          'E':_(u'Fail'),
-          }
-class GradeSource(BasicSourceFactory):
-    def getValues(self):
-        return sorted(GRADES.keys())
-    def getTitle(self, value):
-        return GRADES.get(value, None)
 
 class AppCatCertificateSource(CertificateSource):
@@ -384 +364 @@
     #    )
     grade = schema.Choice(
-        title = _(u'Grafde'),
+        title = _(u'Grade'),
         source = GradeSource(),
         )

main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/interfaces.py

@@ -79 +79 @@
     )
 
+SUBJECTS = dict(math=_(u'Math'),
+                bio=_(u'Biology'),
+                eng=_(u'English'),
+                )
+class SubjectSource(BasicSourceFactory):
+    def getValues(self):
+        return sorted(SUBJECTS.keys())
+    def getTitle(self, value):
+        return SUBJECTS.get(value, None)
+
+GRADES = {'A':_(u'Very Good'),
+          'B':_(u'Good'),
+          'C':_(u'Satisfactory'),
+          'D':_(u'Sufficient'),
+          'E':_(u'Fail'),
+          }
+class GradeSource(BasicSourceFactory):
+    def getValues(self):
+        return sorted(GRADES.keys())
+    def getTitle(self, value):
+        return GRADES.get(value, None)
+
 # Define a valiation method for email addresses
 class NotAnEmailAddress(schema.ValidationError):