Changeset 7152 for main/waeup.custom/trunk/src/waeup/custom/students

Timestamp:

20 Nov 2011, 10:26:54 (13 years ago)

Author:

Henrik Bettermann

Message:

get_school_fee is not part of IStudentsUtils.

File:

• main/waeup.custom/trunk/src/waeup/custom/students/utils.py (modified) (3 diffs)

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

@@ -4 +4 @@
 from waeup.sirp.students.utils import StudentsUtils
 from waeup.sirp.students.interfaces import IStudentsUtils
+
+def get_school_fee(student, surcharge):
+    study_mode = student['studycourse'].certificate.study_mode
+    entry_mode = student['studycourse'].entry_mode
+    state = student.state
+    #lga = student.lga
+    lga = 'nothing'
+    current_level = student['studycourse'].current_level
+
+    if study_mode.endswith('_ft'):
+        # fresh
+        if state == CLEARED:
+            return 40000 - surcharge
+        # returning
+        elif state == RETURNING:
+            return 20000 - surcharge
+        else:
+            return 0
+    else:
+        return 0
 
 class StudentsUtils(StudentsUtils):
@@ -38 +58 @@
             d['surcharge_1'] = academic_session.surcharge_1
             d['surcharge_2'] = academic_session.surcharge_2
-            d['amount'] = self.getSchoolFee(student, d['surcharge_1'] + d['surcharge_2'])
+            d['amount'] = get_school_fee(student, d['surcharge_1'] + d['surcharge_2'])
             code = student['studycourse'].certificate.code
             #session_string = academic_sessions_vocab.by_value[p_session + 1].title
@@ -46 +66 @@
             d['error'] = u'Amount could not be determined.'
         return d
-
-    def getSchoolFee(self, student, surcharge):
-        study_mode = student['studycourse'].certificate.study_mode
-        entry_mode = student['studycourse'].entry_mode
-        state = student.state
-        #lga = student.lga
-        lga = 'nothing'
-        current_level = student['studycourse'].current_level
-
-        if study_mode.endswith('_ft'):
-            # fresh
-            if state == CLEARED:
-                return 40000 - surcharge
-            # returning
-            elif state == RETURNING:
-                return 20000 - surcharge
-            else:
-                return 0
-        else:
-            return 0