Changeset 11850 for main/waeup.fceokene/trunk/src/waeup/fceokene

Timestamp:

19 Oct 2014, 07:44:58 (10 years ago)

Author:

Henrik Bettermann

Message:

 

File:

• main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py (modified) (2 diffs)

main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py

@@ -159 +159 @@
             # PDE repeater
             if student.current_verdict == 'OPDE':
-                amount = 20150
+                amount = 23000
             # PDE
             elif student.current_mode == 'pd_ft':
-                amount = 35000
+                amount = 35300
             # UG
             elif student.current_mode == 'ug_ft':
@@ -222 +222 @@
                 if student.current_level == 100 and student.state == CLEARED:
                     if student.depcode in ARTS:
-                        amount = 21900
-                    else:
-                        amount = 22400
+                        amount = 22500
+                    else:
+                        amount = 23000
                 # NCE II sw
                 elif student.current_level in (100, 110, 120) and \
                     student.state == RETURNING:
                     if student.depcode in ARTS:
-                        amount = 18400
-                    else:
-                        amount = 18900
+                        amount = 19000
+                    else:
+                        amount = 18500
                 # NCE III sw
                 elif student.current_level in (200, 210, 220):
                     if student.depcode in ARTS:
-                        amount = 20400
-                    else:
-                        amount = 20900
+                        amount = 21000
+                    else:
+                        amount = 21000
                 # NCE IV sw
                 elif student.current_level in (300, 310, 320):
                     if student.depcode in ARTS:
-                        amount = 18400
-                    else:
-                        amount = 18900
+                        amount = 19000
+                    else:
+                        amount = 19500
                 # NCE V sw
                 elif student.current_level in (400, 410, 420):
                     if student.depcode in ARTS:
-                        amount = 18400
-                    else:
-                        amount = 18900
+                        amount = 19000
+                    else:
+                        amount = 19500
                 # NCE V spillover sw
                 elif student.current_level in (500, 510, 520) and \
                     student.current_verdict == 'B':
                     if student.depcode in ARTS:
-                        amount = 16900
-                    else:
-                        amount = 17400
+                        amount = 17500
+                    else:
+                        amount = 18000
                 # NCE V second spillover sw
                 elif student.current_level in (600, 610, 620) and \
                     student.current_verdict == 'B':
                     if student.depcode in ARTS:
-                        amount = 16900
-                    else:
-                        amount = 17400
+                        amount = 17500
+                    else:
+                        amount = 18000
             # NCE student payment can be disabled by
             # setting the base school fee to -1