Changeset 10594

Timestamp:

6 Sep 2013, 06:07:02 (11 years ago)

Author:

Henrik Bettermann

Message:

Enable import of empty sex and course1 cells.

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/applicants

Files:

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

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

@@ -67 +67 @@
     adding them to the UG_OMIT* tuples.
     """
-
+    sex = schema.Choice(
+        title = _(u'Sex'),
+        source = GenderSource(),
+        required = False,
+        )
     nationality = schema.Choice(
         source = nats_vocab,
         title = _(u'Nationality'),
-        required = True,
+        required = False,
         )
     lga = schema.Choice(
@@ -93 +97 @@
         title = _(u'1st Choice Course of Study'),
         source = AppCatCertificateSource(),
-        required = True,
+        required = False,
         )
     course2 = schema.Choice(
@@ -194 +198 @@
         title = _(u'Result uploaded'),
         default = False,
+        required = False,
         )
     student_id = schema.TextLine(
@@ -208 +213 @@
         title = _(u'Form locked'),
         default = False,
-        )
+        required = False,
+        )
+
+ICustomUGApplicant[
+    'sex'].order =  IApplicantBaseData['sex'].order
 
 class ICustomPGApplicant(INigeriaPGApplicant):
@@ -249 +258 @@
     """
 
+    sex = schema.Choice(
+        title = _(u'Sex'),
+        source = GenderSource(),
+        required = True,
+        )
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+
+ICustomUGApplicantEdit[
+    'course1'].order =  ICustomUGApplicant['course1'].order
+ICustomUGApplicantEdit[
+    'sex'].order =  ICustomUGApplicant['sex'].order
+
 class ICustomPGApplicantEdit(INigeriaPGApplicantEdit):
     """A postgraduate applicant interface for editing.

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

@@ -106 +106 @@
         self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
         self.browser.getControl(name="form.lga").value = ['foreigner']
-        self.browser.getControl(name="form.nationality").value = ['NG']
-        self.browser.getControl(name="form.sex").value = ['m']
+        #self.browser.getControl(name="form.nationality").value = ['NG']
+        #self.browser.getControl(name="form.sex").value = ['m']
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
 
@@ -135 +135 @@
         self.assertTrue("Higher" in self.browser.contents)
         self.assertTrue("'O' Level" in self.browser.contents)
+
+        self.browser.open(self.ndftapplicant_path + '/manage')
+        # Manager can fill and save the form
+        self.fill_correct_values()
+        self.browser.getControl("Save").click()
+        self.assertMatches('...Form has been saved...', self.browser.contents)
         return