Changeset 9527 for main/waeup.aaue/trunk/src

Timestamp:

4 Nov 2012, 20:12:59 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes made in base package.

Location:

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

Files:

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

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

@@ -85 +85 @@
         self.app['configuration']['2004'].gown_fee = 150.0
         self.app['configuration']['2004'].transfer_fee = 90.0
-        #self.app['configuration']['2004'].clearance_fee = 120.0
         self.app['configuration']['2004'].booking_fee = 150.0
         self.app['configuration']['2004'].maint_fee = 180.0
@@ -92 +91 @@
         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('...Wrong state...',
@@ -101 +100 @@
         self.assertMatches('...Amount could not be determined...',
                            self.browser.contents)
-
         self.app['configuration']['2004'].school_fee_base = 6666.0
-
-        self.browser.getControl("Add online payment ticket").click()
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
@@ -169 +165 @@
                            self.browser.contents)
         # Ok, then we approve the first instalment ...
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         p_id = ctrl.options[0]
@@ -204 +201 @@
         del self.app['configuration']['2004']
         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('...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):

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

@@ -63 +63 @@
         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.
@@ -94 +92 @@
             elif student.state == RETURNING or\
                 (student.is_postgrad and student.state == PAID):
+                academic_session = self._getSessionConfiguration(p_session)
+                if academic_session == None:
+                    return _(u'Session configuration object is not available.'), None
                 if student.state == RETURNING:
                     p_session, p_level = self.getReturningData(student)