Changeset 15455 for main/waeup.aaue/trunk

Timestamp:

15 Jun 2019, 12:30:51 (6 years ago)

Author:

Henrik Bettermann

Message:

Add course3 field.

Location:

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

Files:

• applicants/interfaces.py (modified) (2 diffs)
• applicants/tests/test_applicantcopier.py (modified) (3 diffs)
• applicants/tests/test_browser.py (modified) (2 diffs)
• etranzact/tests.py (modified) (3 diffs)
• interswitch/tests.py (modified) (2 diffs)

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

@@ -123 +123 @@
         )
 
+    course3 = schema.Choice(
+        title = _(u'3rd Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = False,
+        )
+
     fst_sit_fname = schema.TextLine(
         title = _(u'Full Name'),
@@ -506 +512 @@
 
     @invariant
-    def second_choice(applicant):
+    def course_choice(applicant):
         if applicant.course1 == applicant.course2:
             raise Invalid(_("2nd choice course must differ from 1st choice course."))
+        if applicant.course1 == applicant.course3:
+            raise Invalid(_("3rd choice course must differ from 1st choice course."))
+        if applicant.course2 == applicant.course3:
+            raise Invalid(_("3rd choice course must differ from 2nd choice course."))
 
 #ICustomUGApplicant['programme_type'].order = IApplicantBaseData[

main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_applicantcopier.py

@@ -24 +24 @@
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from zope.event import notify
-from zope.component import getUtility
+from zope.component import getUtility, createObject
 from zope.i18n import translate
 from waeup.kofa.interfaces import IExtFileStore, IFileStoreNameChooser
@@ -38 +38 @@
     def setUp(self):
         super(ApplicantCopierFunctionalTests, self).setUp()
+        certificate = createObject('waeup.Certificate')
+        certificate.code = 'CERT2'
+        certificate.title = 'New Certificate'
+        certificate.application_category = 'basic'
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            certificate)
         return
 
@@ -46 +52 @@
         self.fill_correct_values()
         self.browser.getControl("Save").click()
+        self.browser.getControl(name="form.course2").value = ['CERT2']
         self.browser.getControl(name="form.nationality").value = ['NG']
         self.browser.getControl(name="form.lga").value = ['abia_aba_north']

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

@@ -56 +56 @@
 
     def test_payment(self):
+        certificate = createObject('waeup.Certificate')
+        certificate.code = 'CERT2'
+        certificate.title = 'New Certificate'
+        certificate.application_category = 'basic'
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            certificate)
         configuration = SessionConfiguration()
         configuration.academic_session = session_1
@@ -62 +68 @@
         self.login()
         self.browser.open(self.edit_path)
+        self.browser.getControl(name="form.course2").value = ['CERT2']
         self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

@@ -17 +17 @@
 ##
 from hurry.workflow.interfaces import IWorkflowState
+from zope.component import createObject, getUtility
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
 from waeup.kofa.applicants.tests.test_browser import (
@@ -273 +274 @@
     def setUp(self):
         super(EtranzactTestsApplicants, self).setUp()
+        certificate = createObject('waeup.Certificate')
+        certificate.code = 'CERT2'
+        certificate.title = 'New Certificate'
+        certificate.application_category = 'basic'
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            certificate)
         self.applicantscontainer.application_fee = 200.0
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -280 +287 @@
         self.browser.getControl(name="transition").value = ['start']
         self.browser.getControl(name="form.nationality").value = ['NG']
+        self.browser.getControl(name="form.course2").value = ['CERT2']
         #self.browser.getControl(name="form.programme_type").value = ['direct']
         self.browser.getControl("Save").click()

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/tests.py

@@ -50 +50 @@
     def setUp(self):
         super(InterswitchTestsApplicants, self).setUp()
+        certificate = createObject('waeup.Certificate')
+        certificate.code = 'CERT2'
+        certificate.title = 'New Certificate'
+        certificate.application_category = 'basic'
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            certificate)
         configuration = SessionConfiguration()
         configuration.academic_session = datetime.now().year - 2
@@ -61 +67 @@
         self.applicantscontainer.application_fee = 10000.0
         self.browser.getControl(name="form.nationality").value = ['NG']
+        self.browser.getControl(name="form.course2").value = ['CERT2']
         self.browser.getControl(name="transition").value = ['start']
         self.browser.getControl("Save").click()