Changeset 17446 for main/waeup.aaue

Timestamp:

23 Jun 2023, 04:15:41 (17 months ago)

Author:

Henrik Bettermann

Message:

More old fees.

Location:

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

Files:

• interswitch/browser.py (modified) (2 diffs)
• students/schoolfees_12.csv (added)
• students/schoolfees_13.csv (added)
• students/schoolfees_14.csv (added)
• students/utils.py (modified) (2 diffs)

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

@@ -104 +104 @@
 reader = csv.DictReader(open(schoolfees_path, 'rb'))
 SCHOOLFEES_19 = {item['code']:item for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), '../students/schoolfees_14.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_14 = {item['code']:item for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), '../students/schoolfees_13.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_13 = {item['code']:item for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), '../students/schoolfees_12.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_12 = {item['code']:item for item in reader}
 
 acceptancefees_path = os.path.join(
@@ -273 +288 @@
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">""" % xmldict
                 item_id = 1
-                if student.entry_session < 2020:
+
+                if student.entry_session < 2013:
+                    sorted_items = SCHOOLFEES_12[student.certcode].items()
+                elif student.entry_session < 2013:
+                    sorted_items = SCHOOLFEES_19[student.certcode].items()
+                elif student.entry_session < 2014:
+                    sorted_items = SCHOOLFEES_19[student.certcode].items()
+                elif student.entry_session < 2020:
                     sorted_items = SCHOOLFEES_19[student.certcode].items()
                 elif student.entry_session < 2021:

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

@@ -51 +51 @@
 reader = csv.DictReader(open(schoolfees_path, 'rb'))
 SCHOOLFEES_19 = {item['code']:(item['tuition'], item.values()) for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), 'schoolfees_14.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_14 = {item['code']:(item['tuition'], item.values()) for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), 'schoolfees_13.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_13 = {item['code']:(item['tuition'], item.values()) for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), 'schoolfees_12.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_12 = {item['code']:(item['tuition'], item.values()) for item in reader}
 
 acceptancefees_path = os.path.join(
@@ -400 +415 @@
                 return _('Study course data are incomplete.'), None
             try:
-                if student.entry_session < 2020:
+                if student.entry_session < 2013:
+                    schoolfees = SCHOOLFEES_12[student.certcode]
+                elif student.entry_session < 2014:
+                    schoolfees = SCHOOLFEES_13[student.certcode]
+                elif student.entry_session < 2015:
+                    schoolfees = SCHOOLFEES_14[student.certcode]
+                elif student.entry_session < 2020:
                     schoolfees = SCHOOLFEES_19[student.certcode]
                 elif student.entry_session < 2021: