Changeset 8530 for main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py

Timestamp:

27 May 2012, 16:46:26 (12 years ago)

Author:

Henrik Bettermann

Message:

Reorganise UG interfaces. The order attribute can't be used for inserting new fields.

Add IPUTMEApplicantEdit.

File:

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

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

@@ -24 +24 @@
     AppCatCertificateSource, CertificateSource)
 from waeup.kofa.schoolgrades import ResultEntryField
-from waeup.kofa.interfaces import SimpleKofaVocabulary, academic_sessions_vocab
-from waeup.kofa.schema import FormattedDate
-from waeup.kofa.students.vocabularies import nats_vocab
+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.uniben.interfaces import (
     LGASource, high_qual, high_grade, exam_types)
@@ -36 +38 @@
 UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
     'student_id', 'screening_score', 'screening_venue')
+PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + (
+    'firstname', 'middlename', 'lastname', 'sex',
+    'course1', 'lga', 'jambscore')
 
 PG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
 PG_OMIT_MANAGE_FIELDS = ()
-PG_OMIT_EDIT_FIELDS = PG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
+PG_OMIT_EDIT_FIELDS = PG_OMIT_MANAGE_FIELDS + (
+    'locked', 'course_admitted',
     'student_id', 'screening_score', 'screening_venue')
 
@@ -60 +66 @@
         required = False,
         )
-
-# This ordering doesn't work properly.
-IUGApplicant[
-    'nationality'].order =  IApplicantBaseData['sex'].order
-IUGApplicant[
-    'lga'].order =  IUGApplicant['nationality'].order
-
+    perm_address = schema.Text(
+        title = _(u'Permanent Address'),
+        required = False,
+        )
+    course1 = schema.Choice(
+        title = _(u'1st Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = True,
+        )
+    course2 = schema.Choice(
+        title = _(u'2nd Choice Course of Study'),
+        source = AppCatCertificateSource(),
+        required = False,
+        )
+    jambscore = schema.Int(
+        title = _(u'JAMB Score'),
+        required = False,
+        )
+
+
+# More fields
+
+
+    notice = schema.Text(
+        title = _(u'Notice'),
+        required = False,
+        )
+    screening_venue = schema.TextLine(
+        title = _(u'Screening Venue'),
+        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,
+        )
+    locked = schema.Bool(
+        title = _(u'Form locked'),
+        default = False,
+        )
 
 class IPGApplicant(IApplicantBaseData):
@@ -227 +275 @@
         readonly = False,
         )
+    student_id = schema.TextLine(
+        title = _(u'Student Id'),
+        required = False,
+        readonly = False,
+        )
     course_admitted = schema.Choice(
         title = _(u'Admitted Course of Study'),
@@ -233 +286 @@
         readonly = False,
         )
-
-
-# This ordering doesn't work properly.
-IPGApplicant[
-    'nationality'].order =  IApplicantBaseData['sex'].order
-IPGApplicant[
-    'lga'].order =  IPGApplicant['nationality'].order
-IPGApplicant[
-    'student_id'].order =  IPGApplicant['notice'].order
-
+    locked = schema.Bool(
+        title = _(u'Form locked'),
+        default = False,
+        )
 
 class ICustomApplicant(IUGApplicant,IPGApplicant):
@@ -286 +333 @@
 
     """
+
+class IPUTMEApplicantEdit(IUGApplicant):
+    """An undergraduate applicant interface for editing.
+
+    Here we can repeat the fields from base data and set the
+    `required` and `readonly` attributes to True to further restrict
+    the data access. Or we can allow only certain certificates to be
+    selected by choosing the appropriate source.
+
+    We cannot omit fields here. This has to be done in the
+    respective form page.
+    """
+    email = schema.ASCIILine(
+        title = _(u'Email Address'),
+        required = True,
+        constraint=validate_email,
+        )
+
+IPUTMEApplicantEdit[
+    'email'].order =  IUGApplicant['email'].order