Changeset 17445

Timestamp:

22 Jun 2023, 03:54:31 (18 months ago)

Author:

Henrik Bettermann

Message:

Add old school fees.

Location:

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

Files:

• interswitch/browser.py (modified) (2 diffs)
• interswitch/tests.py (modified) (1 diff)
• students/schoolfees_19.csv (added)
• students/schoolfees_20.csv (added)
• students/schoolfees_21.csv (modified) (1 diff)
• students/schoolfees_22.csv (modified) (1 diff)
• students/utils.py (modified) (2 diffs)

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

@@ -94 +94 @@
 reader = csv.DictReader(open(schoolfees_path, 'rb'))
 SCHOOLFEES_21 = {item['code']:item for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), '../students/schoolfees_20.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_20 = {item['code']:item for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), '../students/schoolfees_19.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_19 = {item['code']:item for item in reader}
 
 acceptancefees_path = os.path.join(
@@ -263 +273 @@
 <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 < 2022:
+                if student.entry_session < 2020:
+                    sorted_items = SCHOOLFEES_19[student.certcode].items()
+                elif student.entry_session < 2021:
+                    sorted_items = SCHOOLFEES_20[student.certcode].items()
+                elif student.entry_session < 2022:
                     sorted_items = SCHOOLFEES_21[student.certcode].items()
                 else:

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

@@ -305 +305 @@
             in self.browser.contents)
         self.assertTrue(
-            'item_name="LMS Plus Fee" item_amt="2000000" bank_id="7" acct_num="1022438743"' in self.browser.contents)
+            'item_name="Student Union Dues" item_amt="3000000" bank_id="7" acct_num="1019763348"' in self.browser.contents)
         self.assertTrue(
             'item_name="Tuition" item_amt="9200000" bank_id="7" acct_num="1022438743"' in self.browser.contents)

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

@@ -1 +1 @@
 code,faculty_code,department_code,tuition,edohis,union,access,sport,library,lmsplus,nuga
-CERT1,FAG,ANS,184000,16000,1000,4500,3000,1000,20000,10000
 BAGRANS,FAG,ANS,140500,16000,1000,4500,3000,1000,20000,1000
 BAGRCRS,FAG,CRS,140500,16000,1000,4500,3000,1000,20000,1000

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

@@ -1 +1 @@
 code,faculty_code,department_code,tuition,edohis,union,access,notebook,sport,library,lmsplus,nuga
-CERT1,FAG,ANS,184000,16000,1000,4500,9000,3000,1000,20000,1000
 BAGRANS,FAG,ANS,184000,16000,1000,4500,9000,3000,1000,20000,1000
 BAGRCRS,FAG,CRS,184000,16000,1000,4500,9000,3000,1000,20000,1000

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

@@ -41 +41 @@
 reader = csv.DictReader(open(schoolfees_path, 'rb'))
 SCHOOLFEES_21 = {item['code']:(item['tuition'], item.values()) for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), 'schoolfees_20.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_20 = {item['code']:(item['tuition'], item.values()) for item in reader}
+
+schoolfees_path = os.path.join(
+    os.path.dirname(__file__), 'schoolfees_19.csv')
+reader = csv.DictReader(open(schoolfees_path, 'rb'))
+SCHOOLFEES_19 = {item['code']:(item['tuition'], item.values()) for item in reader}
 
 acceptancefees_path = os.path.join(
@@ -390 +400 @@
                 return _('Study course data are incomplete.'), None
             try:
-                if student.entry_session < 2022:
+                if student.entry_session < 2020:
+                    schoolfees = SCHOOLFEES_19[student.certcode]
+                elif student.entry_session < 2021:
+                    schoolfees = SCHOOLFEES_20[student.certcode]
+                elif student.entry_session < 2022:
                     schoolfees = SCHOOLFEES_21[student.certcode]
                 else: