Changeset 18138

Timestamp:

22 Jul 2025, 12:00:44 (22 hours ago)

Author:

Henrik Bettermann

Message:

Add 25 school fees.
Fix tests.
Change format of CGPA.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• applicants/tests/test_browser.py (modified) (2 diffs)
• interswitch/browser.py (modified) (1 diff)
• interswitch/tests.py (modified) (8 diffs)
• students/export.py (modified) (2 diffs)
• students/reports/tests/test_level_report.py (modified) (2 diffs)
• students/schoolfees_25.csv (added)
• students/tests/test_export.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py

@@ -262 +262 @@
         applicantscontainer = ApplicantsContainer()
         applicantscontainer.year = session_1
-        applicantscontainer.application_fee = 200.0
+        applicantscontainer.application_fee = 2000.0
         applicantscontainer.code = u'trans1234'
         applicantscontainer.prefix = 'trans'
@@ -309 +309 @@
         self.browser.getControl("Add online payment ticket").click()
         self.assertTrue('Payment ticket created' in self.browser.contents)
-        self.assertTrue('<span>200.0</span>' in self.browser.contents)
-        self.assertEqual(applicant.values()[0].amount_auth, 200.0)
+        self.assertTrue('<span>5400.0</span>' in self.browser.contents)
+        self.assertEqual(applicant.values()[0].amount_auth, 5400.0)
         return
 

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

@@ -347 +347 @@
                 elif student.entry_session < 2024:
                     sorted_items = SCHOOLFEES[23][student.certcode].items()
+                elif student.entry_session < 2025:
+                    sorted_items = SCHOOLFEES[24][student.certcode].items()
                 else:
-                    sorted_items = SCHOOLFEES[24][student.certcode].items()
+                    sorted_items = SCHOOLFEES[25][student.certcode].items()
                 # Move tuition. We expect that tuition is the fourth element
                 sorted_items.insert(0, sorted_items.pop(3))

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py

@@ -82 +82 @@
         self.assertTrue('Total Amount Authorized:' in self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="1220000" />'
+            '<input type="hidden" name="amount" value="1230000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -227 +227 @@
         self.assertEqual(self.student.current_mode, 'ug_ft')
         self.assertTrue(
-            '<input type="hidden" name="amount" value="22270000" />'
+            '<input type="hidden" name="amount" value="22280000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -250 +250 @@
         self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertTrue(
-            '<input type="hidden" name="amount" value="9220000" />'
+            '<input type="hidden" name="amount" value="9230000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -264 +264 @@
         self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertTrue(
-            '<input type="hidden" name="amount" value="13070000" />'
+            '<input type="hidden" name="amount" value="13080000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -280 +280 @@
         self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertTrue(
-            '<input type="hidden" name="amount" value="9220000" />'
+            '<input type="hidden" name="amount" value="9230000" />'
             in self.browser.contents)
         self.assertTrue(
@@ -302 +302 @@
         self.assertTrue('Total Amount Authorized:' in self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="1850000" />'
+            '<input type="hidden" name="amount" value="1860000" />'
             in self.browser.contents)
         self.assertTrue(self.student['payments'].values()[0].net_amt == 16800)
@@ -319 +319 @@
         self.assertTrue('Total Amount Authorized:' in self.browser.contents)
         self.assertTrue(
-            '<input type="hidden" name="amount" value="1570000" />'
+            '<input type="hidden" name="amount" value="1580000" />'
             in self.browser.contents)
         self.assertTrue(self.student['payments'].values()[1].net_amt == 14000)
@@ -369 +369 @@
         self.assertEqual(self.student.current_mode, 'ug_pt')
         self.assertTrue(
-            '<input type="hidden" name="amount" value="257600" />'
+            '<input type="hidden" name="amount" value="267600" />'
             in self.browser.contents)
         delta = timedelta(days=8)

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

@@ -234 +234 @@
                 value = context.passed_params[2]
             elif name == 'level_gpa':
-                value = format_float(context.gpa_params[0], 3)
+                value = format_float(context.gpa_params[0], 2)
             elif name == 'failed_courses':
                 value = context.passed_params[4]
@@ -244 +244 @@
                 value = context.cumulative_params[4]
             elif name == 'cgpa':
-                value = format_float(context.cumulative_params[0], 3)
+                value = format_float(context.cumulative_params[0], 2)
             elif name == 'remark':
                 value = getattr(context, 'remark', '')

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_level_report.py

@@ -31 +31 @@
         result = lr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'TESTER, Bob', 30, 30, '5.000',
+            [(u'1234', u'TESTER, Bob', 30, 30, '5.00',
                'Nil', 'Nil', 30, 30, '5.000', 'Proceed')])
         return
@@ -70 +70 @@
         result = lr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'TESTER, Bob', 91, 91, '5.000',
+            [(u'1234', u'TESTER, Bob', 91, 91, '5.00',
                'Nil', 'Nil', 91, 91, '5.00', '1s_st_s')])
         return

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_export.py

@@ -223 +223 @@
             'level_gpa,failed_courses,not_taken_courses,cum_credits_taken,'
             'cum_credits_passed,cgpa,remark\r\n'
-            '234,"TESTER, Anna M.",100,2012,0,0,0.000,,CRS1 ,0,0,0.000,\r\n'
+            '234,"TESTER, Anna M.",100,2012,0,0,0.00,,CRS1 ,0,0,0.00,\r\n'
             )
         return

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

@@ -33 +33 @@
 
 SCHOOLFEES = dict()
-SFEECHANGES = (12, 13, 14, 15, 20, 21, 22, 23, 24)
+SFEECHANGES = (12, 13, 14, 15, 20, 21, 22, 23, 24, 25)
 
 for year in SFEECHANGES:
@@ -408 +408 @@
                 elif student.entry_session < 2024:
                     schoolfees = SCHOOLFEES[23][student.certcode]
+                elif student.entry_session < 2025:
+                    schoolfees = SCHOOLFEES[24][student.certcode]
                 else:
-                    schoolfees = SCHOOLFEES[24][student.certcode]
+                    schoolfees = SCHOOLFEES[25][student.certcode]
             except KeyError:
                 return _('School fees not yet fixed.'), None