Changeset 12879 for main

Timestamp:

23 Apr 2015, 21:13:40 (10 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) (1 diff)
• export.py (modified) (3 diffs)
• tests/test_export.py (modified) (4 diffs)

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

@@ -279 +279 @@
 
     form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit(
-        'level_verdict', 'gpa')
+        'level_verdict', 'gpa', 'level')
 
     def update(self):

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

@@ -29 +29 @@
     NigeriaStudentStudyLevelExporter,
     NigeriaCourseTicketExporter,
-    NigeriaStudentPaymentsExporter)
+    NigeriaStudentPaymentExporter)
 from waeup.kofa.utils.helpers import iface_names
 
@@ -53 +53 @@
     #: Fieldnames considered by this exporter
     fields = tuple(sorted(iface_names(
-        ICustomStudentStudyLevel) + ['level'])) + (
+        ICustomStudentStudyLevel))) + (
         'student_id', 'number_of_tickets','certcode')
 
@@ -64 +64 @@
         'certcode', 'display_fullname')
 
-class CustomStudentPaymentsExporter(NigeriaStudentPaymentsExporter):
+class CustomStudentPaymentExporter(NigeriaStudentPaymentExporter):
     """Exporter for OnlinePayment instances.
     """

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

@@ -7 +7 @@
 from waeup.uniben.utils.utils import CustomKofaUtils
 from waeup.uniben.students.export import (
-    CustomStudentExporter, CustomStudentPaymentsExporter)
+    CustomStudentExporter, CustomStudentPaymentExporter)
 from waeup.uniben.testing import FunctionalLayer
 
@@ -73 +73 @@
         return
 
-class CustomStudentPaymentsExporterTest(StudentImportExportSetup):
+class CustomStudentPaymentExporterTest(StudentImportExportSetup):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(CustomStudentPaymentsExporterTest, self).setUp()
+        super(CustomStudentPaymentExporterTest, self).setUp()
         self.setup_for_export()
         return
@@ -84 +84 @@
     def test_ifaces(self):
         # make sure we fullfill interface contracts
-        obj = CustomStudentPaymentsExporter()
+        obj = CustomStudentPaymentExporter()
         verifyObject(ICSVExporter, obj)
-        verifyClass(ICSVExporter, CustomStudentPaymentsExporter)
+        verifyClass(ICSVExporter, CustomStudentPaymentExporter)
         return
 
@@ -95 +95 @@
         self.student['payments']['my-payment'].r_company = 'interswatch'
         self.student['payments']['my-payment'].r_card_num = '789'
-        exporter = CustomStudentPaymentsExporter()
+        exporter = CustomStudentPaymentExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()