Changeset 17137

Timestamp:

19 Oct 2022, 21:23:06 (2 years ago)

Author:

Henrik Bettermann

Message:

Show all sf payments. Start with entry session.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students

Files:

• browser.py (modified) (2 diffs)
• browser_templates/paymentsmanagepage.pt (modified) (2 diffs)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/browser.py

@@ -261 +261 @@
     grok.template('paymentsmanagepage')
 
-    @property
-    def manage_payments_allowed(self):
-        return checkPermission('waeup.manageStudent', self.context)
-
-    @property
-    def schoolfee_payments_made(self):
+    def _schoolfee_payments_made(self):
         cs = self.context.student.current_session
         SF_PAYMENTS = ('schoolfee', 'schoolfee40', 'secondinstal', 'clearance')
-        if cs > self.context.student.entry_session:
-            sf_paid = {cs-1: 0.0, cs: 0.0, cs+1: 0.0}
-            sessions = (cs-1, cs, cs+1)
-        else:
-            sf_paid = {cs: 0.0, cs+1: 0.0}
-            sessions = (cs, cs+1)
+        sf_paid = dict()
+        session = self.context.student.entry_session
+        while session < cs + 2:
+            sf_paid[session] = 0.0
+            session += 1
+        sessions = sf_paid.keys()
         try:
             certificate = self.context.student['studycourse'].certificate
@@ -298 +293 @@
                ticket.p_category == 'brought_fwd':
                   brought_fwd += ticket.amount_auth
-        return sf_paid, total_sf, brought_fwd
+        return sorted(sf_paid.items(), key=lambda value: value[0]), total_sf, brought_fwd
+
+    def update(self):
+        super(CustomPaymentsManageFormPage, self).update()
+        self.sfp_made = self._schoolfee_payments_made()
+        return
+
+    @property
+    def manage_payments_allowed(self):
+        return checkPermission('waeup.manageStudent', self.context)
 
 class StudentGetMatricNumberPage(UtilityView, grok.View):

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/browser_templates/paymentsmanagepage.pt

@@ -45 +45 @@
   <br /><br />
   <p>
-  <strong>Balance Brought Forward:</strong> <span tal:content ="python: view.schoolfee_payments_made[2]">BROUGHTFORWARD</span>
+  <strong>Balance Brought Forward:</strong> <span tal:content ="python: view.sfp_made[2]">BROUGHTFORWARD</span>
   </p>
   <br />
@@ -58 +58 @@
     </thead>
     <tbody>
-      <tr tal:repeat="sfpm python: view.schoolfee_payments_made[0].items()">
+      <tr tal:repeat="sfpm python: view.sfp_made[0]">
         <td tal:content ="python: '%s/%s' %(sfpm[0],sfpm[0]+1)">SESSION</td>
-        <td tal:content ="python: view.schoolfee_payments_made[1]">TOTAL</td>
+        <td tal:content ="python: view.sfp_made[1]">TOTAL</td>
         <td tal:content ="python: sfpm[1]">AMOUNT</td>
-        <td tal:content ="python: view.schoolfee_payments_made[1]+view.schoolfee_payments_made[2]-sfpm[1]">DUE</td>
+        <td tal:content ="python: view.sfp_made[1]+view.sfp_made[2]-sfpm[1]">DUE</td>
         
       </tr>