Changeset 18138 for main/waeup.aaue/trunk/src/waeup/aaue/students

Timestamp:

22 Jul 2025, 12:00:44 (2 weeks ago)

Author:

Henrik Bettermann

Message:

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

Location:

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

Files:

• export.py (modified) (2 diffs)
• reports/tests/test_level_report.py (modified) (2 diffs)
• schoolfees_25.csv (added)
• tests/test_export.py (modified) (1 diff)
• utils.py (modified) (2 diffs)

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