Changeset 9922 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

29 Jan 2013, 08:56:56 (12 years ago)

Author:

Henrik Bettermann

Message:

Do not change level if level exceeds the certificate's end_level.

Location:

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

Files:

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

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

@@ -39 +39 @@
 from waeup.kofa.app import University
 from waeup.kofa.payments.interfaces import IPaymentWebservice
+from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.students.student import Student
 from waeup.kofa.students.studylevel import StudentStudyLevel
@@ -2661 +2662 @@
             'Your personal data record is outdated.' in self.browser.contents)
 
+    def test_setReturningData(self):
+        utils = getUtility(IStudentsUtils)
+        self.student['studycourse'].current_level = 600
+        utils.setReturningData(self.student)
+        # The new level exceeds the certificates end_level.
+        # In this case current_level remains unchanged and no error is raised.
+        self.assertEqual(self.student['studycourse'].current_level, 600)
+
 class StudentRequestPWTests(StudentsFullSetup):
     # Tests for student registration

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

@@ -25 +25 @@
 from reportlab.lib.styles import getSampleStyleSheet
 from reportlab.platypus import Paragraph, Image, Table, Spacer
+from zope.schema.interfaces import ConstraintNotSatisfied
 from zope.component import getUtility, createObject
 from zope.formlib.form import setUpEditWidgets
@@ -326 +327 @@
         """
         new_session, new_level = self.getReturningData(student)
-        student['studycourse'].current_level = new_level
+        try:
+            student['studycourse'].current_level = new_level
+        except ConstraintNotSatisfied:
+            # Do not change level if level exceeds the
+            # certificate's end_level.
+            pass
         student['studycourse'].current_session = new_session
         verdict = student['studycourse'].current_verdict