Changeset 11590

Timestamp:

22 Apr 2014, 14:46:45 (11 years ago)

Author:

Henrik Bettermann

Message:

Do not construct matric number if no certificate is assigned.

Location:

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

Files:

• tests/test_utils.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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

@@ -71 +71 @@
         self.assertEqual(mnumber, None)
         self.assertEqual(self.student.matric_number, None)
+        # Certificate must be set.
+        self.student.matric_number = None
+        another_student.matric_number = u'999'
+        self.student['studycourse'].certificate = None
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(msg, 'No certificate assigned.')
         return
 

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

@@ -542 +542 @@
         if student.matric_number is not None:
             return _('Matriculation number already set.'), None
+        if student.certcode is None:
+            return _('No certificate assigned.'), None
         try:
             student.matric_number = self._constructMatricNumber(