Changeset 8069 for main/waeup.kofa/trunk/src/waeup/kofa/applicants

Timestamp:

9 Apr 2012, 06:34:38 (13 years ago)

Author:

Henrik Bettermann

Message:

Remove Nigerian lgas from base package. LGAs are not core data.

Use the COUNTRIES instead of NATS.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• interfaces.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)
• tests/test_export.py (modified) (6 diffs)

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

@@ -34 +34 @@
 from waeup.kofa.payments.interfaces import IOnlinePayment
 from waeup.kofa.schoolgrades import ResultEntryField
-from waeup.kofa.students.vocabularies import (
-    lgas_vocab, GenderSource)
+from waeup.kofa.students.vocabularies import GenderSource
 from waeup.kofa.university.vocabularies import (
     course_levels, AppCatSource, CertificateSource)
@@ -343 +342 @@
         required = True,
         )
-    lga = schema.Choice(
-        source = lgas_vocab,
-        title = _(u'State/LGA'),
-        default = 'foreigner',
-        required = False,
-        )
     sex = schema.Choice(
         title = _(u'Sex'),

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -157 +157 @@
         self.browser.getControl(name="form.course1").value = ['CERT1']
         self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
-        self.browser.getControl(name="form.lga").value = ['foreigner']
         self.browser.getControl(name="form.sex").value = ['m']
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py

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