Changeset 12955

Timestamp:

16 May 2015, 09:21:45 (10 years ago)

Author:

Henrik Bettermann

Message:

Add more sources viewlets.

Location:

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

Files:

• pages.py (modified) (4 diffs)
• viewlets.py (modified) (9 diffs)

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

@@ -73 +73 @@
 from waeup.kofa.students.catalog import StudentQueryResultItem
 from waeup.kofa.students.interfaces import IStudentsUtils
-from waeup.kofa.students.vocabularies import StudyLevelSource
+from waeup.kofa.students.vocabularies import StudyLevelSource, GenderSource
 
 FORBIDDEN_CHARACTERS = (160,)
@@ -511 +511 @@
         return
 
-    def _set_levels(self):
+    def _set_course_levels(self):
+        vocab_terms = course_levels.by_value.values()
+        self.course_levels = sorted([(x.token, x.title,) for x in vocab_terms])
+        return
+
+    def _set_study_levels(self):
         studylevelsource = StudyLevelSource().factory
-        self.levels = []
+        self.study_levels = []
         for code in studylevelsource.getValues(None):
             title = studylevelsource.getTitle(None, code)
-            self.levels.append((code, title))
+            self.study_levels.append((code, title))
         return
 
@@ -553 +558 @@
         return
 
+    def _set_sex(self):
+        gendersource = GenderSource().factory
+        self.sex = []
+        for sex in gendersource.getValues():
+            title = gendersource.getTitle(sex)
+            self.sex.append((sex, title))
+        return
+
     def update(self):
         self._set_inst_types()
         self._set_sessions()
-        self._set_levels()
+        self._set_course_levels()
+        self._set_study_levels()
         self._set_study_modes()
         self._set_student_states()
@@ -564 +578 @@
         self._set_app_cats()
         self._set_payment_cats()
+        self._set_sex()
 
 class AdministrationPage(KofaPage):

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

@@ -844 +844 @@
 
 class InstTypesSource(grok.Viewlet):
-    """Avalable institution types for the sources overview page.
+    """Available institution types for the sources overview page.
     """
     grok.order(1)
@@ -871 +871 @@
 
 class SessionSource(InstTypesSource):
-    """Avalable sessions for the sources overview page.
+    """Available sessions for the sources overview page.
     """
     grok.order(2)
@@ -878 +878 @@
     title = _('Academic Sessions')
 
+class CourseLevelSource(InstTypesSource):
+    """Available course levels for the sources overview page.
+    """
+    grok.order(3)
+    name = 'CourseLevels'
+    source_name = 'course_levels'
+    title = _('Course Levels')
+
 class StudyLevelSource(InstTypesSource):
-    """Avalable study levels for the sources overview page.
-    """
-    grok.order(3)
-    name = 'Levels'
-    source_name = 'levels'
+    """Available study levels for the sources overview page.
+    """
+    grok.order(4)
+    name = 'StudyLevels'
+    source_name = 'study_levels'
     title = _('Study Levels')
 
 class StudyModeSource(InstTypesSource):
-    """Avalable study modes for the sources overview page.
-    """
-    grok.order(4)
+    """Available study modes for the sources overview page.
+    """
+    grok.order(5)
     name = 'StudyModes'
     source_name = 'study_modes'
@@ -895 +903 @@
 
 class AppCatsSource(InstTypesSource):
-    """Avalable application categories for the sources overview page.
+    """Available application categories for the sources overview page.
     """
     grok.order(5)
@@ -902 +910 @@
     title = _('Application Categories')
 
+class PaymentCatsSource(InstTypesSource):
+    """Available payment categories for the sources overview page.
+    """
+    grok.order(6)
+    name = 'PaymentCats'
+    source_name = 'payment_cats'
+    title = _('Payment Categories')
+
 class StudentStatesSource(InstTypesSource):
-    """Avalable student sates for the sources overview page.
+    """Available student sates for the sources overview page.
     """
     grok.order(1)
@@ -913 +929 @@
 
 class VerdictsSource(InstTypesSource):
-    """Avalable verdicts for the sources overview page.
+    """Available verdicts for the sources overview page.
     """
     grok.order(2)
@@ -922 +938 @@
     title = _('Verdicts')
 
-class PaymentCatsSource(InstTypesSource):
-    """Avalable payment categories for the sources overview page.
-    """
-    grok.order(3)
-    grok.viewletmanager(SourcesRight)
-    column = 'right'
-    name = 'PaymentCats'
-    source_name = 'payment_cats'
-    title = _('Payment Categories')
-
 class ExamSubjectsSource(InstTypesSource):
-    """Avalable exam subjects for the sources overview page.
+    """Available exam subjects for the sources overview page.
     """
     grok.order(4)
@@ -943 +949 @@
 
 class ExamGradesSource(InstTypesSource):
-    """Avalable exam grades for the sources overview page.
+    """Available exam grades for the sources overview page.
     """
     grok.order(5)
@@ -952 +958 @@
     title = _('Exam Grades')
 
+class SexSource(InstTypesSource):
+    """Available sex values for the sources overview page.
+    """
+    grok.order(6)
+    grok.viewletmanager(SourcesRight)
+    column = 'right'
+    name = 'Sex'
+    source_name = 'sex'
+    title = _('Sex')
+