Changeset 9649

Timestamp:

16 Nov 2012, 21:56:03 (12 years ago)

Author:

Henrik Bettermann

Message:

Ease customization of MODE_GROUPS.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• students/reports.py (modified) (3 diffs)
• utils/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports.py

@@ -21 +21 @@
 from zope.interface import implementer, Interface
 from waeup.kofa.interfaces import (
-     academic_sessions_vocab, registration_states_vocab)
+    IKofaUtils,
+    academic_sessions_vocab, registration_states_vocab)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.reports import IReport
-
-MODE_GROUPS = {
-    'All':('all',),
-    'Undergraduate Full-Time':('ug_ft',),
-    'Undergraduate Part-Time':('ug_pt',),
-    'Postgraduate Full-Time':('pg_ft',),
-    'Postgraduate Part-Time':('pg_pt',),
-    }
 
 class IStudentReport(IReport):
@@ -68 +61 @@
     result = cat.searchResults(current_session=(session, session))
     table = [[0 for x in xrange(len(states))] for y in xrange(len(fac_codes))]
+    mode_groups = getUtility(IKofaUtils).MODE_GROUPS
     for stud in result:
-        if mode != 'All' and stud.current_mode not in MODE_GROUPS[mode]:
+        if mode != 'All' and stud.current_mode not in mode_groups[mode]:
             continue
         row = fac_codes.index(stud.faccode)
@@ -221 +215 @@
 
     def _set_mode_values(self):
-        self.modes = sorted([(key, key) for key in MODE_GROUPS.keys()])
+        mode_groups = getUtility(IKofaUtils).MODE_GROUPS
+        self.modes = sorted([(key, key) for key in mode_groups.keys()])
         return
 

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

@@ -159 +159 @@
         'gown': 'Gown Hire Fee',
         'application': 'Application Fee'
+        }
+
+    MODE_GROUPS = {
+        'All':('all',),
+        'Undergraduate Full-Time':('ug_ft',),
+        'Undergraduate Part-Time':('ug_pt',),
+        'Postgraduate Full-Time':('pg_ft',),
+        'Postgraduate Part-Time':('pg_pt',),
         }