Changeset 13846 for main

Timestamp:

21 Apr 2016, 14:17:19 (9 years ago)

Author:

Henrik Bettermann

Message:

IOE doesn't have a department.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -166 +166 @@
         self.assertEqual(self.student.matric_number, 'AAU/SPS/ABC/dep1/04/AGRB/00001')
         self.assertEqual(site['configuration'].next_matric_integer_3, 2)
+        self.student.matric_number = None
+        # students in IOE don't have a department
+        self.app['faculties']['fac1'].code = 'IOE'
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(self.student.matric_number, 'AAU/SPS/IOE/04/AGRB/00002')
         # Diploma Students get a matric number with leading 'IOS'
         # and the dp counter which is next_matric_integer_3.

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

@@ -86 +86 @@
             if not degree or next_integer == 0:
                 return _('Matriculation number cannot be set.'), None
+            if student.faccode in ('IOE'):
+                return None, "AAU/SPS/%s/%s/%s/%05d" % (
+                    faccode, year, degree, next_integer)
             return None, "AAU/SPS/%s/%s/%s/%s/%05d" % (
                 faccode, depcode, year, degree, next_integer)