Changeset 9519 for main

Timestamp:

4 Nov 2012, 06:13:36 (12 years ago)

Author:

Henrik Bettermann

Message:

Session configuration must always exist.

Location:

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

Files:

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

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

@@ -2033 +2033 @@
 
     def test_student_schoolfee_payment(self):
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
         # Login
         self.browser.open(self.login_path)
@@ -2208 +2211 @@
 
     def test_postgraduate_student_payments(self):
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
         self.certificate.study_mode = 'pg_ft'
         self.certificate.start_level = 999

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

@@ -300 +300 @@
         return
 
+    def _getSessionConfiguration(self, session):
+        try:
+            return grok.getSite()['configuration'][str(session)]
+        except KeyError:
+            return None
+
     def setPaymentDetails(self, category, student,
             previous_session, previous_level):
@@ -326 +332 @@
             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
         if category == 'schoolfee':
@@ -353 +357 @@
                     # has paid for. Payment session is always next session.
                     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
                     amount = getattr(certificate, 'school_fee_2', 0.0)
                 elif student.is_postgrad and student.state == PAID:
@@ -358 +365 @@
                     # but their level always remains the same.
                     p_session += 1
+                    academic_session = self._getSessionConfiguration(p_session)
+                    if academic_session == None:
+                        return _(u'Session configuration object is not available.'), None
                     amount = getattr(certificate, 'school_fee_2', 0.0)
         elif category == 'clearance':