Ignore:
Timestamp:
22 Jun 2020, 11:24:14 (5 years ago)
Author:
Henrik Bettermann
Message:

Change sports and library fee options again.

Location:
main/waeup.aaue/trunk/src/waeup/aaue
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

    r16123 r16124  
    471471                amount += gateway_net_amt(academic_session.ict_fee)
    472472        elif category == 'sports_library': # temporarily in 2020
    473             amount = academic_session.sports_fee + gateway_net_amt(
    474                 academic_session.library_pg_fee)
     473            if student.is_postgrad:
     474                amount = academic_session.sports_fee + gateway_net_amt(
     475                    academic_session.library_pg_fee)
     476            else:
     477                amount = academic_session.sports_fee + gateway_net_amt(
     478                    academic_session.library_fee)
    475479        elif not student.is_postgrad:
    476480            fee_name = category + '_fee'
  • main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

    r16123 r16124  
    6969        'restitution': 'Restitution Fee',
    7070        'sports': 'Sports Fee',
    71         'library': 'Library Fee UG',
    72         'library_pg': 'Library Fee PG',
    73         'sports_library': 'Sports Development and PG Library Fee',
     71        'library': 'UG Library Fee',
     72        'library_pg': 'PG Library Fee',
     73        'sports_library': 'Sports Development and Library Fee',
    7474        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
    7575        'lab_2': 'Laboratory Due (BIO101/BIO111)',
     
    106106        'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
    107107        'restitution': 'Restitution Fee',
    108         #'sports': 'Sports Fee',
    109         #'library': 'Library Fee UG',
    110         #'library_pg': 'Library Fee PG',
    111         'sports_library': 'Sports Development and PG Library Fee',
     108        'sports': 'Sports Fee',
     109        'library': 'UG Library Fee',
     110        'library_pg': 'PG Library Fee',
     111        'sports_library': 'Sports Development and Library Fee',
    112112        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
    113113        'lab_2': 'Laboratory Due (BIO101/BIO111)',
     
    123123        'schoolfee': 'School Fee',
    124124        'late_registration': 'Late Course Registration Fee',
    125         #'library_pg': 'Library Fee PG',
    126         'sports_library': 'Sports Development and PG Library Fee',
     125        'sports': 'Sports Fee',
     126        'library': 'UG Library Fee',
     127        'library_pg': 'PG Library Fee',
     128        'sports_library': 'Sports Development and Library Fee',
    127129        }
    128130
     
    132134        'schoolfee_1': 'School Fee (1st instalment)',
    133135        'schoolfee_2': 'School Fee (2nd instalment)',
    134         #'sports': 'Sports Fee',
    135         #'library': 'Library Fee UG',
    136         'sports_library': 'Sports Development and PG Library Fee',
     136        'sports': 'Sports Fee',
     137        'library': 'UG Library Fee',
     138        'library_pg': 'PG Library Fee',
     139        'sports_library': 'Sports Development and Library Fee',
    137140        }
    138141
     
    149152        'gst_text_book_3': 'Text Book Fee GST222',
    150153        'late_registration': 'Late Course Registration Fee',
    151         #'sports': 'Sports Fee',
    152         #'library': 'Library Fee UG',
    153         'sports_library': 'Sports Development and PG Library Fee',
     154        'sports': 'Sports Fee',
     155        'library': 'UG Library Fee',
     156        'library_pg': 'PG Library Fee',
     157        'sports_library': 'Sports Development and Library Fee',
    154158        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
    155159        'lab_2': 'Laboratory Due (BIO101/BIO111)',
Note: See TracChangeset for help on using the changeset viewer.