Changeset 16931

Timestamp:

21 Apr 2022, 08:07:31 (3 years ago)

Author:

Henrik Bettermann

Message:

Allow two identical subject/school combinations.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py

@@ -213 +213 @@
     def _students_per_school_exceeded(self, data):
         container = self.context.__parent__
-        counter = 0
+        counter_school = 0
+        counter_subj_per_school = 0
         target = getattr(container, 'prefix', None)
         if target == 'tpu':
             school = 'school_tpu'
-            max = 10
-        else:
-            max = 7
+            max_schools = 10
+            max_subj_per_school = 1
+        else:
+            max_schools = 7
+            max_subj_per_school = 2
             school = 'school_utp'
         for appl in container.values():
@@ -225 +228 @@
                 and appl.state in (SUBMITTED, ADMITTED, NOT_ADMITTED, CREATED):
                 if getattr(appl, school) == data.get(school):
-                    counter += 1
+                    counter_school += 1
                     if appl.subj_comb == data.get('subj_comb'):
+                        counter_subj_per_school += 1
+                    if counter_subj_per_school == max_subj_per_school:
                         return True
-                if counter == max:
+                if counter_school == max_schools:
                     return True
         return False

main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests/test_browser.py

@@ -369 +369 @@
         self.browser.getControl(name="form.subj_comb").value = ['BEDCERT1']
         self.browser.getControl("Finally Submit").click()
-        self.assertTrue("Maximum number of applications per school exceeded."
-            in self.browser.contents)
-        # Same school with another subj_comb can be submitted
-        self.assertEqual(self.utpapplicant.state, 'paid')
-        self.browser.open(self.utpapplicant_path + '/edit')
-        self.browser.getControl(name="form.school_utp").value = ['utp0012']
-        self.browser.getControl(name="form.subj_comb").value = ['BEDCERT2']
-        self.browser.getControl("Finally Submit").click()
+        # UTP applications allow two, one is not enough
         self.assertEqual(self.utpapplicant.state, 'submitted')
         return