Ignore:
Timestamp:
23 Jun 2023, 07:36:56 (18 months ago)
Author:
Henrik Bettermann
Message:

Hase further adjustments.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

    r17446 r17447  
    3636from waeup.aaue.students.interfaces import ICustomStudentOnlinePayment
    3737from waeup.aaue.applicants.interfaces import ICustomApplicantOnlinePayment
     38from waeup.aaue.students.utils import SFEECHANGES
    3839from waeup.aaue.interfaces import MessageFactory as _
    3940
     
    8586    }
    8687
    87 schoolfees_path = os.path.join(
    88     os.path.dirname(__file__), '../students/schoolfees_22.csv')
    89 reader = csv.DictReader(open(schoolfees_path, 'rb'))
    90 SCHOOLFEES_22 = {item['code']:item for item in reader}
    91 
    92 schoolfees_path = os.path.join(
    93     os.path.dirname(__file__), '../students/schoolfees_21.csv')
    94 reader = csv.DictReader(open(schoolfees_path, 'rb'))
    95 SCHOOLFEES_21 = {item['code']:item for item in reader}
    96 
    97 schoolfees_path = os.path.join(
    98     os.path.dirname(__file__), '../students/schoolfees_20.csv')
    99 reader = csv.DictReader(open(schoolfees_path, 'rb'))
    100 SCHOOLFEES_20 = {item['code']:item for item in reader}
    101 
    102 schoolfees_path = os.path.join(
    103     os.path.dirname(__file__), '../students/schoolfees_19.csv')
    104 reader = csv.DictReader(open(schoolfees_path, 'rb'))
    105 SCHOOLFEES_19 = {item['code']:item for item in reader}
    106 
    107 schoolfees_path = os.path.join(
    108     os.path.dirname(__file__), '../students/schoolfees_14.csv')
    109 reader = csv.DictReader(open(schoolfees_path, 'rb'))
    110 SCHOOLFEES_14 = {item['code']:item for item in reader}
    111 
    112 schoolfees_path = os.path.join(
    113     os.path.dirname(__file__), '../students/schoolfees_13.csv')
    114 reader = csv.DictReader(open(schoolfees_path, 'rb'))
    115 SCHOOLFEES_13 = {item['code']:item for item in reader}
    116 
    117 schoolfees_path = os.path.join(
    118     os.path.dirname(__file__), '../students/schoolfees_12.csv')
    119 reader = csv.DictReader(open(schoolfees_path, 'rb'))
    120 SCHOOLFEES_12 = {item['code']:item for item in reader}
     88
     89SCHOOLFEES = dict()
     90
     91for year in SFEECHANGES:
     92    schoolfees_path = os.path.join(
     93        os.path.dirname(__file__), '../students/schoolfees_%s.csv' %year)
     94    reader = csv.DictReader(open(schoolfees_path, 'rb'))
     95    SCHOOLFEES[year] = {item['code']:item for item in reader}
    12196
    12297acceptancefees_path = os.path.join(
     
    290265
    291266                if student.entry_session < 2013:
    292                     sorted_items = SCHOOLFEES_12[student.certcode].items()
    293                 elif student.entry_session < 2013:
    294                     sorted_items = SCHOOLFEES_19[student.certcode].items()
     267                    sorted_items = SCHOOLFEES[12][student.certcode].items()
    295268                elif student.entry_session < 2014:
    296                     sorted_items = SCHOOLFEES_19[student.certcode].items()
     269                    sorted_items = SCHOOLFEES[13][student.certcode].items()
     270                elif student.entry_session < 2015:
     271                    sorted_items = SCHOOLFEES[14][student.certcode].items()
    297272                elif student.entry_session < 2020:
    298                     sorted_items = SCHOOLFEES_19[student.certcode].items()
     273                    sorted_items = SCHOOLFEES[19][student.certcode].items()
    299274                elif student.entry_session < 2021:
    300                     sorted_items = SCHOOLFEES_20[student.certcode].items()
     275                    sorted_items = SCHOOLFEES[20][student.certcode].items()
    301276                elif student.entry_session < 2022:
    302                     sorted_items = SCHOOLFEES_21[student.certcode].items()
     277                    sorted_items = SCHOOLFEES[21][student.certcode].items()
    303278                else:
    304                     sorted_items = SCHOOLFEES_22[student.certcode].items()
     279                    sorted_items = SCHOOLFEES[22][student.certcode].items()
    305280                sorted_items.insert(0, sorted_items.pop(4))
    306281                for item in sorted_items:
Note: See TracChangeset for help on using the changeset viewer.