Changeset 13678

Timestamp:

11 Feb 2016, 10:45:59 (9 years ago)

Author:

Henrik Bettermann

Message:

Parttime and fulltime postgrad students pay different acceptance fees.

Location:

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

Files:

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

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

@@ -49 +49 @@
         )
 
-    clearance_fee_pt = schema.Float(
-        title = _(u'PT Acceptance Fee'),
+    clearance_fee_pg = schema.Float(
+        title = _(u'FT PG Acceptance Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    clearance_fee_ug_pt = schema.Float(
+        title = _(u'PT UG Acceptance Fee'),
+        default = 0.0,
+        required = True,
+        )
+
+    clearance_fee_pg_pt = schema.Float(
+        title = _(u'PT PG Acceptance Fee'),
         default = 0.0,
         required = True,
@@ -57 +69 @@
     clearance_fee_med = schema.Float(
         title = _(u'Medical Acceptance Fee'),
-        default = 0.0,
-        required = True,
-        )
-
-    clearance_fee_pg = schema.Float(
-        title = _(u'Postgraduate Acceptance Fee'),
         default = 0.0,
         required = True,

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py

@@ -197 +197 @@
     def test_interswitch_form_pt_acceptance_fees(self):
         self.certificate.study_mode = 'ug_pt'
-        self.app['configuration']['2004'].clearance_fee_pt = 40250.0
+        self.app['configuration']['2004'].clearance_fee_ug_pt = 40250.0
         self.app['configuration']['2004'].matric_gown_fee = 2000.0
         self.app['configuration']['2004'].lapel_fee = 800.0

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -549 +549 @@
 
         self.certificate.study_mode = 'special_pg_ft'
+        self.student.matric_number = u'AAU/SPS/FLW/LAW/15/PHD/09504'
         self.browser.open(self.student_path + '/studycourse/100')
         self.browser.getLink("Download course registration slip").click()

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

@@ -174 +174 @@
                 amount = academic_session.clearance_fee_fp
             elif student.current_mode.endswith('_pt'):
-                amount = academic_session.clearance_fee_pt
+                if student.is_postgrad:
+                    amount = academic_session.clearance_fee_pg_pt
+                else:
+                    amount = academic_session.clearance_fee_ug_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:
+            elif student.is_postgrad:  # and not part-time
                 amount = academic_session.clearance_fee_pg
             else: