Changeset 14461 for main/waeup.kofa

Timestamp:

26 Jan 2017, 07:42:39 (8 years ago)

Author:

Henrik Bettermann

Message:

Determine the class of degree which may depend on student parameters in custom packages.

Location:

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

Files:

• interfaces.py (modified) (2 diffs)
• students/utils.py (modified) (3 diffs)

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

@@ -831 +831 @@
         )
 
-    late_registration_fee = schema.Float(
-        title = _(u'Late Course Reg. Fee'),
-        default = 0.0,
-        required = False,
-        )
-
     clearance_fee = schema.Float(
         title = _(u'Acceptance Fee'),
@@ -851 +845 @@
     maint_fee = schema.Float(
         title = _(u'Rent (fallback)'),
+        default = 0.0,
+        required = False,
+        )
+
+    late_registration_fee = schema.Float(
+        title = _(u'Late Course Reg. Fee'),
         default = 0.0,
         required = False,

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

@@ -821 +821 @@
                       (5, '1st Class'))
 
-    def getClassFromCGPA(self, gpa):
+    def getClassFromCGPA(self, gpa, student):
+        """Determine the class of degree. In some custom packages
+        this class depends on e.g. the entry session of the student. In the
+        base package, it does not.
+        """
         if gpa < self.gpa_boundaries[0][0]:
             return 0, self.gpa_boundaries[0][1]
@@ -843 +847 @@
             # No credits weighted
             return 6
-        return self.getClassFromCGPA(level_obj.cumulative_params[0])[0]
+        return self.getClassFromCGPA(
+            level_obj.cumulative_params[0], level_obj.student)[0]
 
     def renderPDFTranscript(self, view, filename='transcript.pdf',
@@ -924 +929 @@
         f_label = Paragraph(f_label, ENTRY1_STYLE)
         f_text = formatted_text('%.3f (%s)' % (
-            transcript_data[1], self.getClassFromCGPA(transcript_data[1])[1]))
+            transcript_data[1], self.getClassFromCGPA(
+                transcript_data[1], student)[1]))
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])