Changeset 11730 for main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

Timestamp:

4 Jul 2014, 07:46:16 (10 years ago)

Author:

Henrik Bettermann

Message:

Filter payment ticket data exports by specifying the payment_date period.

File:

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

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

@@ -92 +92 @@
     return tickets
 
-def get_payments(students):
-    """Get all payments of `students`.
-    """
+def get_payments(students, paid=False, **kw):
+    """Get all payments of `students` within given payment_date period.
+
+    """
+    date_format = '%d/%m/%Y'
     payments = []
-    for student in students:
-        for payment in student.get('payments', {}).values():
-            payments.append(payment)
-    return payments
-
-def get_paid_payments(students):
-    """Get all paid payments of `students`.
-    """
-    payments = []
-    for student in students:
-        for payment in student.get('payments', {}).values():
-            if payment.p_state == 'paid':
-                payments.append(payment)
+    payments_start = kw.get('payments_start')
+    payments_end = kw.get('payments_end')
+    if payments_start and payments_end:
+        # Payment period given
+        payments_start = datetime.strptime(payments_start, date_format)
+        payments_end = datetime.strptime(payments_end, date_format)
+        if paid:
+            # Only paid tickets in payment period are considered
+            for student in students:
+                for payment in student.get('payments', {}).values():
+                    if payment.p_state == 'paid' and \
+                        payment.payment_date > payments_start and \
+                        payment.payment_date < payments_end:
+                        payments.append(payment)
+        else:
+            # All tickets in payment period are considered
+            for student in students:
+                for payment in student.get('payments', {}).values():
+                    if payment.payment_date > payments_start and \
+                        payment.payment_date < payments_end:
+                        payments.append(payment)
+    else:
+        # Payment period not given
+        if paid:
+            # Only paid tickets are considered
+            for student in students:
+                for payment in student.get('payments', {}).values():
+                    if payment.p_state == 'paid':
+                        payments.append(payment)
+        else:
+            # All tickets are considered
+            for student in students:
+                for payment in student.get('payments', {}).values():
+                    payments.append(payment)
     return payments
 
@@ -156 +179 @@
                 students.append(ticket.student)
             return list(set(students))
+        # Payments can be filtered by payment_date. The period boundaries
+        # are not keys of the catalog and must thus be removed from kw.
+        try:
+            del kw['payments_start']
+            del kw['payments_end']
+        except KeyError:
+            pass
         query = StudentsQuery(**kw)
         return query.query()
@@ -316 +346 @@
 
     def filter_func(self, x, **kw):
-        return get_payments(x)
+        return get_payments(x, **kw)
 
     def mangle_value(self, value, name, context=None):
@@ -336 +366 @@
 
     def filter_func(self, x, **kw):
-        return get_paid_payments(x)
+        return get_payments(x, paid=True, **kw)
 
     #: Fieldnames considered by this exporter