Changeset 9735

Timestamp:

28 Nov 2012, 07:52:56 (12 years ago)

Author:

Henrik Bettermann

Message:

Current level must be in range of certificate. This must be checked in checkUpdateRequirements.

Location:

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

Files:

• batching.py (modified) (1 diff)
• tests/test_batching.py (modified) (2 diffs)

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

@@ -455 +455 @@
         """
         current_level = row.get('current_level', None)
-        if current_level == 999 and \
-            obj.__parent__.state in FORBIDDEN_POSTGRAD_STATES:
-            return 'Not a pg student.'
+        if current_level:
+            if current_level == 999 and \
+                obj.__parent__.state in FORBIDDEN_POSTGRAD_STATES:
+                return 'Not a pg student.'
+            certificate = getattr(obj, 'certificate', None)
+            cert = row.get('certificate', None)
+            if certificate is None and cert is None:
+                return 'No certificate to check level.'
+            if certificate is not None and (
+                current_level < certificate.start_level or \
+                current_level > certificate.end_level+120):
+                return 'current_level not in range.'
         return None
 

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

@@ -575 +575 @@
 
     def test_checkUpdateRequirements(self):
-        # Make sure that pg students can't be updated with wrong transition.
+        # Current level must be in range of certificate.
+        # Since row has passed the converter, current_level is an integer.
         err = self.processor.checkUpdateRequirements(
             self.student['studycourse'],
-            dict(reg_number='1', current_level='100'), self.app)
+            dict(reg_number='1', current_level=100), self.app)
+        self.assertEqual(err, 'current_level not in range.')
+        err = self.processor.checkUpdateRequirements(
+            self.student['studycourse'],
+            dict(reg_number='1', current_level=200), self.app)
         self.assertTrue(err is None)
-        # Since row has passed the converter, current_level is an integer.
+        # We can update pg students.
+        self.student['studycourse'].certificate.start_level=999
+        self.student['studycourse'].certificate.end_level=999
         err = self.processor.checkUpdateRequirements(
             self.student['studycourse'],
             dict(reg_number='1', current_level=999), self.app)
         self.assertTrue(err is None)
+        # Make sure that pg students can't be updated with wrong transition.
         IWorkflowState(self.student).setState('returning')
         err = self.processor.checkUpdateRequirements(
@@ -590 +598 @@
             dict(reg_number='1', current_level=999), self.app)
         self.assertEqual(err, 'Not a pg student.')
+        # If certificate is not given in row (and has thus
+        # successfully passed checkConversion) the certificate
+        # attribute must be set.
+        self.student['studycourse'].certificate = None
+        err = self.processor.checkUpdateRequirements(
+            self.student['studycourse'],
+            dict(reg_number='1', current_level=100), self.app)
+        self.assertEqual(err, 'No certificate to check level.')
 
     def test_import(self):