Changeset 13736

Timestamp:

26 Feb 2016, 08:18:15 (9 years ago)

Author:

Henrik Bettermann

Message:

Show certificate-specific p_level value on payment pages.
Ensure that only allowed payment levels can be selected when
adding a balance payment.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/export.py (modified) (2 diffs)
• src/waeup/kofa/students/interfaces.py (modified) (2 diffs)
• src/waeup/kofa/students/payments.py (modified) (2 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.4.2.dev0 (unreleased)
 =======================
+
+* Show certificate-specific p_level value on payment pages.
+  Ensure that only allowed payment levels can be selected when
+  adding a balance payment.
 
 * Add `flash_notice` field.

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

@@ -362 +362 @@
         sorted(iface_names(
             IStudentOnlinePayment, exclude_attribs=False,
-            omit=['display_item']))) + (
+            omit=['display_item', 'certificate']))) + (
             'student_id','state','current_session')
     title = _(u'Student Payments')
@@ -410 +410 @@
         sorted(iface_names(
             IStudentOnlinePayment, exclude_attribs=False,
-            omit=['display_item']))) + (
+            omit=['display_item', 'certificate']))) + (
             'student_id','matric_number','reg_number',
             'firstname', 'middlename', 'lastname',

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

@@ -145 +145 @@
         """
 
-    unique_student_id = Attribute("""A unique student id.""")
+    unique_student_id = Attribute('A unique student id')
 
 class IStudentNavigation(IStudentNavigationBase):
@@ -766 +766 @@
     """
 
+    certificate = Attribute('Certificate to determine the correct p_level value')
+
 class IStudentOnlinePayment(IOnlinePayment):
     """A student payment via payment gateways.
     """
+
+    certificate = Attribute('Certificate to determine the correct p_level value')
 
     p_current = schema.Bool(

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

@@ -47 +47 @@
         return self.__parent__
 
+    @property
+    def certificate(self):
+        try:
+            return self.student['studycourse'].certificate
+        except TypeError:
+            return None
+
     def writeLogMessage(self, view, message):
         return self.__parent__.writeLogMessage(view, message)
@@ -67 +74 @@
             return self.__parent__.__parent__
         except AttributeError:
+            return None
+
+    @property
+    def certificate(self):
+        try:
+            return self.student['studycourse'].certificate
+        except TypeError:
             return None