Changeset 9938

Timestamp:

7 Feb 2013, 15:50:15 (12 years ago)

Author:

Henrik Bettermann

Message:

Change permissions so that only student managers can add balance payment tickets.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)
• viewlets.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1549 +1549 @@
     grok.context(IStudentPaymentsContainer)
     grok.name('addbp')
-    grok.require('waeup.payStudent')
+    grok.require('waeup.manageStudent')
     form_fields = grok.AutoFields(IStudentBalancePayment)
     label = _('Add balance')

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

@@ -946 +946 @@
         self.assertEqual(ac.cost, 3456.0)
         return
+
+    def test_manage_balance_payments(self):
+
+        # Login
+        #self.browser.open(self.login_path)
+        #self.browser.getControl(name="form.login").value = self.student_id
+        #self.browser.getControl(name="form.password").value = 'spwd'
+        #self.browser.getControl("Login").click()
+
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.payments_path)
+
+        # Managers can add previous school fee payment tickets in any state.
+        IWorkflowState(self.student).setState('courses registered')
+        self.browser.open(self.payments_path)
+        self.browser.getLink("Add balance payment ticket").click()
+
+        # Previous session payment form is provided
+        self.assertEqual(self.student.current_session, 2004)
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl(name="form.balance_session").value = ['2004']
+        self.browser.getControl(name="form.balance_level").value = ['300']
+        self.browser.getControl(name="form.balance_amount").value = '-567.8'
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Amount must be greater than 0...',
+                           self.browser.contents)
+        self.browser.getControl(name="form.balance_amount").value = '0'
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Amount must be greater than 0...',
+                           self.browser.contents)
+        self.browser.getControl(name="form.balance_amount").value = '567.8'
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...',
+                           self.browser.contents)
+        self.assertEqual(self.student['payments'][value].amount_auth, 567.8)
+        # Payment attributes are properly set
+        self.assertEqual(self.student['payments'][value].p_session, 2004)
+        self.assertEqual(self.student['payments'][value].p_level, 300)
+        self.assertEqual(self.student['payments'][value].p_item, u'Balance')
+        self.assertEqual(self.student['payments'][value].p_category, 'schoolfee')
 
     def test_manage_accommodation(self):
@@ -2415 +2460 @@
         return
 
-    def test_student_balance_payments(self):
-
-        # Login
-        self.browser.open(self.login_path)
-        self.browser.getControl(name="form.login").value = self.student_id
-        self.browser.getControl(name="form.password").value = 'spwd'
-        self.browser.getControl("Login").click()
-
-        # Students can add previous school fee payment tickets in any state.
-        IWorkflowState(self.student).setState('courses registered')
-        self.browser.open(self.payments_path)
-        self.browser.getLink("Add balance payment ticket").click()
-
-        # Previous session payment form is provided
-        self.assertEqual(self.student.current_session, 2004)
-        self.browser.getControl(name="form.p_category").value = ['schoolfee']
-        self.browser.getControl(name="form.balance_session").value = ['2004']
-        self.browser.getControl(name="form.balance_level").value = ['300']
-        self.browser.getControl(name="form.balance_amount").value = '-567.8'
-        self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Amount must be greater than 0...',
-                           self.browser.contents)
-        self.browser.getControl(name="form.balance_amount").value = '0'
-        self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Amount must be greater than 0...',
-                           self.browser.contents)
-        self.browser.getControl(name="form.balance_amount").value = '567.8'
-        self.browser.getControl("Create ticket").click()
-        self.assertMatches('...ticket created...',
-                           self.browser.contents)
-        ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[0]
-        self.browser.getLink(value).click()
-        self.assertMatches('...Amount Authorized...',
-                           self.browser.contents)
-        self.assertEqual(self.student['payments'][value].amount_auth, 567.8)
-        # Payment attributes are properly set
-        self.assertEqual(self.student['payments'][value].p_session, 2004)
-        self.assertEqual(self.student['payments'][value].p_level, 300)
-        self.assertEqual(self.student['payments'][value].p_item, u'Balance')
-        self.assertEqual(self.student['payments'][value].p_category, 'schoolfee')
-
     def test_postgraduate_student_payments(self):
         configuration = createObject('waeup.SessionConfiguration')

main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py

@@ -624 +624 @@
     grok.context(IStudentPaymentsContainer)
     grok.view(PaymentsManageFormPage)
-    grok.require('waeup.payStudent')
+    grok.require('waeup.manageStudent')
     text = _('Add balance payment ticket')
     target = 'addbp'