Changeset 3865 for WAeUP_SRP/trunk/skins

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

Files:

• waeup_aaua/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_aaue/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_aaue/getSchoolFee.py (modified) (1 diff)
• waeup_epayment/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_fceokene/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_fceokene/logged_in.py (added)
• waeup_fceoyo/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_futminna/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_ois/getPaymentsFolderInfo.py (modified) (2 diffs)
• waeup_unilorin/getPaymentsFolderInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_aaua/getPaymentsFolderInfo.py

@@ -26 +26 @@
     def set_trace():
         pass
-
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
 
 import DateTime
@@ -126 +117 @@
     payments.append(row)
 
-payments.sort(cmp_id)
+payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
 info['payments'] = payments
 return info

WAeUP_SRP/trunk/skins/waeup_aaue/getPaymentsFolderInfo.py

@@ -26 +26 @@
     def set_trace():
         pass
-
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
 
 import DateTime
@@ -126 +117 @@
     payments.append(row)
 
-payments.sort(cmp_id)
+payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
 info['payments'] = payments
 return info

WAeUP_SRP/trunk/skins/waeup_aaue/getSchoolFee.py

@@ -16 +16 @@
 d = {}
 
-if brain.mode == 'ug_sw':  
-    if str(brain.level) == '100':    # both 100 fresh and 100 returning who register for 200
-        d['all'] = 35000
-    else:
-        d['all'] = 30000
-elif brain.mode == 'pg_sw':  
-    d['all'] = 35000
-elif brain.mode == 'dp_pt':  
-    if str(brain.level) in ('100',) and brain.review_state == 'cleared_and_validated':    # only 100 fresh 
-        d['all'] = 40000
-    else:
-        d['all'] = 35000
-elif brain.mode == 'ug_pt':  
-    if str(brain.level) in ('100','200',) and brain.review_state == 'cleared_and_validated':    # only 100 or 200 fresh 
-        d['all'] = 50000
-    else:
-        d['all'] = 45000
-elif brain.mode == 'pg_pt':  
-    if str(brain.level) == '600' and brain.review_state == 'cleared_and_validated':    # only 600 fresh 
-        d['all'] = 60000
-    elif str(brain.level) == '700' and brain.review_state == 'cleared_and_validated':  # only 700 fresh                                             # going to register for 700
-        d['all'] = 75000      
-    elif str(brain.level) == '600' and brain.verdict == 'C':                           # 600 repeaters
-        d['all'] = 55000
-    elif str(brain.level) == '600':                                                    # going to register for 700
-        d['all'] = 75000        
-    else:
-        d['all'] = 65000
+if brain.mode == '':  
+
+
+
+
 else:
     d['all'] = 0

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -26 +26 @@
     def set_trace():
         pass
-
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
 
 import DateTime
@@ -135 +126 @@
     payments.append(row)
 
-payments.sort(cmp_id)
+payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
 info['payments'] = payments
 return info

WAeUP_SRP/trunk/skins/waeup_fceokene/getPaymentsFolderInfo.py

@@ -26 +26 @@
     def set_trace():
         pass
-
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
 
 import DateTime
@@ -126 +117 @@
     payments.append(row)
 
-payments.sort(cmp_id)
+payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
+
+
 info['payments'] = payments
 return info

WAeUP_SRP/trunk/skins/waeup_fceoyo/getPaymentsFolderInfo.py

@@ -26 +26 @@
     def set_trace():
         pass
-
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
 
 import DateTime
@@ -126 +117 @@
     payments.append(row)
 
-payments.sort(cmp_id)
+payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
 info['payments'] = payments
 return info

WAeUP_SRP/trunk/skins/waeup_futminna/getPaymentsFolderInfo.py

@@ -26 +26 @@
     def set_trace():
         pass
-
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
 
 import DateTime
@@ -127 +118 @@
 
 payments.sort(cmp_id)
-info['payments'] = payments
+payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
 return info
 

WAeUP_SRP/trunk/skins/waeup_ois/getPaymentsFolderInfo.py

@@ -26 +26 @@
     def set_trace():
         pass
-
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
 
 import DateTime
@@ -120 +111 @@
     payments.append(row)
 
-payments.sort(cmp_id)
+payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
 info['payments'] = payments
 return info

WAeUP_SRP/trunk/skins/waeup_unilorin/getPaymentsFolderInfo.py

@@ -26 +26 @@
     def set_trace():
         pass
-
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
 
 import DateTime
@@ -126 +117 @@
     payments.append(row)
 
-payments.sort(cmp_id)
+payments.sort(cmp=lambda x,y: cmp(x['trans_ref'],y['trans_ref']))
 info['payments'] = payments
 return info