Changeset 13977 for main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

Timestamp:

23 Jun 2016, 07:25:56 (8 years ago)

Author:

Henrik Bettermann

Message:

Changes requested in ticket #232 (fire brigade approach).

File:

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

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

@@ -60 +60 @@
     """
 
-    programme_type = schema.Choice(
-        title = _(u'Programme Type'),
-        vocabulary = programme_types_vocab,
-        required = False,
-        )
+    #programme_type = schema.Choice(
+    #    title = _(u'Programme Type'),
+    #    vocabulary = programme_types_vocab,
+    #    required = False,
+    #    )
 
     nationality = schema.Choice(
@@ -84 +84 @@
         required = False,
         )
-    jamb_reg_number = schema.TextLine(
-        title = _(u'JAMB Registration Number'),
-        required = False,
-        )
+    #jamb_reg_number = schema.TextLine(
+    #    title = _(u'JAMB Registration Number'),
+    #    required = False,
+    #    )
     jamb_score = schema.Int(
         title = _(u'Total JAMB Score'),
+        required = False,
+        )
+    jamb_subjects = schema.Text(
+        title = _(u'JAMB Subjects and Scores'),
         required = False,
         )
@@ -406 +410 @@
         required = False,
         )
+
+
+    master_sheet_number = schema.TextLine(
+        title = _(u'Master Sheet Number'),
+        required = False,
+        readonly = False,
+        )
+
     #screening_venue = schema.TextLine(
     #    title = _(u'Screening Venue'),
@@ -447 +459 @@
             raise Invalid(_("2nd choice course must differ from 1st choice course."))
 
-ICustomUGApplicant['programme_type'].order = IApplicantBaseData[
-    'reg_number'].order
+#ICustomUGApplicant['programme_type'].order = IApplicantBaseData[
+#    'reg_number'].order
 
 class ICustomPGApplicant(INigeriaPGApplicant):
@@ -628 +640 @@
     """
 
-    programme_type = schema.Choice(
-        title = _(u'Programme Type'),
-        vocabulary = programme_types_vocab,
-        required = True,
-        )
+    #programme_type = schema.Choice(
+    #    title = _(u'Programme Type'),
+    #    vocabulary = programme_types_vocab,
+    #    required = True,
+    #    )
 
     date_of_birth = FormattedDate(
@@ -640 +652 @@
         )
 
-ICustomUGApplicantEdit['programme_type'].order = ICustomUGApplicant[
-    'programme_type'].order
+#ICustomUGApplicantEdit['programme_type'].order = ICustomUGApplicant[
+#    'programme_type'].order
 ICustomUGApplicantEdit['date_of_birth'].order = ICustomUGApplicant[
     'date_of_birth'].order