Changeset 9500 for main/waeup.fceokene/trunk/src/waeup/fceokene

Timestamp:

2 Nov 2012, 05:02:41 (12 years ago)

Author:

Henrik Bettermann

Message:

Add second 'O' level record.

Location:

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

Files:

• interfaces.py (modified) (3 diffs)
• utils.py (modified) (1 diff)

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

@@ -86 +86 @@
         )
     olevel_type = schema.Choice(
-        title = _(u'Qualification Obtained'),
+        title = _(u'1st Qualification Obtained'),
         required = False,
         readonly = False,
@@ -92 +92 @@
         )
     olevel_school = schema.TextLine(
-        title = _(u'Institution Attended'),
+        title = _(u'1st Institution Attended'),
         required = False,
         readonly = False,
         )
     olevel_exam_number = schema.TextLine(
-        title = _(u'Exam Number'),
+        title = _(u'1st Exam Number'),
         required = False,
         readonly = False,
         )
     olevel_exam_date = FormattedDate(
-        title = _(u'Exam Date'),
+        title = _(u'1st Exam Date'),
         required = False,
         readonly = False,
@@ -108 +108 @@
         )
     olevel_results = schema.List(
-        title = _(u'Exam Results'),
+        title = _(u'1st Exam Results'),
+        value_type = ResultEntryField(),
+        required = False,
+        readonly = False,
+        default = [],
+        )
+    olevel_type2 = schema.Choice(
+        title = _(u'2nd Qualification Obtained'),
+        required = False,
+        readonly = False,
+        vocabulary = exam_types,
+        )
+    olevel_school2 = schema.TextLine(
+        title = _(u'2nd Institution Attended'),
+        required = False,
+        readonly = False,
+        )
+    olevel_exam_number2 = schema.TextLine(
+        title = _(u'2nd Exam Number'),
+        required = False,
+        readonly = False,
+        )
+    olevel_exam_date2 = FormattedDate(
+        title = _(u'2nd Exam Date'),
+        required = False,
+        readonly = False,
+        show_year = True,
+        )
+    olevel_results2 = schema.List(
+        title = _(u'2nd Exam Results'),
         value_type = ResultEntryField(),
         required = False,

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

@@ -52 +52 @@
         'form.pp_school': _(u'Post Primary School Qualification'),
         'form.presently_inst': _(u'Presently attending a course or programme'),
-        'form.olevel_type': _(u"'O' Level Record"),
+        'form.olevel_type': _(u"'O' Level Records"),
         }