Changeset 16926 for main/waeup.fceokene/trunk/src/waeup

Timestamp:

19 Apr 2022, 15:33:02 (3 years ago)

Author:

Henrik Bettermann

Message:

Resolve conflict of interfaces.

Location:

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

Files:

• browser.py (modified) (1 diff)
• export.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests/test_browser.py (modified) (6 diffs)

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

@@ -216 +216 @@
         target = getattr(container, 'prefix', None)
         if target == 'tpu':
+            school = 'school_tpu'
             max = 10
         else:
             max = 7
+            school = 'school_utp'
         for appl in container.values():
             if appl != self.context \
                 and appl.state in (SUBMITTED, ADMITTED, NOT_ADMITTED, CREATED):
-                if appl.school == data.get('school'):
+                if getattr(appl, school) == data.get(school):
                     counter += 1
                     if appl.subj_comb == data.get('subj_comb'):

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

@@ -47 +47 @@
         """
         SCHOOLS.update(SCHOOLS_UTP)
-        if name == 'school' and value is not None:
+        if name.startswith('school') and value is not None:
             try:
                 value = '%s - %s - %s' % (

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

@@ -188 +188 @@
         )
 
-    school = schema.Choice(
+    school_tpu = schema.Choice(
         title = _(u'1st Choice TPZ and School'),
         source = TPUSchoolSource(),

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

@@ -210 +210 @@
         self.browser.open(self.tpuapplicant_path + '/edit')
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
-        self.browser.getControl(name="form.school").value = ['tpu0010']
+        self.browser.getControl(name="form.school_tpu").value = ['tpu0010']
         self.browser.getControl(name="form.subj_comb").value = ['NCECERT1']
         image = open(SAMPLE_IMAGE, 'rb')
@@ -226 +226 @@
             dummy.firstname = u'John'
             dummy.lastname = u'Doe %s' %i
-            dummy.school = 'tpu0010'
+            dummy.school_tpu = 'tpu0010'
             self.app['applicants'][
                 self.tpucontainer.code].addApplicant(dummy)
@@ -233 +233 @@
         self.tpuapplicant.locked = False
         self.browser.open(self.tpuapplicant_path + '/edit')
-        self.browser.getControl(name="form.school").value = ['tpu0010']
+        self.browser.getControl(name="form.school_tpu").value = ['tpu0010']
         self.browser.getControl("Finally Submit").click()
         self.assertTrue("Maximum number of applications per school exceeded."
@@ -252 +252 @@
         dummy.firstname = u'John'
         dummy.lastname = u'Doe %s' %i
-        dummy.school = 'tpu0012'
+        dummy.school_tpu = 'tpu0012'
         dummy.subj_comb = certificate1
         self.app['applicants'][
@@ -258 +258 @@
         IWorkflowState(dummy).setState('submitted')
         self.browser.open(self.tpuapplicant_path + '/edit')
-        self.browser.getControl(name="form.school").value = ['tpu0012']
+        self.browser.getControl(name="form.school_tpu").value = ['tpu0012']
         self.browser.getControl(name="form.subj_comb").value = ['NCECERT1']
         self.browser.getControl("Finally Submit").click()
@@ -266 +266 @@
         self.assertEqual(self.tpuapplicant.state, 'paid')
         self.browser.open(self.tpuapplicant_path + '/edit')
-        self.browser.getControl(name="form.school").value = ['tpu0012']
+        self.browser.getControl(name="form.school_tpu").value = ['tpu0012']
         self.browser.getControl(name="form.subj_comb").value = ['NCECERT2']
         self.browser.getControl("Finally Submit").click()