Changeset 13609 for main/waeup.aaue/trunk

Timestamp:

13 Jan 2016, 09:16:36 (9 years ago)

Author:

Henrik Bettermann

Message:

Implement matric number constructor for pg students.

Location:

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

Files:

• tests/test_utils.py (modified) (3 diffs)
• utils.py (modified) (3 diffs)

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

@@ -128 +128 @@
         site['configuration'].next_matric_integer = 1
         site['configuration'].next_matric_integer_2 = 1
+        site['configuration'].next_matric_integer_3 = 1
         self.student.matric_number = None
         # Regular ft students have a matric number without leading constant.
@@ -140 +141 @@
         self.assertEqual(self.student.matric_number, 'PTP/fac1/dep1/04/00001')
         self.assertEqual(site['configuration'].next_matric_integer, 2)
-        # Students in faculty FBM an extended matric number with leading 'CMS'
+        # Students in faculty FBM get an extended matric number with leading 'CMS'
         # and the regular counter which is next_matric_integer_2.
         self.app['faculties']['fac1'].code = 'FBM'
@@ -148 +149 @@
         self.assertEqual(self.student.matric_number, 'CMS/FBM/dep1/04/00002')
         self.assertEqual(site['configuration'].next_matric_integer_2, 3)
+        # PG Students get an extended matric number with leading 'AAU/SPS'
+        # and the pg  counter which is next_matric_integer_3.
+        self.app['faculties']['fac1'].code = 'ABC'
+        self.student['studycourse'].certificate.study_mode = 'special_pg_ft'
+        self.student.matric_number = None
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(self.student.matric_number, 'AAU/SPS/ABC/dep1/04/CERT1/00001')
+        self.assertEqual(site['configuration'].next_matric_integer_3, 2)
         # Foundation programme students don't get matric number.
         self.student.matric_number = None

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

@@ -51 +51 @@
             grok.getSite()['configuration'].next_matric_integer += 1
             return
+        elif student.is_postgrad:
+            grok.getSite()['configuration'].next_matric_integer_3 += 1
+            return
         grok.getSite()['configuration'].next_matric_integer_2 += 1
         return
@@ -57 +60 @@
         faccode = student.faccode
         depcode = student.depcode
+        certcode = student.certcode
         year = unicode(student.entry_session)[2:]
         if not student.state in (PAID, ) or not student.is_fresh or \
@@ -62 +66 @@
             return _('Matriculation number cannot be set.'), None
         if student.is_postgrad:
-            return _('Matriculation number cannot be set.'), None
+            next_integer = grok.getSite()['configuration'].next_matric_integer_3
+            if next_integer == 0:
+                return _('Matriculation number cannot be set.'), None
+            return None, "AAU/SPS/%s/%s/%s/%s/%05d" % (
+                faccode, depcode, year, certcode, next_integer)
         if student.current_mode in ('ug_pt', 'de_pt'):
             next_integer = grok.getSite()['configuration'].next_matric_integer