Changeset 3760 for WAeUP_SRP/trunk/skins


Ignore:
Timestamp:
12 Nov 2008, 20:46:06 (16 years ago)
Author:
Henrik Bettermann
Message:

second trial to implement new school fee logic

Location:
WAeUP_SRP/trunk/skins
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/skins/waeup_fceokene/getSchoolFee.py

    r3759 r3760  
    2121
    2222if not brain.mode.endswith('_sw'):
     23    # PRENCE
    2324    if str(brain.level) == '000' and brain.review_state == 'cleared_and_validated':
    2425        if brain.department in ARTS:
    … …  
    2627        else:
    2728            d['all'] = 16400
     29    # all repeaters
     30    if brain.verdict == 'C':
     31        if brain.department in ARTS:
     32            d['all'] = 10170
     33        else:
     34            d['all'] = 10645
     35    # NCE I fresh
    2836    elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
    2937        if brain.department in ARTS:
    … …  
    3139        else:
    3240            d['all'] = 13495
    33     elif str(brain.level) == '100' and brain.review_state == 'returning':
     41    # NCE II
     42    elif str(brain.level) in ('100','110','120') and brain.review_state == 'returning':
    3443        if brain.department in ARTS:
    3544            d['all'] = 12070
    3645        else:
    3746            d['all'] = 12545
     47    # NCE III
    3848    elif str(brain.level) in ('200','210','220'):
    3949        if brain.department in ARTS:
    … …  
    4151        else:
    4252            d['all'] = 12545
    43     # repeaters = spillover
    44     elif str(brain.level) in ('300','310','320'):
    45         if brain.department in ARTS:
    46             d['all'] = 10170
    47         else:
    48             d['all'] = 10645
    4953    else:
    50         d['all'] = 0
     54        d['all'] = 0   
     55
    5156else:
    5257    if str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
    … …  
    5560        else:
    5661            d['all'] = 22400
    57     elif str(brain.level) == '100' and brain.review_state == 'returning':
     62    # all repeaters
     63    if brain.verdict == 'C':
     64        if brain.department in ARTS:
     65            d['all'] = 16900
     66        else:
     67            d['all'] = 17400
     68    # NCE II           
     69    elif str(brain.level) in ('100','110','120') and brain.review_state == 'returning':
    5870        if brain.department in ARTS:
    5971            d['all'] = 18400
    6072        else:
    6173            d['all'] = 18900
     74    # NCE III
    6275    elif str(brain.level) in ('200','210','220'):
    6376        if brain.department in ARTS:
    … …  
    6578        else:
    6679            d['all'] = 20900
     80    # NCE IV
    6781    elif str(brain.level) in ('300','310','320'):
    6882        if brain.department in ARTS:
    … …  
    7084        else:
    7185            d['all'] = 18900
    72 
     86    # NCE V
    7387    elif str(brain.level) in ('400','410','420'):
    7488        if brain.department in ARTS:
    … …  
    7690        else:
    7791            d['all'] = 18900
    78 
    79     # repeaters = spillover
    80     elif str(brain.level) in ('500','510','520'):
    81         if brain.department in ARTS:
    82             d['all'] = 16900
    83         else:
    84             d['all'] = 17400
    8592    else:
    8693        d['all'] = 0

  • WAeUP_SRP/trunk/skins/waeup_fceoyo/getSchoolFee.py

    r3759 r3760  
    2121
    2222if not brain.mode.endswith('_sw'):
     23    # PRENCE
    2324    if str(brain.level) == '000' and brain.review_state == 'cleared_and_validated':
    2425        if brain.department in ARTS:
    … …  
    2627        else:
    2728            d['all'] = 15370
     29    # NCE I (fresh)
    2830    elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
    2931        if brain.department in ARTS:
    … …  
    3133        else:
    3234            d['all'] = 10420
    33   # new addition for prence to nce-i students whose fees are different from other nce-i students
     35    # new addition for prence to nce-i students whose fees are different from other nce-i students
    3436    elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated' and brain.entry_mode == 'prence':
    3537        if brain.department in ARTS:
    … …  
    3739        else:
    3840            d['all'] = 14420
    39     elif str(brain.level) == '100' and brain.review_state == 'returning':
     41    # NCE I repeaters
     42    elif str(brain.level) in ('100','110') and brain.review_state == 'returning' and brain.verdict == 'C':
    4043        if brain.department in ARTS:
    4144            d['all'] = 8320
    4245        else:
    4346            d['all'] = 8920
    44     elif str(brain.level) in ('200','210','220'):
     47    # NCE II
     48    elif str(brain.level) in ('100','110','120') and brain.review_state == 'returning':
    4549        if brain.department in ARTS:
    4650            d['all'] = 5450
    4751        else:
    4852            d['all'] = 6050
    49     # repeaters = spillover
    50     elif str(brain.level) == '300':
     53    # NCE II repeaters
     54    elif str(brain.level) in ('200','210') and brain.verdict == 'C':
     55        if brain.department in ARTS:
     56            d['all'] = 5450
     57        else:
     58            d['all'] = 6050 
     59    # NCE III
     60    elif str(brain.level) in ('200','210','220'):
    5161        if brain.department in ARTS:
    5262            d['all'] = 6200
    5363        else:
    5464            d['all'] = 6800
    55     elif str(brain.level) in ('310','320'):
     65    # NCE III repeaters
     66    elif str(brain.level) in ('300','310') and brain.verdict == 'C':
    5667        if brain.department in ARTS:
    5768            d['all'] = 4950
    5869        else:
    5970            d['all'] = 5550           
     71         
    6072    else:
    6173        d['all'] = 0
    6274else:
    63     if str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
    64         if brain.department in ARTS:
    65             d['all'] = 11000
    66         else:
    67             d['all'] = 11000
    68     elif str(brain.level) == '100' and brain.review_state == 'returning':
    69         if brain.department in ARTS:
    70             d['all'] = 11000
    71         else:
    72             d['all'] = 11000
     75    # all repeaters
     76    if brain.verdict == 'C':
     77        d['all'] = 9000
     78    # NCE I
     79    elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
     80        d['all'] = 11000
     81    # NCE II       
     82    elif str(brain.level) in ('100','110','120') and brain.review_state == 'returning':
     83        d['all'] = 10000
     84    # NCE III       
    7385    elif str(brain.level) in ('200','210','220'):
    74         if brain.department in ARTS:
    75             d['all'] = 10000
    76         else:
    77             d['all'] = 10000
     86        d['all'] = 9500
     87    # NCE IV
    7888    elif str(brain.level) in ('300','310','320'):
    79         if brain.department in ARTS:
    80             d['all'] = 9500
    81         else:
    82             d['all'] = 9500
    83 
    84     # repeaters = spillover
    85     elif str(brain.level) in ('400','410','420'):
    86         if brain.department in ARTS:
    87             d['all'] = 9000
    88         else:
    89             d['all'] = 9000
    90 
     89        d['all'] = 9500
    9190    else:
    9291        d['all'] = 0

  • WAeUP_SRP/trunk/skins/waeup_fceoyo/pay_interswitch.py

    r3759 r3760  
    7272p_id = "p%s" % timestamp
    7373info['surcharge'] = interswitch_amount = 300
    74 info['amount'] = amount = fee_dict['all']
     74amount = fee_dict['all']
     75bt_amount = 2000
     76fceoyo_split = 500
     77info['amount'] = amount + bt_amount + fceoyo_split
     78
     79#getSchoolFee provides pure school fee, the other fees have to be added
     80total_amount = 100* (amount + interswitch_amount + bt_amount + fceoyo_split)
    7581
    7682if student_id is None:
    … …  
    127133    args[arg] = info[field]
    128134
    129 bt_amount = 2000
    130 fceoyo_split = 500
    131 
    132 #getSchoolFee provides pure school fee, the other fees have to be added
    133 total_amount = 100* (amount + interswitch_amount + bt_amount + fceoyo_split)       
     135   
    134136
    135137
Note: See TracChangeset for help on using the changeset viewer.