Changeset 9525 for main/waeup.fceokene/trunk

Timestamp:

4 Nov 2012, 19:54:18 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes made in base package.

Location:

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

Files:

• tests/test_browser.py (modified) (4 diffs)
• utils.py (modified) (2 diffs)
• viewlets.py (added)

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

@@ -93 +93 @@
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.payments_path)
-        self.browser.getControl("Add online payment ticket").click()
+        self.browser.getLink("Add current session payment ticket").click()
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...Amount could not be determined...',
@@ -164 +164 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...ticket created...',
-                           self.browser.contents)
+        # Uups, we forgot to add a session configuration for next session
+        self.assertTrue('Session configuration object is not available.'
+            in self.browser.contents)
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+
         # In state admitted school fee can't be determined
         IWorkflowState(self.student).setState('admitted')
@@ -174 +182 @@
                            self.browser.contents)
 
-        # If the session configuration doesn't exist an error message will
-        # be shown. No other requirement is being checked.
-        del self.app['configuration']['2004']
-        self.browser.open(self.payments_path)
-        self.browser.getControl("Add online payment ticket").click()
-        self.browser.getControl("Create ticket").click()
-        self.assertMatches('...Session configuration object is not...',
-                           self.browser.contents)
+    def test_student_payments(self):
+        # Login
+        IWorkflowState(self.student).setState('returning')
+        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.open(self.student_path + '/payments')
+        self.assertTrue(
+          'Add current session payment ticket' in self.browser.contents)
+        self.assertFalse(
+          'Add previous session payment ticket' in self.browser.contents)
+        return
 
     def test_get_returning_data(self):
@@ -214 +227 @@
 
         IWorkflowState(self.student).setState('returning')
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual('Session configuration object is not available.', error)
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 200)

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

@@ -71 +71 @@
         p_level = student['studycourse'].current_level
         p_current = True
-        session = str(p_session)
-        try:
-            academic_session = grok.getSite()['configuration'][session]
-        except KeyError:
+        academic_session = self._getSessionConfiguration(p_session)
+        if academic_session == None:
             return _(u'Session configuration object is not available.'), None
+        # Determine fee.
         if category == 'transfer':
             amount = academic_session.transfer_fee
@@ -202 +201 @@
                         amount = 17400
             if student.state == RETURNING:
+                # Override p_session and p_level
                 p_session, p_level = self.getReturningData(student)
+                academic_session = self._getSessionConfiguration(p_session)
+                if academic_session == None:
+                    return _(u'Session configuration object is not available.'), None
 
         if amount in (0.0, None):