Changeset 17444 for main

Timestamp:

21 Jun 2023, 04:37:43 (18 months ago)

Author:

Henrik Bettermann

Message:

Add 2021 school fees.

Location:

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

Files:

• interswitch/browser.py (modified) (2 diffs)
• students/schoolfees_21.csv (added)
• students/schoolfees_22.csv (moved) (moved from main/waeup.aaue/trunk/src/waeup/aaue/students/schoolfees.csv)
• students/utils.py (modified) (5 diffs)

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

@@ -86 +86 @@
 
 schoolfees_path = os.path.join(
-    os.path.dirname(__file__), '../students/schoolfees.csv')
+    os.path.dirname(__file__), '../students/schoolfees_22.csv')
 reader = csv.DictReader(open(schoolfees_path, 'rb'))
-SCHOOLFEES = {item['code']:item for item in reader}
+SCHOOLFEES_22 = {item['code']:item for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), '../students/schoolfees_21.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_21 = {item['code']:item for item in reader}
 
 acceptancefees_path = os.path.join(
@@ -258 +263 @@
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">""" % xmldict
                 item_id = 1
-                sorted_items = SCHOOLFEES[student.certcode].items()
+                if student.entry_session < 2022:
+                    sorted_items = SCHOOLFEES_21[student.certcode].items()
+                else:
+                    sorted_items = SCHOOLFEES_22[student.certcode].items()
                 sorted_items.insert(0, sorted_items.pop(4))
                 for item in sorted_items:

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

@@ -33 +33 @@
 
 schoolfees_path = os.path.join(
-    os.path.dirname(__file__), 'schoolfees.csv')
+    os.path.dirname(__file__), 'schoolfees_22.csv')
 reader = csv.DictReader(open(schoolfees_path, 'rb'))
-SCHOOLFEES = {item['code']:(item['tuition'], item.values()) for item in reader}
+SCHOOLFEES_22 = {item['code']:(item['tuition'], item.values()) for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), 'schoolfees_21.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_21 = {item['code']:(item['tuition'], item.values()) for item in reader}
+
 acceptancefees_path = os.path.join(
     os.path.dirname(__file__), 'acceptancefees.csv')
@@ -356 +362 @@
                     return _("No additional fees required."), None
             try:
-                acceptancefees_entry = ACCEPTANCEFEES[student.certcode]
+                acceptancefees = ACCEPTANCEFEES[student.certcode]
             except KeyError:
                 return _('Acceptance fees not yet fixed.'), None
             if category == 'clearance_incl':
-                for item in acceptancefees_entry[1]:
+                for item in acceptancefees[1]:
                     try:
                         amount += int(item)
@@ -366 +372 @@
                         pass
             else:
-                amount = float(acceptancefees_entry[0])
+                amount = float(acceptancefees[0])
         elif category == 'late_registration':
             if student.is_postgrad:
@@ -384 +390 @@
                 return _('Study course data are incomplete.'), None
             try:
-                schoolfees_entry = SCHOOLFEES[student.certcode]
+                if student.entry_session < 2022:
+                    schoolfees = SCHOOLFEES_21[student.certcode]
+                else:
+                    schoolfees = SCHOOLFEES_22[student.certcode]
             except KeyError:
                 return _('School fees not yet fixed.'), None
@@ -404 +413 @@
                              "to pay by instalments."), None
             additional = 0.0
-            for item in schoolfees_entry[1]:
+            for item in schoolfees[1]:
                 try:
                     additional += int(item)
                 except:
                     pass
-            amount = float(schoolfees_entry[0])
+            amount = float(schoolfees[0])
             additional -= amount
             if previous_session: