Changeset 10088 for main/waeup.futminna/trunk/src/waeup

Timestamp:

22 Apr 2013, 05:20:58 (12 years ago)

Author:

Henrik Bettermann

Message:

Customize pg application forms.

Location:

main/waeup.futminna/trunk/src/waeup/futminna/applicants

Files:

• browser.py (added)
• browser_templates/applicantdisplaypage.pt (added)
• interfaces.py (modified) (3 diffs)
• utils.py (modified) (2 diffs)

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

@@ -23 +23 @@
     IApplicantBaseData,
     AppCatCertificateSource, CertificateSource)
-from waeup.kofa.schoolgrades import ResultEntryField
-from waeup.kofa.interfaces import (
-    SimpleKofaVocabulary, academic_sessions_vocab, validate_email)
-from waeup.kofa.schema import FormattedDate, TextLineChoice
-from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
-from waeup.kofa.applicants.interfaces import contextual_reg_num_source
+from waeup.kofa.students.vocabularies import nats_vocab
 from kofacustom.nigeria.applicants.interfaces import (
-    LGASource, high_qual, high_grade, exam_types,
-    INigeriaUGApplicant, INigeriaPGApplicant,
+    LGASource,
+    INigeriaUGApplicant,
     INigeriaApplicantOnlinePayment,
     INigeriaUGApplicantEdit, INigeriaPGApplicantEdit,
     INigeriaApplicantUpdateByRegNo,
     IPUTMEApplicantEdit,
+    OMIT_DISPLAY_FIELDS,
+    UG_OMIT_DISPLAY_FIELDS,
+    UG_OMIT_PDF_FIELDS,
+    UG_OMIT_MANAGE_FIELDS,
+    UG_OMIT_EDIT_FIELDS,
     )
+
+
+PG_OMIT_DISPLAY_FIELDS = OMIT_DISPLAY_FIELDS + ('course2',)
+PG_OMIT_PDF_FIELDS = PG_OMIT_DISPLAY_FIELDS + ('phone',)
+PG_OMIT_MANAGE_FIELDS = ('course2',)
+PG_OMIT_EDIT_FIELDS = PG_OMIT_MANAGE_FIELDS + PG_OMIT_DISPLAY_FIELDS + (
+    'student_id', 'notice',
+    'screening_score', 'screening_venue',
+    'screening_date',)
+
 from waeup.futminna.interfaces import MessageFactory as _
-from waeup.futminna.payments.interfaces import ICustomOnlinePayment
 
 class ICustomUGApplicant(INigeriaUGApplicant):
@@ -48 +57 @@
     """
 
-class ICustomPGApplicant(INigeriaPGApplicant):
+class ICustomPGApplicant(IApplicantBaseData):
     """A postgraduate applicant.
 
@@ -55 +64 @@
     adding them to the PG_OMIT* tuples.
     """
+
+    nationality = schema.Choice(
+        source = nats_vocab,
+        title = _(u'Nationality'),
+        required = True,
+        )
+    lga = schema.Choice(
+        source = LGASource(),
+        title = _(u'State/LGA (Nigerians only)'),
+        required = False,
+        )
+    perm_address = schema.Text(
+        title = _(u'Permanent Address'),
+        required = False,
+        )
+    course1 = schema.Choice(
+        title = _(u'Programme desired'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+    notice = schema.Text(
+        title = _(u'Notice'),
+        required = False,
+        readonly = False,
+        )
+    #screening_venue = schema.TextLine(
+    #    title = _(u'Screening Venue'),
+    #    required = False,
+    #    )
+    #screening_date = schema.TextLine(
+    #    title = _(u'Screening Date'),
+    #    required = False,
+    #    )
+    #screening_score = schema.Int(
+    #    title = _(u'Screening Score (%)'),
+    #    required = False,
+    #    )
+    student_id = schema.TextLine(
+        title = _(u'Student Id'),
+        required = False,
+        readonly = False,
+        )
+    course_admitted = schema.Choice(
+        title = _(u'Admitted Course of Study'),
+        source = CertificateSource(),
+        required = False,
+        readonly = False,
+        )
+    locked = schema.Bool(
+        title = _(u'Form locked'),
+        default = False,
+        )
 
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant):

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

@@ -23 +23 @@
 import grok
 from kofacustom.nigeria.applicants.utils import NigeriaApplicantsUtils
-
+from waeup.futminna.interfaces import MessageFactory as _
 
 
@@ -29 +29 @@
     """A collection of parameters and methods subject to customization.
     """
+
+    SEPARATORS_DICT = {
+      'form.student_id': _(u'Process Data'),
+      }