Changeset 8270

Timestamp:

25 Apr 2012, 06:45:16 (13 years ago)

Author:

Henrik Bettermann

Message:

Set p_level and p_session after school fee payment according to getReturningData.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

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

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

@@ -344 +344 @@
     """A student payment via payment gateways.
 
-    """
+    This Interface does not inherit from IStudentOnlinePayment.
+    Thus all fields from IStudentOnlinePayment have to be repeated here.
+    """
+
+    p_level = schema.Int(
+        title = _(u'Payment Level'),
+        required = False,
+        readonly = True,
+        )
+ICustomStudentOnlinePayment['p_level'].order = ICustomStudentOnlinePayment[
+    'p_session'].order

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

@@ -78 +78 @@
 
     # not yet changed
-    def setReturningData(self, student):
-        student['studycourse'].current_level += 100
-        student['studycourse'].current_session += 1
-        verdict = student['studycourse'].current_verdict
-        student['studycourse'].current_verdict = '0'
-        student['studycourse'].previous_verdict = verdict
-        return
+    def getReturningData(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.
+        """
+        new_level = student['studycourse'].current_level + 100
+        new_session = student['studycourse'].current_session + 1
+        return new_session, new_level
 
     def getPaymentDetails(self, category, student):
@@ -93 +96 @@
         d['p_session'] = student['studycourse'].current_session
         session = str(d['p_session'])
+        d['p_level'] = student['studycourse'].current_level
         try:
             academic_session = grok.getSite()['configuration'][session]
@@ -113 +117 @@
             code = student['studycourse'].certificate.code
             d['p_item'] = code
-            d['p_session'] += 1
+            # In case of school fee payment the payment session and level
+            # contain the values of the session the student has paid for
+            d['p_session'], d['p_level'] = self.getReturningData(student)
         if d['amount'] == 0.0:
             d['error'] = _(u'Amount could not be determined.')