Changeset 8101 for main/waeup.uniben/trunk/src/waeup/uniben/applicants

Timestamp:

11 Apr 2012, 07:54:10 (13 years ago)

Author:

Henrik Bettermann

Message:

Add more fields to application and clearance forms (work in progress).

Location:

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

Files:

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

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

@@ -26 +26 @@
 from waeup.kofa.interfaces import SimpleKofaVocabulary
 from waeup.kofa.students.vocabularies import nats_vocab
-from waeup.uniben.interfaces import lgas_vocab
+from waeup.uniben.interfaces import (
+    lgas_vocab, high_qual, high_grade, exam_types)
 from waeup.uniben.interfaces import MessageFactory as _
-
-high_qual = SimpleKofaVocabulary(
-    ('National Certificate of Education','nce'),
-    ('Pre Degree Programme','pre'),
-    ('Diploma Programme','dip'),
-    ('Ordinary National Diploma','ond'),
-    ('Bachelors Degree','bd'),
-    ('Masters Degree','md'),
-    ('Professional Qualification','pq'),
-    ('Other Certification','oc'),
-    ('Higher National Diploma','hnd'),
-    ('NCE AL OTH','nce_al_oth'),
-    ('National Defence Academy','nda'),
-    ('Awaiting Results','a_rslt'),
-    ('RMC','rmc'),
-    )
-
-high_grade = SimpleKofaVocabulary(
-    ('Upper Credit','upper_credit'),
-    ('Distinction','distinction'),
-    ('Credit','credit'),
-    ('Merit','merit'),
-    ('Lower Credit','lower_credit'),
-    ('First Class','first_class'),
-    ('Second Class Upper','second_class_upper'),
-    ('Second Class Lower','second_class_lower'),
-    ('Third Class','third_class'),
-    ('Pass','pass'),
-    ('Awaiting Results','a_rslt'),
-    ('A Levels','al'),
-    )
-
-exam_types = SimpleKofaVocabulary(
-    ('SSCE','ssce'),
-    ('WAEC','waec'),
-    ('GCE O\' LEVEL','gce_o_level'),
-    ('TC II','tc_ii'),
-    ('RSA','rsa'),
-    ('NABTEB','nabteb'),
-    ('NECO','neco'),
-    ('ACE','ace'),
-    ('GCE A\' LEVEL','gce_a_level'),
-    ('IGCSE','igcse'),
-    )
 
 class IUGApplicant(IApplicantBaseData):
@@ -162 +119 @@
         readonly = False,
         vocabulary = exam_types,
+        )
+    #presently = schema.Bool(
+    #    title = _(u'Attending'),
+    #    required = False,
+    #    readonly = False,
+    #    )
+    presently_inst = schema.TextLine(
+        title = _(u'If yes, name of institution'),
+        required = False,
+        readonly = False,
+        )
+    nysc_year = schema.Int(
+        title = _(u'Nysc Year'),
+        required = False,
+        readonly = False,
+        )
+    nysc_lga = schema.Choice(
+        source = lgas_vocab,
+        title = _(u'Nysc Location'),
+        required = False,
         )
     employer = schema.TextLine(

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

@@ -48 +48 @@
         'form.presently': _(u'Course or Programme Presently Attending'),
         'form.nysc_year': _(u'NYSC Information'),
-        'form.employer': _(u'Employer History'),
+        'form.employer': _(u'Employment History'),
         'form.notice': _(u'Application Process Information'),
         'form.pp_school': _(u'Post Primary School Qualification'),
+        'form.presently_inst': _(u'Presently attending a course or programme'),
         }