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

agenda: handling cases when the event has no act associated

This commit is contained in:
Serghei Mihai 2014-06-02 09:48:50 +02:00
parent ae79c334a0
commit 98b2866187
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calebasse/agenda/managers.py
View File

@ -100,18 +100,22 @@ class EventQuerySet(InheritanceQuerySet):
at the same time and have the same act type
"""
date_time = date_time or datetime.now()
events = events or self.today_occurrences(date_time.date())
if events is None:
events = self.today_occurrences(date_time.date())
overlap = filter(lambda e: e.start_datetime <= date_time and e.end_datetime > date_time, events)
same_type_events = []
different_overlap = []
for event in overlap:
if different_overlap:
for e in different_overlap:
if event.start_datetime == e.start_datetime and \
event.end_datetime == e.end_datetime and \
event.act_type == e.act_type:
try:
if event.start_datetime == e.start_datetime and \
event.end_datetime == e.end_datetime and \
event.act_type == e.act_type:
continue
different_overlap.append(event)
except AttributeError:
continue
different_overlap.append(event)
else:
different_overlap.append(event)
return different_overlap