Changeset 15376 for main

Timestamp:

1 Apr 2019, 11:57:40 (5 years ago)

Author:

Henrik Bettermann

Message:

Change SHS to DSH.

Location:

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

Files:

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

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'
+        # DSH have an extended matric number with leading 'DSH'
         # 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.student['studycourse'].certificate.study_mode = 'dsh'
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(self.student.matric_number, 'DSH/fac1/dep1/04/00002')
         self.assertEqual(site['configuration'].next_matric_integer, 3)
         # Students in faculty FBM get an extended matric number with leading 'CMS'

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', 'shs'):
+        if student.current_mode in ('ug_pt', 'de_pt', 'dsh'):
             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',):
+        if student.current_mode in ('dsh',):
             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" % (
+            return None, "DSH/%s/%s/%s/%05d" % (
                 faccode, depcode, year, next_integer)
         if student.current_mode in ('ug_pt', 'de_pt'):

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

@@ -163 +163 @@
         'ijmbe': 'IJMBE Preparation',
         'bridge': 'Bridge',
-        'shs': 'Science and Humanistic Studies',
+        'dsh': 'Science and Humanisties',
         }