Changeset 12104 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

1 Dec 2014, 14:43:16 (10 years ago)

Author:

Henrik Bettermann

Message:

Ease customization of STUDENT_EXPORTER_NAMES.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (2 diffs)
• export.py (modified) (1 diff)
• student.py (modified) (2 diffs)
• tests/test_student.py (modified) (3 diffs)
• utils.py (modified) (1 diff)

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

@@ -76 +76 @@
     )
 from waeup.kofa.students.catalog import search, StudentQueryResultItem
-from waeup.kofa.students.export import EXPORTER_NAMES
 from waeup.kofa.students.studylevel import StudentStudyLevel, CourseTicket
 from waeup.kofa.students.vocabularies import StudyLevelSource
@@ -3180 +3179 @@
             self.exporters = exporters
             return
-        for name in EXPORTER_NAMES:
+        STUDENT_EXPORTER_NAMES = getUtility(
+            IStudentsUtils).STUDENT_EXPORTER_NAMES
+        for name in STUDENT_EXPORTER_NAMES:
             util = getUtility(ICSVExporter, name=name)
             exporters.append((util.title, name),)

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

@@ -33 +33 @@
 from waeup.kofa.utils.helpers import iface_names, to_timezone
 
-#: A tuple containing all exporter names referring to students or
-#: subobjects thereof.
-EXPORTER_NAMES = ('students', 'studentstudycourses',
-        'studentstudylevels', 'coursetickets',
-        'studentpayments', 'bedtickets', 'paymentsoverview',
-        'studylevelsoverview', 'combocard', 'bursary')
 
 def get_students(site, stud_filter=StudentsQuery()):

main/waeup.kofa/trunk/src/waeup/kofa/students/student.py

@@ -39 +39 @@
     CREATED, ADMITTED, CLEARANCE, PAID, REGISTERED, VALIDATED, RETURNING)
 from waeup.kofa.students.accommodation import StudentAccommodation
-from waeup.kofa.students.export import EXPORTER_NAMES
 from waeup.kofa.students.interfaces import (
-    IStudent, IStudentNavigation, IStudentPersonalEdit, ICSVStudentExporter)
+    IStudent, IStudentNavigation, IStudentPersonalEdit, ICSVStudentExporter,
+    IStudentsUtils)
 from waeup.kofa.students.payments import StudentPaymentsContainer
 from waeup.kofa.students.utils import generate_student_id
@@ -420 +420 @@
     (column `del_date`) as a UTC timestamp.
     """
-    for name in EXPORTER_NAMES:
+
+    STUDENT_EXPORTER_NAMES = getUtility(
+        IStudentsUtils).STUDENT_EXPORTER_NAMES
+
+    for name in STUDENT_EXPORTER_NAMES:
         exporter = getUtility(ICSVStudentExporter, name=name)
         csv_data = exporter.export_student(student)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py

@@ -31 +31 @@
 from zope.schema.interfaces import RequiredMissing
 from waeup.kofa.interfaces import IExtFileStore, IFileStoreNameChooser
-from waeup.kofa.students.export import EXPORTER_NAMES
 from waeup.kofa.students.student import (
     Student, StudentFactory, handle_student_removed, path_from_studid)
@@ -41 +40 @@
     IStudent, IStudentStudyCourse, IStudentPaymentsContainer,
     IStudentAccommodation, IStudentStudyLevel, ICourseTicket, IBedTicket,
-    IStudentNavigation)
+    IStudentNavigation, IStudentsUtils)
 from waeup.kofa.students.tests.test_batching import StudentImportExportSetup
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
@@ -183 +182 @@
 
         # The student data were put into CSV files
-        for name in EXPORTER_NAMES:
+        STUDENT_EXPORTER_NAMES = getUtility(
+            IStudentsUtils).STUDENT_EXPORTER_NAMES
+
+        for name in STUDENT_EXPORTER_NAMES:
             csv_path = os.path.join(del_dir, '%s.csv' % name)
             self.assertTrue(os.path.isfile(csv_path))

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -936 +936 @@
     PWCHANGE_STATES = (ADMITTED,)
 
+    #: A tuple containing all exporter names referring to students or
+    #: subobjects thereof.
+    STUDENT_EXPORTER_NAMES = ('students', 'studentstudycourses',
+            'studentstudylevels', 'coursetickets',
+            'studentpayments', 'bedtickets', 'paymentsoverview',
+            'studylevelsoverview', 'combocard', 'bursary')
+
     #: A prefix used when generating new student ids. Each student id will
     #: start with this string. The default is 'K' for ``Kofa``.