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

Timestamp:

6 Jun 2018, 11:10:07 (6 years ago)

Author:

Henrik Bettermann

Message:

Fix CourseTicketExporter. Ticket level and session filter did not work.

Add payment category filter to payment exporters. Optimize Python code.

File:

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

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

@@ -135 +135 @@
     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)
-        tz = getUtility(IKofaUtils).tzinfo
-        payments_start = tz.localize(payments_start)
-        payments_end = tz.localize(payments_end) + timedelta(days=1)
-        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 in p_states:
-                        payment_date = to_timezone(payment.payment_date, tz)
-                        if payment_date > payments_start and \
-                            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:
-                        payment_date = to_timezone(payment.payment_date, tz)
-                        if payment_date > payments_start and \
-                            payment_date < payments_end:
-                            payments.append(payment)
-    else:
-        # Payment period not given
-        if p_states:
-            # Only paid tickets are considered
-            for student in students:
-                for payment in student.get('payments', {}).values():
-                    if payment.p_state in p_states:
-                        payments.append(payment)
-        else:
-            # All tickets are considered
-            for student in students:
-                for payment in student.get('payments', {}).values():
-                    payments.append(payment)
+    paycat = kw.get('paycat')
+    for student in students:
+        for payment in student.get('payments', {}).values():
+            if payments_start and payments_end:
+                if not payment.payment_date:
+                    continue
+                payments_start = datetime.strptime(payments_start, date_format)
+                payments_end = datetime.strptime(payments_end, date_format)
+                tz = getUtility(IKofaUtils).tzinfo
+                payments_start = tz.localize(payments_start)
+                payments_end = tz.localize(payments_end) + timedelta(days=1)
+                payment_date = to_timezone(payment.payment_date, tz)
+                if payment_date < payments_start or payment_date > payments_end:
+                    continue
+            if p_states and not payment.p_state in p_states:
+                continue
+            if paycat not in ('all', None) and payment.p_category != paycat:
+                continue
+            payments.append(payment)
     return payments
 
@@ -218 +199 @@
                 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.
+        # Payments can be filtered by payment date and payment category.
+        # These parameters are not keys of the catalog and must thus be
+        # removed from kw.
         try:
             del kw['payments_start']
             del kw['payments_end']
+            del kw['paycat']
         except KeyError:
             pass
+        # Coursetickets can be filtered level and session.
+        # These parameters are not keys of the catalog and must thus be
+        # removed from kw.
         try:
             del kw['ct_level']
@@ -433 +419 @@
     by searching the students catalog. Then it exports student payment
     tickets by iterating over the items of the student's ``payments``
-    container. If the payment period is given only tickets, which were
+    container. If the payment period is given, only tickets, which were
     paid in payment period, are considered for export.
     """