Changeset 6486 for WAeUP_SRP

Timestamp:

29 Jun 2011, 13:37:11 (13 years ago)

Author:

Henrik Bettermann

Message:

The MPA elif statements must come first.

File:

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

WAeUP_SRP/trunk/skins/waeup_aaua/getSchoolFee.py

@@ -90 +90 @@
         elif brain.review_state in i2_states and str(brain.level) in ('700',) and instalment == '2':
             d['all'] = 80000            
+        # 700 level returning students MPA
+        elif brain.review_state == 'returning' and instalment == '1' and brain.course in MPA:
+            d['all'] = 80000
+        elif brain.review_state in i2_states and instalment == '2' and brain.course in MPA:
+            d['all'] = 75000
         # 700 level returning students non-MPA      
         elif brain.review_state == 'returning' and instalment == '1':
@@ -95 +100 @@
         elif brain.review_state in i2_states and instalment == '2':
             d['all'] = 75000
-        # 700 level returning students MPA
-        elif brain.review_state == 'returning' and instalment == '1' and brain.course in MPA:
-            d['all'] = 80000
-        elif brain.review_state in i2_states and instalment == '2' and brain.course in MPA:
-            d['all'] = 75000
-        
 
 next_info = context.getNextInfo(brain)