Changeset 15345

Timestamp:

6 Mar 2019, 21:33:16 (6 years ago)

Author:

Henrik Bettermann

Message:

Customize increaseMatricInteger.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg

Files:

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

main/kofacustom.dspg/trunk/src/kofacustom/dspg/interswitch/tests.py

@@ -205 +205 @@
         self.assertTrue('<item_detail item_id="3" item_name="WAEAC" item_amt="280000" bank_id="8" acct_num="2028964403" />'
             in self.browser.contents)
-        self.assertTrue('<item_detail item_id="4" item_name="Technology Fee" item_amt="120000" bank_id="307" acct_num="5100189030" />'
+        self.assertTrue('<item_detail item_id="4" item_name="Technology Fee" item_amt="120000" bank_id="10" acct_num="0032256360" />'
             in self.browser.contents)
 

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/tests/test_utils.py

@@ -42 +42 @@
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(self.student.matric_number, 'dep1/ND/04/00001')
+        self.assertEqual(site['configuration'].next_matric_integer, 2)
         self.assertEqual(msg, None)
         # hnd_ft
@@ -48 +49 @@
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(self.student.matric_number, 'dep1/HND/04/00001')
+        self.assertEqual(site['configuration'].next_matric_integer_2, 2)
         self.assertEqual(msg, None)
         # nd_pt
@@ -54 +56 @@
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(self.student.matric_number, 'dep1/ND/04/10001')
+        self.assertEqual(site['configuration'].next_matric_integer_3, 10002)
         self.assertEqual(msg, None)
         # hnd_pt
@@ -60 +63 @@
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(self.student.matric_number, 'dep1/HND/04/10001')
+        self.assertEqual(site['configuration'].next_matric_integer_4, 10002)
         self.assertEqual(msg, None)
         return

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/utils.py

@@ -317 +317 @@
 
         return _('Matriculation number cannot be set.'), None
+
+    def increaseMatricInteger(self, student):
+        """Increase counter for matric numbers.
+        """
+        if student.current_mode == 'nd_ft':
+            grok.getSite()['configuration'].next_matric_integer += 1
+            return
+        elif student.current_mode == 'hnd_ft':
+            grok.getSite()['configuration'].next_matric_integer_2 += 1
+            return
+        elif student.current_mode in ('nd_pt, nd_we'):
+            grok.getSite()['configuration'].next_matric_integer_3 += 1
+            return
+        elif student.current_mode in ('hnd_pt, hnd_we'):
+            grok.getSite()['configuration'].next_matric_integer_4 += 1
+            return
+        return