Changeset 8072

Timestamp:

9 Apr 2012, 07:53:53 (12 years ago)

Author:

Henrik Bettermann

Message:

Doing the same in custom.

Location:

main/waeup.custom/trunk/src/waeup/custom

Files:

• applicants/interfaces.py (modified) (4 diffs)
• applicants/tests.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• students/interfaces.py (modified) (7 diffs)
• utils/lgas.py (added)

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

@@ -21 +21 @@
 from zope import schema
 from waeup.kofa.applicants.interfaces import IApplicantBaseData
+from waeup.kofa.students.vocabularies import nats_vocab
+from waeup.custom.interfaces import lgas_vocab
 from waeup.custom.interfaces import MessageFactory as _
 
@@ -28 +30 @@
     """
 
+    nationality = schema.Choice(
+        source = nats_vocab,
+        title = _(u'Nationality'),
+        required = False,
+        )
+    lga = schema.Choice(
+        source = lgas_vocab,
+        title = _(u'State/LGA (Nigerians only)'),
+        required = False,
+        )
+
+# This ordering doesn't work properly.
+IUGApplicant[
+    'nationality'].order =  IApplicantBaseData['sex'].order
+IUGApplicant[
+    'lga'].order =  IUGApplicant['nationality'].order
+
 class IPGApplicant(IApplicantBaseData):
     """A postgraduate applicant.
@@ -33 +52 @@
     """
 
+    nationality = schema.Choice(
+        source = nats_vocab,
+        title = _(u'Nationality'),
+        required = False,
+        )
+    lga = schema.Choice(
+        source = lgas_vocab,
+        title = _(u'State/LGA (Nigerians only)'),
+        required = False,
+        )
     employer = schema.TextLine(
         title = _(u'Employer'),
@@ -38 +67 @@
         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
 
 class IApplicant(IUGApplicant,IPGApplicant):

main/waeup.custom/trunk/src/waeup/custom/applicants/tests.py

@@ -196 +196 @@
             'applicant_id,application_date,application_number,course1,course2,'
             'course_admitted,date_of_birth,display_fullname,email,employer,'
-            'firstname,history,lastname,lga,locked,middlename,notice,password,'
-            'phone,reg_number,screening_score,screening_venue,sex,state,'
-            'student_id'
+            'firstname,history,lastname,lga,locked,middlename,nationality,'
+            'notice,password,phone,reg_number,screening_score,screening_venue,'
+            'sex,state,student_id'
             in result)
         self.assertTrue(
-            'Application initialized by system\'],Tester,foreigner,0,M.,'
+            'Application initialized by system\'],Tester,,0,M.,,'
             '"Some notice\nin lines.",any password,+234-123-12345,123456,98,'
             'Exam Room,f,initialized,' in result)

main/waeup.custom/trunk/src/waeup/custom/interfaces.py

@@ -19 +19 @@
 import zope.i18nmessageid
 from zope import schema
-from waeup.kofa.interfaces import (
+from waeup.kofa.interfaces import (SimpleKofaVocabulary,
     ISessionConfiguration, academic_sessions_vocab)
+from waeup.custom.utils.lgas import LGAS
 
 _ = MessageFactory = zope.i18nmessageid.MessageFactory('waeup.custom')
+
+lgas_vocab = SimpleKofaVocabulary(
+    *sorted([(x[1],x[0]) for x in LGAS]))
 
 # It's recommended to replicate all fields from the base package here.

main/waeup.custom/trunk/src/waeup/custom/students/interfaces.py

@@ -19 +19 @@
 from waeup.kofa.schema import TextLineChoice
 from waeup.kofa.interfaces import SimpleKofaVocabulary
+from waeup.kofa.students.vocabularies import nats_vocab
 from waeup.kofa.students.interfaces import (
     IStudentBase,IUGStudentClearance,IPGStudentClearance,
@@ -24 +25 @@
     )
 from waeup.kofa.students.vocabularies import (
-    lgas_vocab, nats_vocab, contextual_reg_num_source)
+    nats_vocab, contextual_reg_num_source)
+from waeup.custom.interfaces import lgas_vocab
+from waeup.custom.interfaces import MessageFactory as _
 
 class IStudentBase(IStudentBase):
@@ -32 +35 @@
 
     reg_number = TextLineChoice(
-        title = u'Registration Number',
+        title = _(u'Registration Number'),
         required = False,
         readonly = False,
@@ -48 +51 @@
         required = False,
         vocabulary = SimpleKofaVocabulary(
-            ('Unmarried', 'unmarried'),
-            ('Married', 'married'),)
+            (_('Unmarried'), 'unmarried'),
+            (_('Married'), 'married'),)
         )
 
@@ -57 +60 @@
     """
     date_of_birth = schema.Date(
-        title = u'Date of Birth',
+        title = _(u'Date of Birth'),
         required = False,
         )
@@ -63 +66 @@
     nationality = schema.Choice(
         source = nats_vocab,
-        title = u'Nationality',
-        default = 'nigeria',
+        title = _(u'Nationality'),
         required = False,
         )
@@ -70 +72 @@
     lga = schema.Choice(
         source = lgas_vocab,
-        title = u'State/LGA',
+        title = _(u'State/LGA (Nigerians only)'),
         required = False,
         )