Changeset 13240

Timestamp:

4 Sep 2015, 08:04:03 (9 years ago)

Author:

Henrik Bettermann

Message:

Make more fields required.

File:

• main/kofacustom.wdu/trunk/src/kofacustom/wdu/applicants/interfaces.py (modified) (6 diffs)

main/kofacustom.wdu/trunk/src/kofacustom/wdu/applicants/interfaces.py

@@ -26 +26 @@
 from waeup.kofa.interfaces import (
     SimpleKofaVocabulary, academic_sessions_vocab, validate_email)
-from waeup.kofa.schema import FormattedDate, TextLineChoice
+from waeup.kofa.schema import FormattedDate, TextLineChoice, PhoneNumber
 from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
 from waeup.kofa.applicants.interfaces import contextual_reg_num_source
@@ -50 +50 @@
         title = _(u'Sex'),
         source = GenderSource(),
-        required = False,
+        required = True,
         )
     marit_stat = schema.Choice(
         title = u'Maritual Status',
-        required = False,
+        required = True,
         vocabulary = SimpleKofaVocabulary(
             (_('Single'), 'single'),
@@ -69 +69 @@
     lga = schema.Choice(
         source = LGASource(),
-        title = _(u'State/LGA (Nigerians only)'),
-        required = False,
+        title = _(u'State/LGA'),
+        description = _("Select 'Foreigner' if not a Nigerian."),
+        required = True,
         )
     religion = schema.Choice(
@@ -247 +248 @@
     jamb_subjects = schema.Text(
         title = _(u'Subjects and Scores'),
-        description = _(u'(one subject with score per line)'),
+        description = _(u'One subject with score per line.'),
         required = False,
         )
@@ -343 +344 @@
     """
 
+    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,
+        )
+    phone = PhoneNumber(
+        title = _(u'Phone'),
+        description = u'',
+        required = True,
+        )
+
+ICustomUGApplicantEdit['email'].order = ICustomUGApplicant['email'].order
+ICustomUGApplicantEdit['date_of_birth'].order = ICustomUGApplicant['date_of_birth'].order
+ICustomUGApplicantEdit['phone'].order = ICustomUGApplicant['phone'].order
+
 class ICustomPGApplicantEdit(INigeriaPGApplicantEdit):
     """A postgraduate applicant interface for editing.
@@ -372 +393 @@
     """
 
+    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,
+        )
+    phone = PhoneNumber(
+        title = _(u'Phone'),
+        description = u'',
+        required = True,
+        )
+
+ICustomPUTMEApplicantEdit['email'].order = ICustomUGApplicant['email'].order
+ICustomPUTMEApplicantEdit['date_of_birth'].order = ICustomUGApplicant['date_of_birth'].order
+ICustomPUTMEApplicantEdit['phone'].order = ICustomUGApplicant['phone'].order
+
 class ICustomApplicantUpdateByRegNo(INigeriaApplicantUpdateByRegNo):
     """Representation of an applicant.