entrouvert
/
calebasse
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

agenda: fix querying for today events

This commit is contained in:
Benjamin Dauvergne 2013-01-06 01:37:38 +01:00
parent 1f0de62b23
commit 2ff4702444
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calebasse/agenda/managers.py
View File

@ -25,6 +25,7 @@ class EventQuerySet(InheritanceQuerySet):
canceled=False) ]
base_q = Q(start_datetime__lte=datetime.combine(today, time(23,59,59)),
canceled=False,
recurrence_week_day=today.weekday(),
recurrence_periodicity__isnull=False) & \
(Q(recurrence_end_date__gte=today) |
Q(recurrence_end_date__isnull=True)) & \
@ -32,7 +33,7 @@ class EventQuerySet(InheritanceQuerySet):
# week periods
for period in range(1, 6):
filters.append(base_q & Q(recurrence_week_offset=weeks % period,
recurrence_week_period=period, recurrence_week_day=today.weekday()))
recurrence_week_period=period))
# week parity
parity = today.isocalendar()[1] % 2
filters.append(base_q & Q(recurrence_week_parity=parity))