Changeset 9523 for main/waeup.futminna

Timestamp:

4 Nov 2012, 10:27:40 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes made in base package.

Location:

main/waeup.futminna/trunk/src/waeup/futminna/students

Files:

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

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

@@ -151 +151 @@
         IWorkflowState(self.student).setState('returning')
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        # Uups, we forgot to add a session configuration for next session
+        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)
         self.assertEqual(payment.p_session, 2005)
@@ -238 +245 @@
                            self.browser.contents)
         return
+
+    def test_student_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.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

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

@@ -68 +68 @@
         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 == 'schoolfee':
             try:
@@ -105 +104 @@
                     amount = 0.0
             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
         elif category == 'clearance':
             try:

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

@@ -21 +21 @@
     FileDisplay, FileUpload, Image)
 from waeup.kofa.students.browser import ExportPDFClearanceSlipPage
+from waeup.kofa.students.viewlets import AddPreviousPaymentActionButton
 
 from kofacustom.nigeria.interfaces import MessageFactory as _
 
+
+class AddPreviousPaymentActionButton(AddPreviousPaymentActionButton):
+
+    @property
+    def target_url(self):
+        return ''
 
 # Accepted by Institution