Changeset 9497

Timestamp:

1 Nov 2012, 09:38:55 (12 years ago)

Author:

Henrik Bettermann

Message:

ICustomUGApplicantEdit mus inherit from ICustomUGApplicant.

Location:

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

Files:

• interfaces.py (modified) (4 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -34 +34 @@
     INigeriaUGApplicant, INigeriaPGApplicant,
     INigeriaApplicantOnlinePayment,
-    INigeriaUGApplicantEdit, INigeriaPGApplicantEdit,
+    INigeriaUGApplicantEdit,
     INigeriaApplicantUpdateByRegNo,
     IPUTMEApplicantEdit,
@@ -222 +222 @@
         """
 
-class ICustomUGApplicantEdit(INigeriaUGApplicantEdit):
+class ICustomUGApplicantEdit(ICustomUGApplicant):
     """An undergraduate applicant interface for edit forms.
 
@@ -234 +234 @@
     """
 
-class ICustomPGApplicantEdit(INigeriaPGApplicantEdit):
+
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        )
+    date_of_birth = FormattedDate(
+        title = _(u'Date of Birth'),
+        required = True,
+        show_year = True,
+        )
+
+class ICustomPGApplicantEdit(ICustomPGApplicant):
     """A postgraduate applicant interface for editing.
 
@@ -246 +258 @@
     """
 
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        )
+    date_of_birth = FormattedDate(
+        title = _(u'Date of Birth'),
+        required = True,
+        show_year = True,
+        )
+
 class ICustomApplicantOnlinePayment(INigeriaApplicantOnlinePayment):
     """An applicant payment via payment gateways.

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

@@ -118 +118 @@
         self.browser.open(self.becapplicant_path + '/manage')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertTrue("'O' Level" in self.browser.contents)
         self.browser.open(self.becapplicant_path + '/edit')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertTrue("'O' Level" in self.browser.contents)
         self.browser.open(self.becapplicant_path + '/application_slip.pdf')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')