Changeset 10012 for main/waeup.fceokene

Timestamp:

5 Mar 2013, 21:39:26 (12 years ago)

Author:

Henrik Bettermann

Message:

Restrict school fee payment to cleared and returning students.

Add school fee for ug_ft.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

• tests/test_browser.py (modified) (4 diffs)
• utils.py (modified) (13 diffs)

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

@@ -96 +96 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Amount could not be determined...',
+        self.assertMatches('...Wrong state...',
                            self.browser.contents)
         IWorkflowState(self.student).setState('cleared')
@@ -184 +184 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Amount could not be determined...',
+        self.assertMatches('...Wrong state...',
                            self.browser.contents)
 
@@ -223 +223 @@
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment, None)
-        self.assertEqual(error, u'Amount could not be determined.')
+        self.assertEqual(error, u'Wrong state.')
 
         IWorkflowState(self.student).setState('cleared')
+        self.certificate.study_mode = 'nce_ft'
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 100)
@@ -244 +245 @@
         self.assertEqual(payment.amount_auth, 11545.0)
         self.assertEqual(payment.p_item, u'CERT1')
+        self.assertEqual(error, None)
+
+        # UG students pay 65150
+        self.certificate.study_mode = 'ug_ft'
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(payment.amount_auth, 65150.0)
         self.assertEqual(error, None)
 

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

@@ -122 +122 @@
                     'NFRE','NARB','NHAU','NIGB','NYOR','NSOS')
 
+            if student.state not in (CLEARED, RETURNING):
+                return _('Wrong state.'), None
+
             #PDE
             if student.current_mode == 'pd_ft':
                 amount = 35000
-            # NCE/UG
+            # UG
+            elif student.current_mode == 'ug_ft':
+                amount = 65150
+            # NCE
             elif not student.current_mode.endswith('_sw'):
                 # PRENCE
@@ -133 +139 @@
                     else:
                         amount = 15400
-                # NCE/UG I fresh
+                # NCE I fresh
                 elif student.current_level == 100 and student.state == CLEARED:
                     if student.depcode in ARTS:
@@ -139 +145 @@
                     else:
                         amount = 12495
-                # NCE/UG II
+                # NCE II
                 elif student.current_level in (100, 110, 120) and \
                     student.state == RETURNING:
@@ -146 +152 @@
                     else:
                         amount = 11545
-                # NCE/UG III
+                # NCE III
                 elif student.current_level in (200, 210, 220):
                     if student.depcode in ARTS:
@@ -152 +158 @@
                     else:
                         amount = 11545
-                # NCE/UG III repeater
+                # NCE III repeater
                 elif student.current_level in (300, 310, 320) and \
                     student.current_verdict == 'O':
@@ -159 +165 @@
                     else:
                         amount = 6773
-                # NCE/UG III spillover
+                # NCE III spillover
                 elif student.current_level in (300, 310, 320) and \
                     student.current_verdict == 'B':
@@ -166 +172 @@
                     else:
                         amount = 9645
-                # NCE/UG III second spillover
+                # NCE III second spillover
                 elif student.current_level in (400, 410, 420) and \
                     student.current_verdict == 'B':
@@ -179 +185 @@
                     else:
                         amount = 22400
-                # NCE/UG II sw
+                # NCE II sw
                 elif student.current_level in (100, 110, 120) and \
                     student.state == RETURNING:
@@ -186 +192 @@
                     else:
                         amount = 18900
-                # NCE/UG III sw
+                # NCE III sw
                 elif student.current_level in (200, 210, 220):
                     if student.depcode in ARTS:
@@ -192 +198 @@
                     else:
                         amount = 20900
-                # NCE/UG IV sw
+                # NCE IV sw
                 elif student.current_level in (300, 310, 320):
                     if student.depcode in ARTS:
@@ -198 +204 @@
                     else:
                         amount = 18900
-                # NCE/UG V sw
+                # NCE V sw
                 elif student.current_level in (400, 410, 420):
                     if student.depcode in ARTS:
@@ -204 +210 @@
                     else:
                         amount = 18900
-                # NCE/UG V spillover sw
+                # NCE V spillover sw
                 elif student.current_level in (500, 510, 520) and \
                     student.current_verdict == 'B':
@@ -211 +217 @@
                     else:
                         amount = 17400
-                # NCE/UG V second spillover sw
+                # NCE V second spillover sw
                 elif student.current_level in (600, 610, 620) and \
                     student.current_verdict == 'B':