Changeset 14761 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

3 Aug 2017, 12:43:47 (7 years ago)

Author:

Henrik Bettermann

Message:

DataForBursaryExporter? now exports also waived payment tickets.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/export.py (modified) (5 diffs)

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

@@ -114 +114 @@
     return tickets
 
-def get_payments(students, p_state=None, **kw):
+def get_payments(students, p_states=None, **kw):
     """Get all payments of `students` within given payment_date period.
     """
@@ -128 +128 @@
         payments_start = tz.localize(payments_start)
         payments_end = tz.localize(payments_end) + timedelta(days=1)
-        if p_state:
-            # Only paid or unpaid tickets in payment period are considered
+        if p_states:
+            # Only tickets in certain states and payment period are considered
             for student in students:
                 for payment in student.get('payments', {}).values():
-                    if payment.payment_date and payment.p_state == p_state:
+                    if payment.payment_date and payment.p_state in p_states:
                         payment_date = to_timezone(payment.payment_date, tz)
                         if payment_date > payments_start and \
@@ -148 +148 @@
     else:
         # Payment period not given
-        if p_state:
+        if p_states:
             # Only paid tickets are considered
             for student in students:
                 for payment in student.get('payments', {}).values():
-                    if payment.p_state == p_state:
+                    if payment.p_state in p_states:
                         payments.append(payment)
         else:
@@ -453 +453 @@
 
     def filter_func(self, x, **kw):
-        return get_payments(x, p_state='unpaid', **kw)
+        return get_payments(x, p_states=('unpaid',) , **kw)
 
 class DataForBursaryExporter(StudentPaymentExporter):
@@ -460 +460 @@
     payment and student data in one table in order to spare postprocessing of 
     two seperate export files. The exporter is primarily used by bursary
-    officers who have exclusively access to this exporter.
+    officers who have exclusively access to this exporter. The exporter
+    exports ``paid`` and ``waived`` payment tickets.
     """
     grok.name('bursary')
 
     def filter_func(self, x, **kw):
-        return get_payments(x, p_state='paid', **kw)
+        return get_payments(x, p_states=('paid', 'waived'), **kw)
 
     fields = tuple(