Changeset 13624 for main/waeup.uniben/trunk/src/waeup/uniben/students

Timestamp:

17 Jan 2016, 07:28:57 (9 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• payments.py (modified) (2 diffs)
• tests/test_export.py (modified) (2 diffs)

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

@@ -343 +343 @@
         tabledata = []
         tableheader = []
-        contenttitle = []
         for i in range(1,7):
             tabledata.append(sorted(
@@ -409 +408 @@
         tabledata = []
         tableheader = []
-        contenttitle = []
         for i in range(1,7):
             tabledata.append(sorted(

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

@@ -23 +23 @@
 from zope.interface import implementedBy
 from waeup.kofa.students.interfaces import IStudentNavigation
-from waeup.kofa.students.payments import (
-    StudentOnlinePayment, StudentOnlinePaymentFactory)
 from waeup.kofa.utils.helpers import attrs_to_fields
+from kofacustom.nigeria.students.payments import (
+    NigeriaStudentOnlinePayment, NigeriaStudentOnlinePaymentFactory)
 from waeup.uniben.students.interfaces import ICustomStudentOnlinePayment
 
-class CustomStudentOnlinePayment(StudentOnlinePayment):
+class CustomStudentOnlinePayment(NigeriaStudentOnlinePayment):
     """This is a custom online payment for students.
 
@@ -50 +50 @@
     CustomStudentOnlinePayment, omit=['display_item'])
 
-class CustomStudentOnlinePaymentFactory(StudentOnlinePaymentFactory):
+class CustomStudentOnlinePaymentFactory(NigeriaStudentOnlinePaymentFactory):
     """A factory for student online payments.
     """

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_export.py

@@ -49 +49 @@
             'clr_code,date_of_birth,def_adm,disabled,email,emp2_end,'
             'emp2_position,emp2_reason,emp2_start,emp_end,emp_position,'
-            'emp_reason,emp_start,employer,employer2,firstname,former_matric,'
+            'emp_reason,emp_start,employer,employer2,'
+            'financial_clearance_date,financially_cleared_by,'
+            'firstname,former_matric,'
             'fst_sit_date,fst_sit_fname,fst_sit_no,fst_sit_results,'
             'fst_sit_type,hq2_degree,hq2_disc,hq2_matric_no,hq2_school,'
@@ -63 +65 @@
             '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,,,,,'