Changeset 7844

Timestamp:

12 Mar 2012, 11:38:09 (13 years ago)

Author:

Henrik Bettermann

Message:

Doing the same (see last revisions) in the applicants package.

Location:

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

Files:

• browser.py (modified) (1 diff)
• interfaces.py (modified) (6 diffs)
• utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -162 +162 @@
         year = data['year']
         code = u'%s%s' % (data['prefix'], year)
-        appcats_dict = getUtility(IApplicantsUtils).getApplicationTypeDict()
+        appcats_dict = getUtility(IApplicantsUtils).APP_TYPES_DICT
         title = appcats_dict[data['prefix']][0]
         title = u'%s %s/%s' % (title, year, year + 1)

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

@@ -105 +105 @@
     def getValues(self, context):
         appcats_dict = getUtility(
-            IApplicantsUtils).getApplicationTypeDict()
+            IApplicantsUtils).APP_TYPES_DICT
         return sorted(appcats_dict.keys())
 
@@ -113 +113 @@
     def getTitle(self, context, value):
         appcats_dict = getUtility(
-            IApplicantsUtils).getApplicationTypeDict()
+            IApplicantsUtils).APP_TYPES_DICT
         return appcats_dict[value][0]
 
@@ -123 +123 @@
 #    def getValues(self, context):
 #        apppins_dict = getUtility(
-#            IApplicantsUtils).getApplicationTypeDict()
+#            IApplicantsUtils).APP_TYPES_DICT
 #        return sorted(appcats_dict.keys())
 #
@@ -131 +131 @@
 #    def getTitle(self, context, value):
 #        apppins_dict = getUtility(
-#            IApplicantsUtils).getApplicationTypeDict()
+#            IApplicantsUtils).APP_TYPES_DICT
 #        return u"%s (%s)" % (
 #            apppins_dict[value][1],self.apppins_dict[value][0])
@@ -176 +176 @@
     """A collection of methods which are subject to customization.
     """
-    pass
+
+    APP_TYPES_DICT = Attribute(' dict of application types')
 
 class IApplicantsRoot(IKofaObject, IContainer):
@@ -465 +466 @@
     """
 
-    history = Attribute('Object history, a list of messages.')
+    history = Attribute('Object history, a list of messages')
     state = Attribute('The application state of an applicant')
     display_fullname = Attribute('The fullname of an applicant')

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

@@ -27 +27 @@
     grok.implements(IApplicantsUtils)
 
-    def getApplicationTypeDict(self):
-        """Provide a dictionary of application types.
-        """
-        return {
-        'pude': ['Post UDE Screening', 'PUDE'],
-        'prence': ['Pre-NCE Programme', 'PRE'],
-        'sandwich': ['Part Time Degree in Education', 'SAND'],
-        'pt': ['Part-Time Degree Programmes', 'PTP'],
-        'pume': ['Post UME Screening Test', 'PUME'],
-        'app': ['General Studies', 'APP'],
-        'cest': ['Common Entry Screening Test', 'CEST'],
-        'ct': ['Certificate Programmes', 'CTP'],
-        'dp': ['Diploma Programmes', 'DPP'],
-        'pce': ['PCE Screening', 'PCE']
-        }
+    APP_TYPES_DICT = {
+      'app': ['General Studies', 'APP'],
+      }