Changeset 16088 for main

Timestamp:

11 May 2020, 07:50:40 (5 years ago)

Author:

Henrik Bettermann

Message:

Add institution email.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

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

main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py

@@ -75 +75 @@
     form_fields = grok.AutoFields(ICustomStudentBase).omit(
         'password', 'suspended', 'suspended_comment',
-        'flash_notice', 'provisionally_cleared')
+        'flash_notice', 'provisionally_cleared', 'parents_email')
     form_fields[
         'financial_clearance_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
 
-#class CustomStudentBaseManageFormPage(NigeriaStudentBaseManageFormPage):
-#    """ View to manage student base data
-#    """
-#    form_fields = grok.AutoFields(ICustomStudentBase).omit(
-#        'student_id', 'adm_code', 'suspended',
-#        'financially_cleared_by', 'financial_clearance_date')
+class CustomStudentBaseManageFormPage(NigeriaStudentBaseManageFormPage):
+    """ View to manage student base data
+    """
+    form_fields = grok.AutoFields(ICustomStudentBase).omit(
+        'student_id', 'adm_code', 'suspended',
+        'financially_cleared_by', 'financial_clearance_date',
+        'parents_email')
 
 class CustomOnlinePaymentDisplayFormPage(NigeriaOnlinePaymentDisplayFormPage):

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

@@ -39 +39 @@
         required = False,
         )
+
+    email2 = schema.ASCIILine(
+        title = _(u'Institution Email'),
+        required = False,
+        constraint=validate_email,
+        )
+
+ICustomStudentBase['email2'].order = ICustomStudentBase[
+    'phone'].order
+ICustomStudentBase['phone'].order = ICustomStudentBase[
+    'email'].order
 
 class ICustomStudentPersonal(INigeriaStudentPersonal):

main/waeup.uniben/trunk/src/waeup/uniben/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,,,,,'