Changeset 16963 for main

Timestamp:

14 Jun 2022, 11:34:52 (3 years ago)

Author:

Henrik Bettermann

Message:

Tech fee conditions are becoming adventurous.

File:

• main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/utils.py (modified) (3 diffs)

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/utils.py

@@ -31 +31 @@
 
 def MICROSOFT_FEE(student):
-    if student.state == CLEARED:
+    if student.state == CLEARED \
+        or (student.current_level in (100, 110, 120, 130)
+            and student.current_verdict == 'C') \
+        or (student.current_level in (300, 310, 320, 330) \
+            and student.current_mode == 'hnd_ft') \
+            and student.current_verdict == 'C'):
         return 5950.0
     return 0.0
@@ -41 +46 @@
 
 def TECH_FEE(student):
-    if student.state == CLEARED:
+    if student.state == CLEARED \
+        or (student.current_level in (100, 110, 120, 130)
+            and student.current_verdict == 'C') \
+        or (student.current_level in (300, 310, 320, 330) \
+            and student.current_mode == 'hnd_ft') \
+            and student.current_verdict == 'C'):
         return 4250.0
     return 1200.0
@@ -119 +129 @@
         of returning students depending on the student's senate verdict.
         """
-        prev_level = student['studycourse'].current_level
-        cur_verdict = student['studycourse'].current_verdict
+        prev_level = student.current_level
+        cur_verdict = student.current_verdict
         if cur_verdict in ('A','B','L','M','N','Z',):
             # Successful student