Changeset 12876

Timestamp:

23 Apr 2015, 21:12:47 (10 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes in base package.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -89 +89 @@
     grok.context(ICustomStudentStudyLevel)
     form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit(
-        'total_credits', 'gpa')
+        'total_credits', 'gpa', 'level')
     form_fields[
         'validation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
@@ -100 +100 @@
     form_fields = grok.AutoFields(ICustomStudentStudyLevel).omit(
         'level_session', 'level_verdict',
-        'validated_by', 'validation_date', 'gpa')
+        'validated_by', 'validation_date', 'gpa', 'level')
 
     omit_fields = ('password', 'suspended', 'suspended_comment',

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

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

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

@@ -7 +7 @@
 from waeup.aaue.utils.utils import CustomKofaUtils
 from waeup.aaue.students.export import (
-    CustomStudentExporter, CustomStudentPaymentsExporter,
+    CustomStudentExporter, CustomStudentPaymentExporter,
     CustomStudentStudyLevelExporter)
 from waeup.aaue.testing import FunctionalLayer
@@ -74 +74 @@
         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
@@ -85 +85 @@
     def test_ifaces(self):
         # make sure we fullfill interface contracts
-        obj = CustomStudentPaymentsExporter()
+        obj = CustomStudentPaymentExporter()
         verifyObject(ICSVExporter, obj)
-        verifyClass(ICSVExporter, CustomStudentPaymentsExporter)
+        verifyClass(ICSVExporter, CustomStudentPaymentExporter)
         return
 
@@ -96 +96 @@
         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()