Changeset 10924 for main/waeup.aaue/trunk

Timestamp:

15 Jan 2014, 10:17:30 (11 years ago)

Author:

Henrik Bettermann

Message:

Add field programme_type and make date_of_birth compulsory.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py (modified) (4 diffs)

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

@@ -43 +43 @@
 from waeup.aaue.payments.interfaces import ICustomOnlinePayment
 
+programme_types_vocab = SimpleKofaVocabulary(
+    (_('5-Year Undergraduate Programme'), 'regular'),
+    (_('4-Year Undergraduate Programme (Direct Entry)'), 'direct'),
+    (_('not applicable'), 'na'),
+    )
+
 class ICustomUGApplicant(IApplicantBaseData):
     """An undergraduate applicant.
@@ -50 +56 @@
     adding them to the UG_OMIT* tuples.
     """
+
+    programme_type = schema.Choice(
+        title = _(u'Programme Type'),
+        vocabulary = programme_types_vocab,
+        required = True,
+        )
 
     nationality = schema.Choice(
@@ -213 +225 @@
             raise Invalid(_("2nd choice course must differ from 1st choice course."))
 
+ICustomUGApplicant['programme_type'].order = IApplicantBaseData[
+    'reg_number'].order
+
 class ICustomPGApplicant(INigeriaPGApplicant):
     """A postgraduate applicant.
@@ -252 +267 @@
     """
 
+    date_of_birth = FormattedDate(
+        title = _(u'Date of Birth'),
+        required = True,
+        show_year = True,
+        )
+
+ICustomUGApplicantEdit['date_of_birth'].order = ICustomUGApplicant[
+    'date_of_birth'].order
+
 class ICustomPGApplicantEdit(INigeriaPGApplicantEdit):
     """A postgraduate applicant interface for editing.