Changeset 16179 for main

Timestamp:

23 Jul 2020, 07:56:01 (4 years ago)

Author:

Henrik Bettermann

Message:

ICT/Affidavit Dues still remains.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

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

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

@@ -458 +458 @@
             else:
                 amount += academic_session.penalty_ug
-        elif category == ('fac_dep'):
-            if student.faccode in ('FAT', 'FED', 'FLW', 'FMS', 'FSS'):
-                amount = 4200.0
-            elif student.faccode in ('FAG', 'FBM', 'FCS',
-                                     'FES', 'FET', 'FLS', 'FPS'):
-                amount = 5200.0
-            elif student.faccode == 'FAG' and student.current_level == 400:
-                amount = 10200.0
-            elif student.depcode == 'VTE':
-                amount = 5200.0
-            if student.entry_session >= 2019:
-                amount += gateway_net_amt(academic_session.ict_fee)
+        #elif category == ('fac_dep'):
+        #    if student.faccode in ('FAT', 'FED', 'FLW', 'FMS', 'FSS'):
+        #        amount = 4200.0
+        #    elif student.faccode in ('FAG', 'FBM', 'FCS',
+        #                             'FES', 'FET', 'FLS', 'FPS'):
+        #        amount = 5200.0
+        #    elif student.faccode == 'FAG' and student.current_level == 400:
+        #        amount = 10200.0
+        #    elif student.depcode == 'VTE':
+        #        amount = 5200.0
+        #    if student.entry_session >= 2019:
+        #        amount += gateway_net_amt(academic_session.ict_fee)
         elif category == 'sports_library': # temporarily in 2020
             if student.is_postgrad:

main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

@@ -67 +67 @@
         'ent_registration_1': 'Registration Fee ENT201',
         'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
+        'ict': 'ICT/Affidavit Dues',
         'restitution': 'Restitution Fee',
         'sports': 'Sports Fee',
@@ -105 +106 @@
         'ent_registration_1': 'Registration Fee ENT201',
         #'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
+        'ict': 'ICT/Affidavit Dues',
         'restitution': 'Restitution Fee',
         'sports': 'Sports Fee',
@@ -200 +202 @@
         'gst_registration_2': 'Registration Fee GST222',
         'ent_registration_1': 'Registration Fee ENT201',
-        'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
+        #'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
+        'ict': 'ICT/Affidavit Dues',
         'restitution': 'Restitution Fee',
         }