Changeset 13156 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

8 Jul 2015, 05:22:18 (9 years ago)

Author:

Henrik Bettermann

Message:

Include 'end day' when searching for payments in a given period.

Location:

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

Files:

• export.py (modified) (2 diffs)
• tests/test_export.py (modified) (3 diffs)

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

@@ -20 +20 @@
 import os
 import grok
-from datetime import datetime
+from datetime import datetime, timedelta
 from zope.component import getUtility
 from waeup.kofa.interfaces import (
@@ -99 +99 @@
         tz = getUtility(IKofaUtils).tzinfo
         payments_start = tz.localize(payments_start)
-        payments_end = tz.localize(payments_end)
+        payments_end = tz.localize(payments_end) + timedelta(days=1)
         if p_state:
             # Only paid or unpaid tickets in payment period are considered

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

@@ -849 +849 @@
             payments_start='nonsense', payments_end='nonsense')
         # If they match the format they are ignored by get_filtered and the
-        # exporter works properly
+        # exporter works properly.
+        # Attention: End day is included!
         exporter.export_filtered(
             self.app, self.outfile,
             current_session=None, current_level=None,
-            payments_start='01/04/2012', payments_end='02/04/2012')
+            payments_start='01/04/2012', payments_end='01/04/2012')
         result = open(self.outfile, 'rb').read()
         self.assertEqual(
@@ -865 +866 @@
             'r-code,,A111111,created,2012\r\n'
             )
-        # no results if payment_date is outside the given period
+        # Payment date is 2012-04-01, 14:12:01.
+        # No results if payment_date is outside the given period.
         exporter.export_filtered(
             self.app, self.outfile,
             current_session=None, current_level=None,
-            payments_start='31/03/2012', payments_end='01/04/2012')
+            payments_start='30/03/2012', payments_end='31/03/2012')
         result = open(self.outfile, 'rb').read()
         self.assertEqual(
@@ -888 +890 @@
             'r_code,r_desc,student_id,state,current_session\r\n'
             )
-        # no results if payment_date is not set
+        # No results if payment_date is not set
         self.payment.payment_date = None
         exporter.export_filtered(
             self.app, self.outfile,
             current_session=None, current_level=None,
-            payments_start='01/04/2012', payments_end='02/04/2012')
-        result = open(self.outfile, 'rb').read()
-        
+            payments_start='31/03/2012', payments_end='02/04/2012')
+        result = open(self.outfile, 'rb').read()
+        self.assertEqual(
+            result,
+            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
+            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
+            'r_code,r_desc,student_id,state,current_session\r\n'
+            )
         return