Changeset 15047 for main/waeup.kofa/trunk

Timestamp:

12 Jun 2018, 06:19:37 (6 years ago)

Author:

Henrik Bettermann

Message:

Rename StudentPaymentsOverviewExporter.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• docs/source/userdocs/datacenter/export.rst (modified) (3 diffs)
• src/waeup/kofa/students/browser.py (modified) (1 diff)
• src/waeup/kofa/students/export.py (modified) (3 diffs)
• src/waeup/kofa/students/tests/test_browser.py (modified) (1 diff)
• src/waeup/kofa/students/tests/test_export.py (modified) (5 diffs)
• src/waeup/kofa/students/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Rename `StudentPaymentsOverviewExporter`.
 
 * Fix `CourseTicketExporter`. Ticket level and session filter

main/waeup.kofa/trunk/docs/source/userdocs/datacenter/export.rst

@@ -256 +256 @@
   postprocessing by the university.
 
-DataForBursary Exporter
------------------------
+Data For Bursary Exporter
+-------------------------
 
 .. autoclass:: waeup.kofa.students.export.DataForBursaryExporter()
@@ -265 +265 @@
   .. automethod:: waeup.kofa.students.export.DataForBursaryExporter.mangle_value()
 
-Student Payments Overview Exporter
-----------------------------------
-
-.. autoclass:: waeup.kofa.students.export.StudentPaymentsOverviewExporter()
-
-  .. autoattribute:: waeup.kofa.students.export.StudentPaymentsOverviewExporter.fields
-  .. autoattribute:: waeup.kofa.students.export.StudentPaymentsOverviewExporter.title
-  .. autoattribute:: waeup.kofa.students.export.StudentPaymentsOverviewExporter.curr_year
-  .. automethod:: waeup.kofa.students.export.StudentPaymentsOverviewExporter.mangle_value()
+School Fee Payments Overview Exporter
+-------------------------------------
+
+.. autoclass:: waeup.kofa.students.export.SchoolFeePaymentsOverviewExporter()
+
+  .. autoattribute:: waeup.kofa.students.export.SchoolFeePaymentsOverviewExporter.fields
+  .. autoattribute:: waeup.kofa.students.export.SchoolFeePaymentsOverviewExporter.title
+  .. autoattribute:: waeup.kofa.students.export.SchoolFeePaymentsOverviewExporter.curr_year
+  .. automethod:: waeup.kofa.students.export.SchoolFeePaymentsOverviewExporter.mangle_value()
 
 Student Study Levels Overview Exporter
@@ -292 +292 @@
   .. autoattribute:: waeup.kofa.students.export.ComboCardDataExporter.title
   .. automethod:: waeup.kofa.students.export.ComboCardDataExporter.mangle_value()
+
+Data For Lecturer Exporter
+--------------------------
+
+.. autoclass:: waeup.kofa.students.export.DataForLecturerExporter()
+
+  .. autoattribute:: waeup.kofa.students.export.DataForLecturerExporter.fields
+  .. autoattribute:: waeup.kofa.students.export.DataForLecturerExporter.title
+  .. automethod:: waeup.kofa.students.export.DataForLecturerExporter.mangle_value()
 
 File Export

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

@@ -3409 +3409 @@
                 exporters += [('Bursary Data', 'bursary')]
             if checkPermission('waeup.exportPaymentsOverview', self.context):
-                exporters += [('Student Payments Overview', 'paymentsoverview')]
+                exporters += [('Student Payments Overview', 'sfpaymentsoverview')]
             self.exporters = exporters
             return

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

@@ -461 +461 @@
 
 class DataForBursaryExporter(StudentPaymentExporter):
-    """The DataForBursary Exporter works just like the Student Payments Exporter
+    """The DataForBursary Exporter works just like the Student Payment Exporter
     but it exports much more information about the student. It combines
     payment and student data in one table in order to spare postprocessing of 
@@ -534 +534 @@
             value, name, context=context)
 
