Changeset 4523 for WAeUP_SRP/trunk/skins

Timestamp:

18 Aug 2009, 10:14:53 (15 years ago)

Author:

Henrik Bettermann

Message:

​https://fceokene-trac.waeup.org/ticket/151#comment:18

File:

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

WAeUP_SRP/trunk/skins/waeup_fceokene/getSchoolFee.py

@@ -63 +63 @@
     if str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
         if brain.department in ARTS:
-            d['all'] = 23900
+            d['all'] = 21900
         else:
             d['all'] = 22400
@@ -69 +69 @@
     elif brain.verdict == 'C':
         if brain.department in ARTS:
-            d['all'] = 18900
+            d['all'] = 16900
         else:
-            d['all'] = 19400
+            d['all'] = 17400
     # NCE II            
     elif str(brain.level) in ('100','110','120') and brain.review_state == 'returning':
+        if brain.department in ARTS:
+            d['all'] = 18400
+        else:
+            d['all'] = 18900
+    # NCE III
+    elif str(brain.level) in ('200','210','220'):
         if brain.department in ARTS:
             d['all'] = 20400
         else:
             d['all'] = 20900
-    # NCE III
-    elif str(brain.level) in ('200','210','220'):
-        if brain.department in ARTS:
-            d['all'] = 22400
-        else:
-            d['all'] = 22900
     # NCE IV
     elif str(brain.level) in ('300','310','320'):
         if brain.department in ARTS:
-            d['all'] = 20400
+            d['all'] = 18400
         else:
-            d['all'] = 20900
+            d['all'] = 18900
     # NCE V
     elif str(brain.level) in ('400','410','420'):
         if brain.department in ARTS:
-            d['all'] = 20400
+            d['all'] = 18400
         else:
-            d['all'] = 20900
+            d['all'] = 18900
     # NCE V spillover
     elif str(brain.level) in ('500','510','520') and brain.verdict == 'B':
         if brain.department in ARTS:
-            d['all'] = 18900
+            d['all'] = 16900
         else:
-            d['all'] = 19400           
+            d['all'] = 17400           
     else:
         d['all'] = 0