Changeset 16123 for main


Ignore:
Timestamp:
18 Jun 2020, 20:29:14 (5 years ago)
Author:
Henrik Bettermann
Message:

It seems that only PG students can pay sports and library fee individually.

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

Legend:

Unmodified
Added
Removed

  • main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

    r16080 r16123  
    260260        )
    261261
     262    # Is being calculated in utils.py
    262263    #sports_library_fee = schema.Float(
    263     #    title = _(u'Sports Development and UG Library Fee'),
     264    #    title = _(u'Sports Development and PG Library Fee'),
    264265    #    default = 0.0,
    265266    #    required = True,

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

    r16033 r16123  
    470470            if student.entry_session >= 2019:
    471471                amount += gateway_net_amt(academic_session.ict_fee)
    472         elif category == ('sports_library'): # temporarily in 2020
    473                 amount = 4200.0
     472        elif category == 'sports_library': # temporarily in 2020
     473            amount = academic_session.sports_fee + gateway_net_amt(
     474                academic_session.library_pg_fee)
    474475        elif not student.is_postgrad:
    475476            fee_name = category + '_fee'

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

    r16080 r16123  
    7171        'library': 'Library Fee UG',
    7272        'library_pg': 'Library Fee PG',
    73         'sports_library': 'Sports Development and UG Library Fee',
     73        'sports_library': 'Sports Development and PG Library Fee',
    7474        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
    7575        'lab_2': 'Laboratory Due (BIO101/BIO111)',
    … …  
    109109        #'library': 'Library Fee UG',
    110110        #'library_pg': 'Library Fee PG',
    111         'sports_library': 'Sports Development and UG Library Fee',
     111        'sports_library': 'Sports Development and PG Library Fee',
    112112        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
    113113        'lab_2': 'Laboratory Due (BIO101/BIO111)',
    … …  
    124124        'late_registration': 'Late Course Registration Fee',
    125125        #'library_pg': 'Library Fee PG',
    126         'sports_library': 'Sports Development and UG Library Fee',
     126        'sports_library': 'Sports Development and PG Library Fee',
    127127        }
    128128
    … …  
    134134        #'sports': 'Sports Fee',
    135135        #'library': 'Library Fee UG',
    136         'sports_library': 'Sports Development and UG Library Fee',
     136        'sports_library': 'Sports Development and PG Library Fee',
    137137        }
    138138
    … …  
    151151        #'sports': 'Sports Fee',
    152152        #'library': 'Library Fee UG',
    153         'sports_library': 'Sports Development and UG Library Fee',
     153        'sports_library': 'Sports Development and PG Library Fee',
    154154        'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
    155155        'lab_2': 'Laboratory Due (BIO101/BIO111)',
Note: See TracChangeset for help on using the changeset viewer.