Changeset 13664

Timestamp:

8 Feb 2016, 16:03:04 (9 years ago)

Author:

Henrik Bettermann

Message:

Use degree instead of certcode.

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

@@ -154 +154 @@
         self.student['studycourse'].certificate.study_mode = 'special_pg_ft'
         self.student.matric_number = None
+        self.certificate.degree = 'AGRB'
         msg, mnumber = utils.setMatricNumber(self.student)
-        self.assertEqual(self.student.matric_number, 'AAU/SPS/ABC/dep1/04/CERT1/00001')
+        self.assertEqual(self.student.matric_number, 'AAU/SPS/ABC/dep1/04/AGRB/00001')
         self.assertEqual(site['configuration'].next_matric_integer_3, 2)
         # Foundation programme students don't get matric number.

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

@@ -61 +61 @@
         depcode = student.depcode
         certcode = student.certcode
+        degree = getattr(
+            getattr(student.get('studycourse', None), 'certificate', None),
+                'degree', None)
         year = unicode(student.entry_session)[2:]
         if not student.state in (PAID, ) or not student.is_fresh or \
@@ -67 +70 @@
         if student.is_postgrad:
             next_integer = grok.getSite()['configuration'].next_matric_integer_3
-            if next_integer == 0:
+            if not degree or 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)
+                faccode, depcode, year, degree, next_integer)
         if student.current_mode in ('ug_pt', 'de_pt'):
             next_integer = grok.getSite()['configuration'].next_matric_integer