Changeset 13617 for main/waeup.kofa/trunk/src

Timestamp:

15 Jan 2016, 15:34:03 (9 years ago)

Author:

Henrik Bettermann

Message:

Add DegreeSource? and degree field to Certificate. Plugins must be updated!

Location:

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

Files:

• app.py (modified) (2 diffs)
• browser/pages.py (modified) (4 diffs)
• browser/viewlets.py (modified) (3 diffs)
• university/certificate.py (modified) (2 diffs)
• university/interfaces.py (modified) (2 diffs)
• university/vocabularies.py (modified) (1 diff)
• utils/degrees.py (added)
• utils/utils.py (modified) (2 diffs)

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

@@ -81 +81 @@
         """Lookup all plugins and call their `update()` method.
         """
-        # XXX: TBD: Remove update() in all plugins but documents and users
         getUtility(IKofaPluggable, name='documents').update(
             self, 'documents', self.logger)
@@ -88 +87 @@
         getUtility(IKofaPluggable, name='applicants').update(
             self, 'applicants', self.logger)
+        getUtility(IKofaPluggable, name='certificates').update(
+            self, 'certificates', self.logger)
         return
 attrs_to_fields(University)

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

@@ -580 +580 @@
     def _set_inst_types(self):
         study_modes = getUtility(IKofaUtils).INST_TYPES_DICT
-        self.inst_types = study_modes.items()
+        self.inst_types = sorted(study_modes.items())
         return
 
@@ -603 +603 @@
     def _set_study_modes(self):
         study_modes = getUtility(IKofaUtils).STUDY_MODES_DICT
-        self.study_modes = study_modes.items()
+        self.study_modes = sorted(study_modes.items())
+        return
+
+    def _set_degrees(self):
+        degrees = getUtility(IKofaUtils).DEGREES_DICT
+        self.degrees = sorted(degrees.items())
         return
 
@@ -613 +618 @@
     def _set_verdicts(self):
         verdicts = getUtility(IKofaUtils).VERDICTS_DICT
-        self.verdicts = verdicts.items()
+        self.verdicts = sorted(verdicts.items())
         return
 
@@ -660 +665 @@
         self._set_study_levels()
         self._set_study_modes()
+        self._set_degrees()
         self._set_student_states()
         self._set_verdicts()

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

@@ -925 +925 @@
     title = _('Study Modes')
 
+class DegreeSource(InstTypesSource):
+    """Available study modes for the sources overview page.
+    """
+    grok.order(6)
+    name = 'Degrees'
+    source_name = 'degrees'
+    title = _('Degrees')
+
 class PaymentCatsSource(InstTypesSource):
     """Available payment categories for the sources overview page.
     """
-    grok.order(6)
+    grok.order(7)
     name = 'PaymentCats'
     source_name = 'payment_cats'
@@ -936 +944 @@
     """Available application types for the sources overview page.
     """
-    grok.order(7)
+    grok.order(8)
     name = 'AppTypes'
     source_name = 'app_types'
@@ -944 +952 @@
     """Available application categories for the sources overview page.
     """
-    grok.order(8)
+    grok.order(9)
     name = 'AppCats'
     source_name = 'app_cats'

main/waeup.kofa/trunk/src/waeup/kofa/university/certificate.py

@@ -59 +59 @@
                  school_fee_1=None, school_fee_2=None,
                  school_fee_3=None, school_fee_4=None,
-                 ratio=None,
+                 ratio=None, degree=None,
                  custom_textline_1=None, custom_textline_2=None,
                  custom_float_1=None, custom_float_2=None):
@@ -74 +74 @@
         self.school_fee_4 = school_fee_4
         self.ratio = ratio
+        self.degree = degree
         self.custom_textline_1 = custom_textline_1
         self.custom_textline_2 = custom_textline_2

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

@@ -30 +30 @@
     InstTypeSource,
     SemesterSource,
+    DegreeSource,
     )
 
@@ -173 +174 @@
         default = u'ug_ft',
         required = True,
+        )
+
+    degree = schema.Choice(
+        title = _(u'Degree'),
+        source = DegreeSource(),
+        required = False,
         )
 

main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py

@@ -68 +68 @@
     DICT_NAME = 'STUDY_MODES_DICT'
 
+class DegreeSource(ContextualDictSourceFactoryBase):
+    """A source for certificate degrees
+    """
+    #: name of dict to deliver from kofa utils.
+    DICT_NAME = 'DEGREES_DICT'
+
+    def getTitle(self, context, value):
+        utils = getUtility(IKofaUtils)
+        return "%s (%s)" % (getattr(utils, self.DICT_NAME)[value], value)
+
 class CourseSource(BasicSourceFactory):
     """A course source delivers all courses inside the portal by looking

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

@@ -29 +29 @@
 from waeup.kofa.smtp import send_mail as send_mail_internally
 from waeup.kofa.utils.helpers import get_sorted_preferred
+from waeup.kofa.utils.degrees import DEGREES_DICT
 
 
@@ -87 +88 @@
     #: (e.g. object histories) pdf slips.
     PORTAL_LANGUAGE = 'en'
+
+    DEGREES_DICT = DEGREES_DICT
 
     PREFERRED_LANGUAGES_DICT = {