Changeset 16738

Timestamp:

10 Dec 2021, 13:54:16 (3 years ago)

Author:

Henrik Bettermann

Message:

Change acceptance fee computation algorithm.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg

Files:

• interfaces.py (modified) (2 diffs)
• students/utils.py (modified) (1 diff)

main/kofacustom.dspg/trunk/src/kofacustom/dspg/interfaces.py

@@ -32 +32 @@
 
     clearance_fee = schema.Float(
-        title = _(u'Acceptance Fee'),
+        title = _(u'Acceptance Fee (default)'),
         default = 0.0,
         required = False,
@@ -67 +67 @@
         )
 
-
     # Additional fees in custom package
+
+    hnd_clearance_fee = schema.Float(
+        title = _(u'HND Non-Local Acceptance Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    nd_clearance_fee = schema.Float(
+        title = _(u'ND Non-Local Acceptance Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    hndlocal_clearance_fee = schema.Float(
+        title = _(u'HND Local Acceptance Fee'),
+        default = 0.0,
+        required = False,
+        )
+
+    ndlocal_clearance_fee = schema.Float(
+        title = _(u'ND Local Acceptance Fee'),
+        default = 0.0,
+        required = False,
+        )
 
     gown_fee = schema.Float(

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

@@ -233 +233 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-            amount = academic_session.clearance_fee
-            # HND students pay more
             if student.current_mode == 'hnd_ft':
-                amount += 3000
-            # Local ND and HND students are given a rebate which has
-            # to be adjusted if the basic acceptance fee changes.
-            if amount and student.current_mode == 'nd_ft' and local(student):
-                amount -= 10000.0
-            if amount and student.current_mode == 'hnd_ft' and local(student):
-                amount -= 5000.0
+                if local(student):
+                    amount = academic_session.hndlocal_clearance_fee
+                else:
+                    amount = academic_session.hnd_clearance_fee
+            elif student.current_mode == 'nd_ft':
+                if local(student):
+                    amount = academic_session.ndlocal_clearance_fee
+                else:
+                    amount = academic_session.nd_clearance_fee
+            else:
+                    amount = academic_session.clearance_fee
         elif category == 'bed_allocation':
             p_item = self.getAccommodationDetails(student)['bt']