Changeset e9b1d7 in indico

Timestamp:

01/26/12 16:16:32 (16 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

4e0be3

Parents:

f77e30

git-author:

Matthew Pugh <matthew.alexander.pugh@…> (01/12/12 09:56:09)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (01/26/12 16:16:32)

Message:

[FIX] VSO - Relative dates now disregard HH:MM

• Modified from days to always start at 00:00 on date.
• Modified to days to always end at 23:59 on date.

File:

• indico/MaKaC/services/implementation/collaboration.py (modified) (3 diffs)

indico/MaKaC/services/implementation/collaboration.py

@@ -303 +303 @@
                 if self._params['toTitle']:
                     maxKey = self._params['toTitle'].strip()
+
+                """ For relative dates, create a diff timedelta for resetting to 
+                    00:00 at the start of range and 23:59 at the end.
+                """
                 if self._params['fromDays']:
                     try:
@@ -308 +312 @@
                     except ValueError, e:
                         raise CollaborationException(_("Parameter 'fromDays' is not an integer"), inner = e)
-                    minKey = nowutc() - timedelta(days = fromDays)
+                    now = nowutc()
+                    diff = timedelta(hours = now.hour, minutes = now.minute, seconds = now.second)
+                    minKey = now - diff - timedelta(days = fromDays)
                 if self._params['toDays']:
                     try:
@@ -314 +320 @@
                     except ValueError, e:
                         raise CollaborationException(_("Parameter 'toDays' is not an integer"), inner = e)
-                    maxKey = nowutc() + timedelta(days = toDays)
+                    now = nowutc()
+                    diff = timedelta(days = 1) - \
+                           timedelta(hours = now.hour, minutes = now.minute, seconds = (now.second + 1))
+                    maxKey = now + diff + timedelta(days = toDays)
 
                 self._minKey = minKey