-class StudentPaymentsOverviewExporter(StudentExporter):
-    """The Student Payments Overview Exporter first filters the set of students
+class SchoolFeePaymentsOverviewExporter(StudentExporter):
+    """The School Fee Payments Overview Exporter first filters the set of students
     by searching the students catalog. Then it exports some student base data
     together with the total school fee amount paid in each year over a
     predefined year range (current year - 9, ... , current year + 1).
     """
-    grok.name('paymentsoverview')
+    grok.name('sfpaymentsoverview')
 
     curr_year = datetime.now().year
@@ -551 +551 @@
         'entry_session', 'reg_number'
         ) + year_range_tuple
-    title = _(u'Student Payments Overview')
+    title = _(u'Student School Fee Payments Overview')
 
     def mangle_value(self, value, name, context=None):

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

@@ -3935 +3935 @@
         self.browser.getLink("Export student data").click()
         self.browser.getControl("Configure new export").click()
-        # Only the paymentsoverview exporter is available for department officers
+        # Only the sfpaymentsoverview exporter is available for department officers
         self.assertFalse('<option value="students">' in self.browser.contents)
         self.assertTrue(
-            '<option value="paymentsoverview">' in self.browser.contents)
-        self.browser.getControl(name="exporter").value = ['paymentsoverview']
+            '<option value="sfpaymentsoverview">' in self.browser.contents)
+        self.browser.getControl(name="exporter").value = ['sfpaymentsoverview']
         self.browser.getControl(name="session").value = ['2004']
         self.browser.getControl(name="level").value = ['100']

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

@@ -30 +30 @@
     StudentExporter, StudentStudyCourseExporter, StudentStudyLevelExporter,
     CourseTicketExporter, StudentPaymentExporter, BedTicketExporter,
-    StudentPaymentsOverviewExporter, StudentStudyLevelsOverviewExporter,
+    SchoolFeePaymentsOverviewExporter, StudentStudyLevelsOverviewExporter,
     ComboCardDataExporter, DataForBursaryExporter,
     StudentUnpaidPaymentExporter,
@@ -1152 +1152 @@
 
 
-class StudentPaymentsOverviewExporterTest(StudentImportExportSetup):
+class SchoolFeePaymentsOverviewExporterTest(StudentImportExportSetup):
 
     layer = FunctionalLayer
 
     def setUp(self):
-        super(StudentPaymentsOverviewExporterTest, self).setUp()
+        super(SchoolFeePaymentsOverviewExporterTest, self).setUp()
         self.setup_for_export()
         return
@@ -1163 +1163 @@
     def test_ifaces(self):
         # make sure we fullfill interface contracts
-        obj = StudentPaymentsOverviewExporter()
+        obj = SchoolFeePaymentsOverviewExporter()
         verifyObject(ICSVStudentExporter, obj)
-        verifyClass(ICSVStudentExporter, StudentPaymentsOverviewExporter)
+        verifyClass(ICSVStudentExporter, SchoolFeePaymentsOverviewExporter)
         return
 
     def test_get_as_utility(self):
         # we can get a payments exporter as utility
-        result = queryUtility(ICSVExporter, name="paymentsoverview")
+        result = queryUtility(ICSVExporter, name="sfpaymentsoverview")
         self.assertTrue(result is not None)
         return
@@ -1176 +1176 @@
     def test_export(self):
         self.setup_student(self.student)
-        exporter = StudentPaymentsOverviewExporter()
+        exporter = SchoolFeePaymentsOverviewExporter()
         exporter.export([self.student], self.outfile)
         result = open(self.outfile, 'rb').read()
@@ -1219 +1219 @@
         payment_4.p_category = u'schoolfee'
         self.student['payments']['my-4thpayment'] = payment_4
-        exporter = StudentPaymentsOverviewExporter()
+        exporter = SchoolFeePaymentsOverviewExporter()
         exporter.export_all(self.app, self.outfile)
         result = open(self.outfile, 'rb').read()

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

@@ -1073 +1073 @@
             'studentstudylevels', 'coursetickets',
             'studentpayments', 'studentunpaidpayments',
-            'bedtickets', 'paymentsoverview',
+            'bedtickets', 'sfpaymentsoverview',
             'studylevelsoverview', 'combocard', 'bursary')