Changeset 15393 for main/waeup.aaue/trunk

Timestamp:

13 Apr 2019, 20:44:24 (6 years ago)

Author:

Henrik Bettermann

Message:

Set ug_dsh and de_dsh acceptance fee.

Location:

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

Files:

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

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

@@ -61 +61 @@
 
     clearance_fee_ug_pt = schema.Float(
-        title = _(u'PT UG Acceptance Fee'),
+        title = _(u'PT and DSH UG Acceptance Fee'),
         default = 0.0,
         required = True,

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

@@ -342 +342 @@
             elif student.faccode == 'FP':
                 amount = academic_session.clearance_fee_fp
-            elif student.current_mode.endswith('_pt'):
-                if student.is_postgrad:
-                    amount = academic_session.clearance_fee_pg_pt
-                else:
-                    amount = academic_session.clearance_fee_ug_pt
+            elif student.current_mode in ('ug_pt', 'de_pt', 'ug_dsh', 'de_dsh'):
+                amount = academic_session.clearance_fee_ug_pt
+            elif student.current_mode == 'special_pg_pt':
+                amount = academic_session.clearance_fee_pg_pt
             elif student.faccode == 'FCS':
                 # Students in clinical medical sciences pay the medical
                 # acceptance fee
                 amount = academic_session.clearance_fee_med
-            elif student.is_postgrad:  # and not part-time
+            elif student.current_mode == 'special_pg_ft':
                 if category != 'clearance':
                     return _("No additional fees required."), None