Changeset 13749 for main

Timestamp:

29 Feb 2016, 07:23:48 (9 years ago)

Author:

Henrik Bettermann

Message:

Add study modes mug_ft and mde_ft. All students, except those with entry mode mug_ft and mde_ft, have pay concessional fee before getting a matric number.

Location:

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

Files:

• students/tests/test_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/students/tests/test_browser.py

@@ -444 +444 @@
 
     def test_set_matric_number(self):
+        payment = createObject('waeup.StudentOnlinePayment')
+        payment.p_category = u'concessional'
+        payment.p_id = u'anyid'
+        payment.p_state = u'paid'
+        self.student['payments']['anykey'] = payment
         # Login as student
         self.browser.open(self.login_path)

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

@@ -130 +130 @@
         site['configuration'].next_matric_integer_3 = 1
         self.student.matric_number = None
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(msg, 'Matriculation number cannot be set.')
+        payment = createObject('waeup.StudentOnlinePayment')
+        payment.p_category = u'concessional'
+        payment.p_id = u'anyid'
+        payment.p_state = u'paid'
+        self.student['payments']['anykey'] = payment
         # Regular ft students have a matric number without leading constant.
         msg, mnumber = utils.setMatricNumber(self.student)

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

@@ -57 +57 @@
         return
 
+    def _concessionalPaymentMade(self, student):
+        if len(student['payments']):
+            for ticket in student['payments'].values():
+                if ticket.p_state == 'paid' and \
+                    ticket.p_category == 'concessional':
+                    return True
+        return False
+
     def constructMatricNumber(self, student):
         faccode = student.faccode
@@ -67 +75 @@
         if not student.state in (PAID, ) or not student.is_fresh or \
             student.current_mode == 'found':
+            return _('Matriculation number cannot be set.'), None
+        if student.current_mode not in ('mug_ft', 'mde_ft') and \
+            not self._concessionalPaymentMade(student):
             return _('Matriculation number cannot be set.'), None
         if student.is_postgrad:

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

@@ -105 +105 @@
         'found': 'Foundation',
         'transfer': 'Transfer',
+        'mug_ft': 'Undergraduate Full Time Merit List',
+        'mde_ft': 'Direct Entry Full Time Merit List',
         }