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

agenda: overlapping events taking in account absent act states

This commit is contained in:
Serghei Mihai 2014-06-19 17:57:23 +02:00
parent 82ef5f72e8
commit 7a2fc3bb66
2 changed files with 8 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

@ -102,7 +102,8 @@ class EventQuerySet(InheritanceQuerySet):
date_time = date_time or datetime.now()
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)
overlap = filter(lambda e: e.start_datetime <= date_time and e.end_datetime > date_time \
and not e.is_absent(), events)
same_type_events = []
different_overlap = []
for event in overlap:

6
calebasse/agenda/models.py
View File

@ -449,6 +449,12 @@ class Event(models.Model):
parts.append(self.recurrence_end_date.strftime('%d/%m/%Y'))
return u' '.join(parts)
def is_absent(self):
try:
return self.eventwithact.is_absent()
except self.DoesNotExist:
return False
def __unicode__(self):
return self.title