Changeset 3760 for WAeUP_SRP/trunk/skins/waeup_fceoyo

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/waeup_fceoyo

Files:

• getSchoolFee.py (modified) (4 diffs)
• pay_interswitch.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_fceoyo/getSchoolFee.py

@@ -21 +21 @@
 
 if not brain.mode.endswith('_sw'):
+    # PRENCE
     if str(brain.level) == '000' and brain.review_state == 'cleared_and_validated':
         if brain.department in ARTS:
@@ -26 +27 @@
         else:
             d['all'] = 15370
+    # NCE I (fresh)
     elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
         if brain.department in ARTS:
@@ -31 +33 @@
         else:
             d['all'] = 10420
-  # new addition for prence to nce-i students whose fees are different from other nce-i students
+    # new addition for prence to nce-i students whose fees are different from other nce-i students
     elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated' and brain.entry_mode == 'prence':
         if brain.department in ARTS:
@@ -37 +39 @@
         else:
             d['all'] = 14420
-    elif str(brain.level) == '100' and brain.review_state == 'returning':
+    # NCE I repeaters
+    elif str(brain.level) in ('100','110') and brain.review_state == 'returning' and brain.verdict == 'C':
         if brain.department in ARTS:
             d['all'] = 8320
         else:
             d['all'] = 8920
-    elif str(brain.level) in ('200','210','220'):
+    # NCE II
+    elif str(brain.level) in ('100','110','120') and brain.review_state == 'returning':
         if brain.department in ARTS:
             d['all'] = 5450
         else:
             d['all'] = 6050
-    # repeaters = spillover
-    elif str(brain.level) == '300':
+    # NCE II repeaters
+    elif str(brain.level) in ('200','210') and brain.verdict == 'C':
+        if brain.department in ARTS:
+            d['all'] = 5450
+        else:
+            d['all'] = 6050  
+    # NCE III
+    elif str(brain.level) in ('200','210','220'):
         if brain.department in ARTS:
             d['all'] = 6200
         else:
             d['all'] = 6800
-    elif str(brain.level) in ('310','320'):
+    # NCE III repeaters
+    elif str(brain.level) in ('300','310') and brain.verdict == 'C':
         if brain.department in ARTS:
             d['all'] = 4950
         else:
             d['all'] = 5550            
+          
     else:
         d['all'] = 0
 else:
-    if str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
-        if brain.department in ARTS:
-            d['all'] = 11000
-        else:
-            d['all'] = 11000
-    elif str(brain.level) == '100' and brain.review_state == 'returning':
-        if brain.department in ARTS:
-            d['all'] = 11000
-        else:
-            d['all'] = 11000
+    # all repeaters
+    if brain.verdict == 'C':
+        d['all'] = 9000
+    # NCE I
+    elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
+        d['all'] = 11000
+    # NCE II        
+    elif str(brain.level) in ('100','110','120') and brain.review_state == 'returning':
+        d['all'] = 10000
+    # NCE III        
     elif str(brain.level) in ('200','210','220'):
-        if brain.department in ARTS:
-            d['all'] = 10000
-        else:
-            d['all'] = 10000
+        d['all'] = 9500
+    # NCE IV
     elif str(brain.level) in ('300','310','320'):
-        if brain.department in ARTS:
-            d['all'] = 9500
-        else:
-            d['all'] = 9500
-
-    # repeaters = spillover
-    elif str(brain.level) in ('400','410','420'):
-        if brain.department in ARTS:
-            d['all'] = 9000
-        else:
-            d['all'] = 9000
-
+        d['all'] = 9500
     else:
         d['all'] = 0

WAeUP_SRP/trunk/skins/waeup_fceoyo/pay_interswitch.py

@@ -72 +72 @@
 p_id = "p%s" % timestamp
 info['surcharge'] = interswitch_amount = 300
-info['amount'] = amount = fee_dict['all']
+amount = fee_dict['all']
+bt_amount = 2000
+fceoyo_split = 500
+info['amount'] = amount + bt_amount + fceoyo_split
+
+#getSchoolFee provides pure school fee, the other fees have to be added
+total_amount = 100* (amount + interswitch_amount + bt_amount + fceoyo_split) 
 
 if student_id is None:
@@ -127 +133 @@
     args[arg] = info[field]
 
-bt_amount = 2000
-fceoyo_split = 500
-
-#getSchoolFee provides pure school fee, the other fees have to be added
-total_amount = 100* (amount + interswitch_amount + bt_amount + fceoyo_split)        
+