Ignore:
Timestamp:
21 Jan 2009, 07:59:00 (16 years ago)
Author:
Henrik Bettermann
Message:
  • fix sort order of payment objects
  • reload passport pictures in Okene
Location:
WAeUP_SRP/trunk/skins/waeup_aaue
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/skins/waeup_aaue/getPaymentsFolderInfo.py

    r3841 r3865  
    2626    def set_trace():
    2727        pass
    28 
    29 def cmp_id(a,b):
    30     s1 = "%(id)s" % a
    31     s2 = "%(id)s" % b
    32     if s1 == s2:
    33         return 0
    34     if s1 > s2:
    35         return 1
    36     return -1
    3728
    3829import DateTime
     
    126117    payments.append(row)
    127118
    128 payments.sort(cmp_id)
     119payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
    129120info['payments'] = payments
    130121return info
  • WAeUP_SRP/trunk/skins/waeup_aaue/getSchoolFee.py

    r3841 r3865  
    1616d = {}
    1717
    18 if brain.mode == 'ug_sw': 
    19     if str(brain.level) == '100':    # both 100 fresh and 100 returning who register for 200
    20         d['all'] = 35000
    21     else:
    22         d['all'] = 30000
    23 elif brain.mode == 'pg_sw': 
    24     d['all'] = 35000
    25 elif brain.mode == 'dp_pt': 
    26     if str(brain.level) in ('100',) and brain.review_state == 'cleared_and_validated':    # only 100 fresh
    27         d['all'] = 40000
    28     else:
    29         d['all'] = 35000
    30 elif brain.mode == 'ug_pt': 
    31     if str(brain.level) in ('100','200',) and brain.review_state == 'cleared_and_validated':    # only 100 or 200 fresh
    32         d['all'] = 50000
    33     else:
    34         d['all'] = 45000
    35 elif brain.mode == 'pg_pt': 
    36     if str(brain.level) == '600' and brain.review_state == 'cleared_and_validated':    # only 600 fresh
    37         d['all'] = 60000
    38     elif str(brain.level) == '700' and brain.review_state == 'cleared_and_validated':  # only 700 fresh                                             # going to register for 700
    39         d['all'] = 75000     
    40     elif str(brain.level) == '600' and brain.verdict == 'C':                           # 600 repeaters
    41         d['all'] = 55000
    42     elif str(brain.level) == '600':                                                    # going to register for 700
    43         d['all'] = 75000       
    44     else:
    45         d['all'] = 65000
     18if brain.mode == '': 
     19
     20
     21
     22
    4623else:
    4724    d['all'] = 0
Note: See TracChangeset for help on using the changeset viewer.