Changeset 9206

Timestamp:

19 Sep 2012, 14:24:46 (12 years ago)

Author:

Henrik Bettermann

Message:

Previous session must be valid.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

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

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

@@ -219 +219 @@
         self.app['configuration']['2004'].booking_fee = 150.0
         self.app['configuration']['2004'].maint_fee = 180.0
+
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2000
+        self.app['configuration'].addSessionConfiguration(configuration)
+        configuration2 = createObject('waeup.SessionConfiguration')
+        configuration2.academic_session = 2002
+        self.app['configuration'].addSessionConfiguration(configuration2)
+        configuration3 = createObject('waeup.SessionConfiguration')
+        configuration3.academic_session = 2003
+        self.app['configuration'].addSessionConfiguration(configuration3)
+
         utils = getUtility(IStudentsUtils)
 
+        self.student['studycourse'].entry_session = 2002
         self.student.nationality = u'NG'
 
@@ -232 +244 @@
         self.assertTrue(u'Amount could not be determined.' in error)
 
+        # Previous session must be valid.
+        error, payment = utils.setPaymentDetails('schoolfee',
+            self.student, 2000, 300)
+        self.assertEqual(payment, None)
+        self.assertTrue(u'The previous session must not fall below' in error)
+        error, payment = utils.setPaymentDetails('schoolfee',
+            self.student, 2004, 300)
+        self.assertEqual(payment, None)
+        self.assertTrue(u'This is not a previous session' in error)
+
         # Previous session payment; fresh and returning
         # are distinguished by their entry_level
         error, payment = utils.setPaymentDetails('schoolfee',
-            self.student, 2004, 300)
+            self.student, 2002, 300)
         self.assertEqual(payment.amount_auth, 40000.0)
-        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.p_session, 2002)
         self.assertEqual(payment.p_level, 300)
         self.assertFalse(payment.p_current)
         error, payment = utils.setPaymentDetails('schoolfee',
-            self.student, 2005, 300)
+            self.student, 2003, 300)
         self.assertEqual(payment.amount_auth, 20000.0)
-        self.assertEqual(payment.p_session, 2005)
+        self.assertEqual(payment.p_session, 2003)
         self.assertEqual(payment.p_level, 300)
         self.assertFalse(payment.p_current)

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

@@ -97 +97 @@
                 return _('Study course data are incomplete.'), None
             if previous_session:
+                if previous_session < student['studycourse'].entry_session:
+                    return _('The previous session must not fall below '
+                             'your entry session.'), None
+                if previous_session > student['studycourse'].current_session - 1:
+                    return _('This is not a previous session.'), None
                 if previous_session == student['studycourse'].entry_session:
                     if student.is_foreigner: