Changeset 15368 for main

Timestamp:

25 Mar 2019, 06:30:13 (5 years ago)

Author:

Henrik Bettermann

Message:

Add SHS matric number constructor.

Location:

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

Files:

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

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

@@ -213 +213 @@
         self.assertEqual(self.student.matric_number, 'PTP/fac1/dep1/04/00001')
         self.assertEqual(site['configuration'].next_matric_integer, 2)
+        # SHS have an extended matric number with leading 'SHS'
+        # and same counter as PTP.
+        self.student.matric_number = None
+        self.student['studycourse'].certificate.study_mode = 'shs'
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(self.student.matric_number, 'SHS/fac1/dep1/04/00002')
+        self.assertEqual(site['configuration'].next_matric_integer, 3)
         # Students in faculty FBM get an extended matric number with leading 'CMS'
         # and the regular counter which is next_matric_integer_2.

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

@@ -154 +154 @@
         is as an attribute of the site configuration container.
         """
-        if student.current_mode in ('ug_pt', 'de_pt'):
+        if student.current_mode in ('ug_pt', 'de_pt', 'shs'):
             grok.getSite()['configuration'].next_matric_integer += 1
             return
@@ -197 +197 @@
             return None, "AAU/SPS/%s/%s/%s/%s/%05d" % (
                 faccode, depcode, year, degree, next_integer)
+        if student.current_mode in ('shs',):
+            next_integer = grok.getSite()['configuration'].next_matric_integer
+            if next_integer == 0:
+                return _('Matriculation number cannot be set.'), None
+            return None, "SHS/%s/%s/%s/%05d" % (
+                faccode, depcode, year, next_integer)
         if student.current_mode in ('ug_pt', 'de_pt'):
             next_integer = grok.getSite()['configuration'].next_matric_integer