Changeset 3844 for WAeUP_SRP/trunk/skins/waeup_fceoyo

Timestamp:

14 Jan 2009, 13:15:53 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve FCEOyoy #8

File:

• WAeUP_SRP/trunk/skins/waeup_fceoyo/getSchoolFee.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_fceoyo/getSchoolFee.py

@@ -27 +27 @@
         else:
             d['all'] = 15370
+    # 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:
+            d['all'] = 13320
+        else:
+            d['all'] = 14420
     # NCE I (fresh)
     elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
@@ -33 +39 @@
         else:
             d['all'] = 10420
-    # 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:
-            d['all'] = 13320
-        else:
-            d['all'] = 14420
     # NCE I repeaters
     elif str(brain.level) in ('100','110') and brain.review_state == 'returning' and brain.verdict == 'C':