Project

General

Profile

« Previous | Next » 

Revision 7a2fc3bb

Added by Serghei Mihai over 11 years ago

agenda: overlapping events taking in account absent act states

View differences:

calebasse/agenda/managers.py
102 102
        date_time = date_time or datetime.now()
103 103
        if events is None:
104 104
            events = self.today_occurrences(date_time.date())
105
        overlap = filter(lambda e: e.start_datetime <= date_time and e.end_datetime > date_time, events)
105
        overlap = filter(lambda e: e.start_datetime <= date_time and e.end_datetime > date_time \
106
                         and not e.is_absent(), events)
106 107
        same_type_events = []
107 108
        different_overlap = []
108 109
        for event in overlap:

Also available in: Unified diff