Changeset 15382 for main/waeup.aaue/trunk/src/waeup

Timestamp:

3 Apr 2019, 10:55:16 (6 years ago)

Author:

Henrik Bettermann

Message:

ivama: The programme is just a replica of Part-time) same rules.

ug_dsh = Undergraduate Science and Humanities
de_dsh = Direct Entry Science and Humanities

Please use same payment configuration/restriction with part-time. Everything about Part-time payment are the same. it is just a change of name.

Location:

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

Files:

• interswitch/browser.py (modified) (1 diff)
• 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/interswitch/browser.py

@@ -64 +64 @@
 
 def contr_agreement_student(student):
-    if student.current_mode in ('found', 'bridge') or student.current_mode.endswith('_pt'):
+    if student.current_mode in (
+        'found', 'bridge', 'ug_dsh', 'de_dsh') or student.current_mode.endswith('_pt'):
         return 'first'
     return 'second'

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

@@ -216 +216 @@
         # and same counter as PTP.
         self.student.matric_number = None
-        self.student['studycourse'].certificate.study_mode = 'dsh'
+        self.student['studycourse'].certificate.study_mode = 'ug_dsh'
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(self.student.matric_number, 'DSH/fac1/dep1/04/00002')

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', 'dsh'):
+        if student.current_mode in ('ug_pt', 'de_pt', 'ug_dsh', 'de_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 ('dsh',):
+        if student.current_mode in ('ug_dsh', 'de_dsh'):
             next_integer = grok.getSite()['configuration'].next_matric_integer
             if next_integer == 0:

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

@@ -163 +163 @@
         'ijmbe': 'IJMBE Preparation',
         'bridge': 'Bridge',
-        'dsh': 'Science and Humanities',
+        'ug_dsh': 'Undergraduate Science and Humanities',
+        'de_dsh': 'Direct Entry Science and Humanities',
         }