Changeset 16863

Timestamp:

8 Mar 2022, 08:23:06 (3 years ago)

Author:

Henrik Bettermann

Message:

Remove condition.

Location:

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

Files:

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

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

@@ -189 +189 @@
     def _student_per_school_exceeded(self, data):
         container = self.context.__parent__
-        counter = 0
+        counter = 1
         for appl in container.values():
-            if appl.state in (SUBMITTED, ADMITTED, NOT_ADMITTED, CREATED):
-                if appl.school1 == self.context.school1 \
-                    or appl.school1 == data.get('school1'):
+            if appl != self.context \
+                and appl.state in (SUBMITTED, ADMITTED, NOT_ADMITTED, CREATED):
+                if appl.school1 == data.get('school1'):
                     counter += 1
-                    if appl != self.context \
-                        and (appl.subj_comb == self.context.subj_comb \
-                            or appl.subj_comb == data.get('subj_comb')):
+                    if appl.subj_comb == data.get('subj_comb'):
                         return True
                 if counter == 10:

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

@@ -232 +232 @@
             in self.browser.contents)
         self.assertEqual(self.tpuapplicant.state, 'paid')
+        # Create second certificate
+        certificate = createObject('waeup.Certificate')
+        certificate.code = 'CERT2'
+        certificate.title = 'NCECert2'
+        certificate.application_category = 'tpu'
+        certificate.start_level = 100
+        certificate.end_level = 500
+        certificate.study_mode = u'nce_ft'
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            certificate)
         # Create one applicant with same subject and same school
         dummy = createObject(u'waeup.Applicant')
@@ -247 +257 @@
         self.assertTrue("Maximum number of applications per school exceeded."
             in self.browser.contents)
+        # Same school with another subj_comb canbe submitted
         self.assertEqual(self.tpuapplicant.state, 'paid')
         self.browser.open(self.tpuapplicant_path + '/edit')
-        self.browser.getControl(name="form.school1").value = ['s0013']
-        self.browser.getControl(name="form.subj_comb").value = ['CERT1']
-        self.browser.getControl("Finally Submit").click()
-        self.assertTrue(
-            'Application submitted' in self.browser.contents)
+        self.browser.getControl(name="form.school1").value = ['s0012']
+        self.browser.getControl(name="form.subj_comb").value = ['CERT2']
+        self.browser.getControl("Finally Submit").click()
         self.assertEqual(self.tpuapplicant.state, 'submitted')
         return