Changeset 15462 for main/waeup.aaue/trunk

Timestamp:

19 Jun 2019, 07:24:30 (6 years ago)

Author:

Henrik Bettermann

Message:

Make course2 and course3 selection compulsory.

Location:

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

Files:

• interfaces.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -837 +837 @@
         )
 
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+
+    course2 = schema.Choice(
+        title = _(u'2nd Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+
+    course3 = schema.Choice(
+        title = _(u'3rd Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+
     fst_sit_fname = schema.TextLine(
         title = _(u'Full Name'),
@@ -888 +906 @@
 ICustomUGApplicantEdit['date_of_birth'].order = ICustomUGApplicant[
     'date_of_birth'].order
+ICustomUGApplicantEdit['course1'].order = ICustomUGApplicant[
+    'course1'].order
+ICustomUGApplicantEdit['course2'].order = ICustomUGApplicant[
+    'course2'].order
+ICustomUGApplicantEdit['course3'].order = ICustomUGApplicant[
+    'course3'].order
 ICustomUGApplicantEdit['fst_sit_fname'].order = ICustomUGApplicant[
     'fst_sit_fname'].order

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

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