Changeset 15704 for main

Timestamp:

28 Oct 2019, 07:12:20 (5 years ago)

Author:

Henrik Bettermann

Message:

Add email2 field.

Fix tests.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada

Files:

• interswitch/browser.py (modified) (1 diff)
• interswitch/tests.py (modified) (6 diffs)
• students/browser.py (modified) (2 diffs)
• students/interfaces.py (modified) (2 diffs)
• students/tests/test_export.py (modified) (2 diffs)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/browser.py

@@ -99 +99 @@
 </payment_item_detail>""" % xmldict
         self.xml_data = """<input type="hidden" name="xml_data" value='%s'  />""" % xmltext
-
-        self.xml_data = None
-
         self.context.provider_amt = provider_amt
         self.context.gateway_amt = GATEWAY_AMT

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py

@@ -71 +71 @@
             '<span>40000.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
-        self.browser.getLink("CollegePAY", index=0).click()
-        self.assertTrue('<input type="hidden" name="pay_item_id" value="0000" />' in
+        self.browser.getLink("Pay via Interswitch", index=0).click()
+        self.assertTrue('<input type="hidden" name="pay_item_id" value="103" />' in
                            self.browser.contents)
         self.assertEqual(self.student.current_mode, 'ug_ft')
@@ -92 +92 @@
         self.student['payments']['xyz'] = acc_payment
         self.browser.open(self.payments_path + '/xyz')
-        self.browser.getLink("CollegePAY", index=0).click()
-        self.assertMatches('...<input type="hidden" name="pay_item_id" value="0000" />...',
+        self.browser.getLink("Pay via Interswitch", index=0).click()
+        self.assertMatches('...<input type="hidden" name="pay_item_id" value="103" />...',
                            self.browser.contents)
         self.assertMatches('...Total Amount Authorized:...',
@@ -104 +104 @@
         acc_payment.creation_date -= delta
         self.browser.open(self.payments_path + '/xyz')
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches(
             '...This payment ticket is too old. Please create a new ticket...',
@@ -111 +111 @@
         acc_payment.creation_date += delta
         self.browser.open(self.payments_path + '/xyz')
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
@@ -230 +230 @@
     def test_interswitch_form(self):
         # Manager can access InterswitchForm
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches('...Total Amount Authorized:...',
                            self.browser.contents)
@@ -239 +239 @@
         self.applicant.values()[0].creation_date -= delta
         self.browser.open(self.payment_url)
-        self.browser.getLink("CollegePAY", index=0).click()
+        self.browser.getLink("Pay via Interswitch", index=0).click()
         self.assertMatches(
             '...This payment ticket is too old. Please create a new ticket...',

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/browser.py

@@ -34 +34 @@
 from kofacustom.nigeria.students.browser import (
     NigeriaOnlinePaymentDisplayFormPage,
+    NigeriaStudentBaseDisplayFormPage,
     NigeriaStudentBaseManageFormPage,
     NigeriaStudentClearanceEditFormPage,
@@ -40 +41 @@
     NigeriaExportPDFClearanceSlip,
     NigeriaExportPDFCourseRegistrationSlip,
+    NigeriaStudentBaseEditFormPage,
     )
 
 from kofacustom.iuokada.students.interfaces import (
     ICustomStudentOnlinePayment, ICustomStudentStudyCourse,
-    ICustomStudentStudyLevel)
+    ICustomStudentStudyLevel, ICustomStudentBase)
 from kofacustom.iuokada.interfaces import MessageFactory as _
+
+class CustomStudentBaseDisplayFormPage(NigeriaStudentBaseDisplayFormPage):
+    """ Page to display student base data
+    """
+    form_fields = grok.AutoFields(ICustomStudentBase).omit(
+        'password', 'suspended', 'suspended_comment', 'flash_notice')
+
+class CustomStudentBaseManageFormPage(NigeriaStudentBaseManageFormPage):
+    """ View to manage student base data
+    """
+    form_fields = grok.AutoFields(ICustomStudentBase).omit(
+        'student_id', 'adm_code', 'suspended')
+
+class StudentBaseEditFormPage(NigeriaStudentBaseEditFormPage):
+    """ View to edit student base data
+    """
+    form_fields = grok.AutoFields(ICustomStudentBase).select(
+        'email', 'email2', 'parents_email', 'phone',)
 
 class CustomExportPDFCourseRegistrationSlip(

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

@@ -19 +19 @@
 from zope import schema
 from waeup.kofa.students.vocabularies import StudyLevelSource
+from waeup.kofa.interfaces import validate_email
 from kofacustom.nigeria.students.interfaces import (
     INigeriaStudentBase, INigeriaUGStudentClearance, INigeriaPGStudentClearance,
@@ -32 +33 @@
 
     """
+
+    email2 = schema.ASCIILine(
+        title = _(u'Second Email'),
+        required = False,
+        constraint=validate_email,
+        )
+
+ICustomStudentBase['email2'].order = ICustomStudentBase[
+    'phone'].order
+ICustomStudentBase['phone'].order = ICustomStudentBase[
+    'email'].order
 
 class ICustomStudentPersonal(INigeriaStudentPersonal):

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

@@ -48 +48 @@
         self.assertMatches(
             'adm_code,alr_date,alr_fname,alr_no,alr_results,'
-            'clr_code,date_of_birth,def_adm,disabled,email,emp2_end,'
+            'clr_code,date_of_birth,def_adm,disabled,email,email2,emp2_end,'
             'emp2_position,emp2_reason,emp2_start,emp_end,emp_position,'
             'emp_reason,emp_start,employer,employer2,'
@@ -67 +67 @@
             'current_level,current_session\r\nmy adm code,,,,'
             '"[(\'printing_craft_practice\', \'A1\')]",my clr code,1981-02-04#,,,'
-            'anna@sample.com,,,,,,,,,,,,,Anna,,,,,,"[(\'printing_craft_practice\', \'A1\')]"'
+            'anna@sample.com,,,,,,,,,,,,,,Anna,,,,,,"[(\'printing_craft_practice\', \'A1\')]"'
             ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,,'
             '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,,,123,,,,,'