Changeset 5522 for WAeUP_SRP/trunk

Timestamp:

22 Sep 2010, 14:17:46 (14 years ago)

Author:

Henrik Bettermann

Message:

see fceoyo #49

File:

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

WAeUP_SRP/trunk/skins/waeup_fceoyo/getSchoolFee.py

@@ -14 +14 @@
 
 GRP1 = ('BIO','MAT','ISC','PHE','CHM','YOR','ARB','ENG','FRE','HAU','IGB')
-GRP2 = ('THA','CSC','BED','FAA','HEC','MUS')
-GRP3 = ('ECO','GEO','SOS','ISS','CRS','PES','THA')
-#GRP4 = ('CSC','AGE','BED','FAA','HEC')
+GRP2 = ('CSC','BED','FAA','HEC','MUS')
+#GRP3 = ('ECO','GEO','SOS','ISS','CRS','PES','THA')
 
 ARTS = ('CRS','ISS','MUS','SOS','THA','PES','ECO','GEO')
@@ -31 +30 @@
         elif brain.department in GRP2:
             d['all'] = 15370
-        elif brain.department in GRP3:
-            d['all'] = 14770
         else:
             d['all'] = 15370
@@ -41 +38 @@
     #    elif brain.department in GRP2:
     #        d['all'] = 10020
-    #    elif brain.department in GRP3:
-    #        d['all'] = 9520
     #    else:
     #        d['all'] = 10520
@@ -48 +43 @@
     elif str(brain.level) == '100' and brain.review_state == 'cleared_and_validated':
         if brain.department in GRP1:
-            d['all'] = 15050
+            d['all'] = 12550
         elif brain.department in GRP2:
-            d['all'] = 15050
-        elif brain.department in GRP3:
-            d['all'] = 14450
+            d['all'] = 12550
         else:
-            d['all'] = 15050
+            d['all'] = 11950
     # NCE I repeaters
     elif str(brain.level) in ('100','110') and brain.review_state == 'returning' and brain.verdict == 'C':
         if brain.department in GRP1:
-            d['all'] = 12550
+            d['all'] = 10050
         elif brain.department in GRP2:
-            d['all'] = 12550
-        elif brain.department in GRP3:
-            d['all'] = 11950
+            d['all'] = 10050
         else:
-            d['all'] = 12550
+            d['all'] = 9450
     # NCE II
     elif str(brain.level) in ('100','110','120') and brain.review_state == 'returning':
         if brain.department in GRP1:
-            d['all'] = 9500
+            d['all'] = 7000
         elif brain.department in GRP2:
-            d['all'] = 10500
-        elif brain.department in GRP3:
-            d['all'] = 8900
+            d['all'] = 8000
         else:
-            d['all'] = 10500
+            d['all'] = 6400
     # NCE II repeaters
     elif str(brain.level) in ('200','210') and brain.verdict == 'C':
         if brain.department in GRP1:
-            d['all'] = 9500
+            d['all'] = 7000
         elif brain.department in GRP2:
-            d['all'] = 10500
-        elif brain.department in GRP3:
-            d['all'] = 8900
+            d['all'] = 8000
         else:
-            d['all'] = 10500
+            d['all'] = 6400
     # NCE III
     elif str(brain.level) in ('200','210','220'):
         if brain.department in GRP1:
-            d['all'] = 11250
+            d['all'] = 8750
         elif brain.department in GRP2:
-            d['all'] = 11250
-        elif brain.department in GRP3:
-            d['all'] = 10650
+            d['all'] = 8750
         else:
-            d['all'] = 11250
+            d['all'] = 8150
     # NCE III repeaters and spillover
     elif str(brain.level) in ('300','310') and brain.verdict in ('B','C'):
         if brain.department in GRP1:
-            d['all'] = 7000
+            d['all'] = 4500
         elif brain.department in GRP2:
-            d['all'] = 7000
-        elif brain.department in GRP3:
-            d['all'] = 6400
+            d['all'] = 4500
         else:
-            d['all'] = 7000         
+            d['all'] = 3900         
           
     else: