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

Timestamp:

10 Jul 2014, 12:20:30 (10 years ago)

Author:

Henrik Bettermann

Message:

Make all datetimes timezone aware. Otherwise we can't compare.

File:

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

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

@@ -22 +22 @@
 from datetime import datetime
 from zope.component import getUtility
-from waeup.kofa.interfaces import IExtFileStore, IFileStoreNameChooser
+from waeup.kofa.interfaces import (
+    IExtFileStore, IFileStoreNameChooser, IKofaUtils)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.catalog import StudentsQuery, CourseTicketsQuery
@@ -30 +31 @@
 from waeup.kofa.students.vocabularies import study_levels
 from waeup.kofa.utils.batching import ExporterBase
-from waeup.kofa.utils.helpers import iface_names
+from waeup.kofa.utils.helpers import iface_names, to_timezone
 
 #: A tuple containing all exporter names referring to students or
@@ -104 +105 @@
         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)
         if paid:
             # Only paid tickets in payment period are considered
             for student in students:
                 for payment in student.get('payments', {}).values():
-                    if payment.payment_date and payment.p_state == 'paid' and \
-                        payment.payment_date > payments_start and \
-                        payment.payment_date < payments_end:
-                        payments.append(payment)
+                    if payment.payment_date and payment.p_state == 'paid':
+                        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 and payment.payment_date > payments_start and \
-                        payment.payment_date < payments_end:
-                        payments.append(payment)
+                    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