Changeset 16124 for main

Timestamp:

22 Jun 2020, 11:24:14 (5 years ago)

Author:

Henrik Bettermann

Message:

Change sports and library fee options again.

Location:

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

Files:

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

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

@@ -471 +471 @@
                 amount += gateway_net_amt(academic_session.ict_fee)
         elif category == 'sports_library': # temporarily in 2020
-            amount = academic_session.sports_fee + gateway_net_amt(
-                academic_session.library_pg_fee)
+            if student.is_postgrad:
+                amount = academic_session.sports_fee + gateway_net_amt(
+                    academic_session.library_pg_fee)
+            else:
+                amount = academic_session.sports_fee + gateway_net_amt(
+                    academic_session.library_fee)
         elif not student.is_postgrad:
             fee_name = category + '_fee'

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

@@ -69 +69 @@
         'restitution': 'Restitution Fee',
         'sports': 'Sports Fee',
-        'library': 'Library Fee UG',
-        'library_pg': 'Library Fee PG',
-        'sports_library': 'Sports Development and PG Library Fee',
+        'library': 'UG Library Fee',
+        'library_pg': 'PG Library Fee',
+        'sports_library': 'Sports Development and Library Fee',
         'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
         'lab_2': 'Laboratory Due (BIO101/BIO111)',
@@ -106 +106 @@
         'fac_dep': 'Faculty and Departmental Dues (incl. ICT/Affidavit Dues)',
         'restitution': 'Restitution Fee',
-        #'sports': 'Sports Fee',
-        #'library': 'Library Fee UG',
-        #'library_pg': 'Library Fee PG',
-        'sports_library': 'Sports Development and PG Library Fee',
+        'sports': 'Sports Fee',
+        'library': 'UG Library Fee',
+        'library_pg': 'PG Library Fee',
+        'sports_library': 'Sports Development and Library Fee',
         'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
         'lab_2': 'Laboratory Due (BIO101/BIO111)',
@@ -123 +123 @@
         'schoolfee': 'School Fee',
         'late_registration': 'Late Course Registration Fee',
-        #'library_pg': 'Library Fee PG',
-        'sports_library': 'Sports Development and PG Library Fee',
+        'sports': 'Sports Fee',
+        'library': 'UG Library Fee',
+        'library_pg': 'PG Library Fee',
+        'sports_library': 'Sports Development and Library Fee',
         }
 
@@ -132 +134 @@
         'schoolfee_1': 'School Fee (1st instalment)',
         'schoolfee_2': 'School Fee (2nd instalment)',
-        #'sports': 'Sports Fee',
-        #'library': 'Library Fee UG',
-        'sports_library': 'Sports Development and PG Library Fee',
+        'sports': 'Sports Fee',
+        'library': 'UG Library Fee',
+        'library_pg': 'PG Library Fee',
+        'sports_library': 'Sports Development and Library Fee',
         }
 
@@ -149 +152 @@
         'gst_text_book_3': 'Text Book Fee GST222',
         'late_registration': 'Late Course Registration Fee',
-        #'sports': 'Sports Fee',
-        #'library': 'Library Fee UG',
-        'sports_library': 'Sports Development and PG Library Fee',
+        'sports': 'Sports Fee',
+        'library': 'UG Library Fee',
+        'library_pg': 'PG Library Fee',
+        'sports_library': 'Sports Development and Library Fee',
         'lab_1': 'Faculty Laboratory Due (CHM102/PHY103/CSC101)',
         'lab_2': 'Laboratory Due (BIO101/BIO111)',