Changeset 17572 for main/kofacustom.iuokada/trunk/src/kofacustom/iuokada

Timestamp:

6 Sep 2023, 05:08:23 (16 months ago)

Author:

Henrik Bettermann

Message:

Re-insert balance table.

Location:

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

Files:

• browser.py (modified) (4 diffs)
• browser_templates/paymentsmanagepage.pt (modified) (1 diff)

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

@@ -263 +263 @@
     def _schoolfee_payments_made(self):
         cs = self.context.student.current_session
+        es = self.context.student.entry_session
         SF_PAYMENTS = ('schoolfee', 'schoolfee40', 'secondinstal', 'clearance')
         sf_paid = dict()
@@ -269 +270 @@
         except (AttributeError, TypeError):
             return sf_paid, 0
-        session = self.context.student.entry_session
+        session = es
         # Initiliaze sf_paid dict with items
-        # session: [school fee in session,, amount paid in session, amount due]
+        # session: [school fee in session, amount paid in session, amount due]
         sf_paid[session] = [getattr(certificate, 'school_fee_1', 0.0), 0.0, 0.0]
         while session < cs + 1:
@@ -290 +291 @@
                ticket.p_category == 'brought_fwd':
                   brought_fwd += ticket.amount_auth
-        # Calculate due, first entry session
-        entry_session = sessions[0]
-        #   amount due in session =  brought forward from previous sessions + school fee in session - amount paid in session
-        sf_paid[entry_session][2] = brought_fwd + sf_paid[entry_session][0] - sf_paid[entry_session][1]
-        for session in sessions[1:]:
+        # Calculate due, first for the entry session
+        # amount due in session =  brought forward from previous sessions + school fees in session - amount paid in session
+        session = es
+        sf_paid[session][2] = brought_fwd + sf_paid[session][0] - sf_paid[session][1]
+        while session < cs + 1:
+            session += 1
             #   amount due in session =  brought forward from previous session + school fee in session - amount paid in session
             sf_paid[session][2] = sf_paid[session-1][2] + sf_paid[session][0] - sf_paid[session][1]
@@ -301 +303 @@
     def update(self):
         super(CustomPaymentsManageFormPage, self).update()
-        #self.sfp_made = self._schoolfee_payments_made()
+        self.sfp_made = self._schoolfee_payments_made()
         return
 

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

@@ -43 +43 @@
     </span>
   </div>
-
+  <br /><br />
+  <p tal:condition="python: True">
+  <strong>Balance Brought Forward:</strong> <span tal:content ="python: view.sfp_made[1]">BROUGHTFORWARD</span>
+  </p>
+  <br />
+  <table class="table" style="width: 50%;" tal:condition="python: True">
+    <thead>
+    <tr>
+      <th i18n:translate="">Session</th>
+      <th i18n:translate="">School Fees</th>
+      <th i18n:translate="">Amount Paid</th>
+      <th i18n:translate="">Amount Due</th>
+    </tr>
+    </thead>
+    <tbody>
+      <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: sfpm[1][0]">FEE</td>
+        <td tal:content ="python: sfpm[1][1]">AMOUNT PAID</td>
+        <td tal:content ="python: sfpm[1][2]">TOTAL AMOUNT DUE</td>
+      </tr>
+    </tbody>
+  </table>
 </form>