Changeset 9567 for main/kofacustom.nigeria/trunk/src/kofacustom

Timestamp:

7 Nov 2012, 10:07:03 (12 years ago)

Author:

Henrik Bettermann

Message:

Add next_kin_phone.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students

Files:

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

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/interfaces.py

@@ -20 +20 @@
 from waeup.kofa.schema import TextLineChoice
 from waeup.kofa.interfaces import SimpleKofaVocabulary, academic_sessions_vocab
-from waeup.kofa.schema import FormattedDate
+from waeup.kofa.schema import FormattedDate, PhoneNumber
 from waeup.kofa.schoolgrades import ResultEntryField
 from waeup.kofa.students.vocabularies import nats_vocab
@@ -393 +393 @@
         required = False,
         readonly = False,
-        description = _(u'Please provide email address and/or phone number.'),
+        )
+
+    next_kin_phone = PhoneNumber(
+        title = _(u'Next of Kin Phone'),
+        description = u'',
+        required = False,
+        readonly = False,
         )
 
@@ -457 +463 @@
         required = True,
         readonly = False,
-        description = _(u'Please provide email address and/or phone number.'),
-        )
-
+        )
+
+    next_kin_phone = PhoneNumber(
+        title = _(u'Next of Kin Phone'),
+        description = u'',
+        required = True,
+        readonly = False,
+        )
+
+INigeriaStudentPersonalEdit['perm_address'].order = INigeriaStudentPersonal[
+    'perm_address'].order
 INigeriaStudentPersonalEdit['next_kin_name'].order = INigeriaStudentPersonal[
     'next_kin_name'].order
@@ -466 +480 @@
 INigeriaStudentPersonalEdit['next_kin_address'].order = INigeriaStudentPersonal[
     'next_kin_address'].order
-INigeriaStudentPersonalEdit['perm_address'].order = INigeriaStudentPersonal[
-    'perm_address'].order
+INigeriaStudentPersonalEdit['next_kin_phone'].order = INigeriaStudentPersonal[
+    'next_kin_phone'].order
 
 class INigeriaStudentStudyCourse(IStudentStudyCourse):

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_browser.py

@@ -250 +250 @@
         self.browser.getControl(name="form.next_kin_relation").value = 'mother'
         self.browser.getControl(name="form.next_kin_address").value = 'sweet home'
+        self.browser.getControl(name="form.next_kin_phone.country").value = ['+234']
+        self.browser.getControl(name="form.next_kin_phone.ext").value = '45678'
         self.browser.getControl("Save").click()
         self.assertMatches('...Form has been saved...',

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_export.py

@@ -55 +55 @@
             'hq_school,hq_session,hq_type,is_staff,lastname,lga,'
             'marit_stat,matric_number,middlename,nationality,'
-            'next_kin_address,next_kin_name,next_kin_relation,'
+            'next_kin_address,next_kin_name,next_kin_phone,next_kin_relation,'
             'nysc_lga,nysc_location,nysc_year,officer_comment,'
             'perm_address,personal_updated,phone,reg_number,'
@@ -64 +64 @@
             '"[(\'visual_art\', \'A1\')]",0,my clr code,1981-02-04#,,,'
             'anna@sample.com,,,,,,,,,,,Anna,,,,,"[(\'visual_art\', \'A1\')]"'
-            ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,'
+            ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,'
             '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,,,,,'
             '"[(\'visual_art\', \'A1\')]",,f,A111111,0,,created,'