Changeset 7841 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

12 Mar 2012, 08:04:03 (13 years ago)

Author:

Henrik Bettermann

Message:

We don't need methods to fetch dictionaries.

Update interfaces.

Location:

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

Files:

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

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

@@ -552 +552 @@
     def current_mode(self):
         if self.context.certificate is not None:
-            studymodes_dict = getUtility(IKofaUtils).getStudyModesDict()
+            studymodes_dict = getUtility(IKofaUtils).STUDY_MODES_DICT
             return studymodes_dict[self.context.certificate.study_mode]
         return

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

@@ -40 +40 @@
     """
     def getValues(self, context):
-        verdicts_dict = getUtility(IStudentsUtils).getVerdictsDict()
+        verdicts_dict = getUtility(IStudentsUtils).VERDICTS_DICT
         return verdicts_dict.keys()
 
@@ -47 +47 @@
 
     def getTitle(self, context, value):
-        verdicts_dict = getUtility(IStudentsUtils).getVerdictsDict()
+        verdicts_dict = getUtility(IStudentsUtils).VERDICTS_DICT
         return verdicts_dict[value]
 
@@ -55 +55 @@
 
     """
+    def setReturningData(student):
+        """ This method defines what happens after school fee payment
+        depending on the student's senate verdict.
+
+        In the base configuration current level is always increased
+        by 100 no matter which verdict has been assigned.
+        """
+
     def getPaymentDetails(category, student):
         """Get the payment dates of a student for the payment category

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

@@ -177 +177 @@
 
     def setReturningData(self, student):
+        """ This method defines what happens after school fee payment
+        depending on the student's senate verdict.
+
+        In the base configuration current level is always increased
+        by 100 no matter which verdict has been assigned.
+        """
         student['studycourse'].current_level += 100
         student['studycourse'].current_session += 1
@@ -185 +191 @@
 
     def getPaymentDetails(self, category, student):
+        """Get the payment dates of a student for the payment category
+        specified.
+        """
         d = {}
         d['p_item'] = u''
@@ -211 +220 @@
 
     def getAccommodationDetails(self, student):
+        """Determine the accommodation dates of a student.
+        """
         d = {}
         d['error'] = u''
@@ -238 +249 @@
         return d
 
-    # In the standard configuration we select the first bed found,
-    # but can also randomize the selection if we like.
     def selectBed(self, available_beds):
+        """Select a bed from a list of available beds.
+
+        In the base configuration we select the first bed found,
+        but can also randomize the selection if we like.
+        """
         return available_beds[0]
 
     def renderPDF(self, view, filename='slip.pdf',
         student=None, studentview=None, tableheader=None, tabledata=None):
+        """Render pdf slips for various pages.
+        """
         # (0,0),(-1,-1) = whole table
         # (0,0),(0,-1) = first column
@@ -361 +377 @@
         return pdf.getpdfdata()
 
-    def getVerdictsDict(self):
-        """Provide a dictionary of verdicts.
-        """
-        return {
-            '0': 'not yet',
-            'A': 'Successful student',
-            'B': 'Student with carryover courses',
-            'C': 'Student on probation',
-            'D': 'Withdrawn from the faculty',
-            'E': 'Student who were previously on probation',
-            'F': 'Medical case',
-            'G': 'Absent from examination',
-            'H': 'Withheld results',
-            'I': 'Expelled/rusticated/suspended student',
-            'J': 'Temporary withdrawn from the university',
-            'K': 'Unregistered student',
-            'L': 'Referred student',
-            'M': 'Reinstatement',
-            'N': 'Student on transfer',
-            'O': 'NCE-III repeater',
-            'Y': 'No previous verdict',
-            'X': 'New 300 level student',
-            'Z': 'Successful student (provisional)',
-            'A1': 'First Class',
-            'A2': 'Second Class Upper',
-            'A3': 'Second Class Lower',
-            'A4': 'Third Class',
-            'A5': 'Pass',
-            'A6': 'Distinction',
-            'A7': 'Credit',
-            'A8': 'Merit',
-            }
+    VERDICTS_DICT = {
+        '0': 'not yet',
+        'A': 'Successful student',
+        'B': 'Student with carryover courses',
+        'C': 'Student on probation',
+        'D': 'Withdrawn from the faculty',
+        'E': 'Student who were previously on probation',
+        'F': 'Medical case',
+        'G': 'Absent from examination',
+        'H': 'Withheld results',
+        'I': 'Expelled/rusticated/suspended student',
+        'J': 'Temporary withdrawn from the university',
+        'K': 'Unregistered student',
+        'L': 'Referred student',
+        'M': 'Reinstatement',
+        'N': 'Student on transfer',
+        'O': 'NCE-III repeater',
+        'Y': 'No previous verdict',
+        'X': 'New 300 level student',
+        'Z': 'Successful student (provisional)',
+        'A1': 'First Class',
+        'A2': 'Second Class Upper',
+        'A3': 'Second Class Lower',
+        'A4': 'Third Class',
+        'A5': 'Pass',
+        'A6': 'Distinction',
+        'A7': 'Credit',
+        'A8': 'Merit',
+        }