Changeset 15301

Timestamp:

18 Jan 2019, 08:51:24 (6 years ago)

Author:

Henrik Bettermann

Message:

Remove SIWESS fee payment requirement.

Location:

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly

Files:

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

main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/interswitch/tests.py

@@ -62 +62 @@
         self.browser.getControl("Create ticket").click()
         self.assertTrue(
-            'Pay ICT, Logbook and SIWESS fee(s) first.' in self.browser.contents)
+            'Pay ICT and Logbook fee(s) first.' in self.browser.contents)
 
         # Add required payments first.

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

@@ -89 +89 @@
 
     def _requiredPaymentsMade(self, student, session):
-        req_payments = ('ict_entre', 'logbook_combo', 'siwess_combo')
-        req_payments_titles = 'ICT, Logbook and SIWESS'
+        # SIWESS fee requirement removed on 18/01/2019
+        req_payments = ('ict_entre', 'logbook_combo')
+        req_payments_titles = 'ICT and Logbook'
         if len(student['payments']):
-            # All ND and HND of part time do not pay LOGBOOK
+            # All ND and HND part time do not pay LOGBOOK
             if student.current_mode.endswith('_pt'):
-                req_payments = ('ict_entre', 'siwess_combo')
-                req_payments_titles = 'ICT and SIWESS'
+                req_payments = ('ict_entre',)
+                req_payments_titles = 'ICT'
             # HND2 full time do not pay for SIWES
-            elif student.current_mode == 'hnd_ft' and student.state == RETURNING:
-                req_payments = ('ict_entre', 'logbook_combo')
-                req_payments_titles = 'ICT and Logbook'
-            # HND1 full time do not pay both SIWES and LOGBOOK
+            #elif student.current_mode == 'hnd_ft' and student.state == RETURNING:
+            #    req_payments = ('ict_entre', 'logbook_combo')
+            #    req_payments_titles = 'ICT and Logbook'
+            # HND1 full time do not pay both LOGBOOK
             elif student.current_mode == 'hnd_ft' and student.state == CLEARED:
                 req_payments = ('ict_entre',)
@@ -106 +107 @@
             # ND2 FULL TIME Do not pay LOGBOOK
             elif student.current_mode == 'nd_ft' and student.state == RETURNING:
-                req_payments = ('ict_entre', 'siwess_combo')
-                req_payments_titles = 'ICT and SIWESS'
+                req_payments = ('ict_entre',)
+                req_payments_titles = 'ICT'
             # ND1 full time do not pay SIWES
-            elif student.current_mode == 'nd_ft' and student.state == CLEARED:
-                req_payments = ('ict_entre', 'logbook_combo')
-                req_payments_titles = 'ICT and Logbook'
+            #elif student.current_mode == 'nd_ft' and student.state == CLEARED:
+            #    req_payments = ('ict_entre', 'logbook_combo')
+            #    req_payments_titles = 'ICT and Logbook'
             num = 0
             for ticket in student['payments'].values():