Changeset 7837

Timestamp:

11 Mar 2012, 16:00:24 (13 years ago)

Author:

Henrik Bettermann

Message:

Use dictionaries from KofaUtils?.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -80 +80 @@
     )
 
-SUBJECTS = dict(math=_(u'Math'),
-                bio=_(u'Biology'),
-                eng=_(u'English'),
-                )
 class SubjectSource(BasicSourceFactory):
+
     def getValues(self):
-        return sorted(SUBJECTS.keys())
+        subjects_dict = getUtility(IKofaUtils).getExamSubjectsDict()
+        return sorted(subjects_dict.keys())
+
     def getTitle(self, value):
-        return "%s:" % SUBJECTS.get(value, None)
-
-GRADES = {'A':_(u'Very Good'),
-          'B':_(u'Good'),
-          'C':_(u'Satisfactory'),
-          'D':_(u'Sufficient'),
-          'E':_(u'Fail'),
-          }
+        subjects_dict = getUtility(IKofaUtils).getExamSubjectsDict()
+        return "%s:" % subjects_dict[value]
+
 class GradeSource(BasicSourceFactory):
+
     def getValues(self):
-        return sorted(GRADES.keys())
+        grades_dict = getUtility(IKofaUtils).getExamGradesDict()
+        return sorted(grades_dict.keys())
+
     def getTitle(self, value):
-        return GRADES.get(value, None)
+        grades_dict = getUtility(IKofaUtils).getExamGradesDict()
+        return grades_dict[value]
 
 # Define a valiation method for email addresses