Project

General

Profile

« Previous | Next » 

Revision 816a0a9d

Added by Jérôme Schneider over 12 years ago

agenda: improve interval management for free time

View differences:

calebasse/agenda/managers.py
140 140
                    result[start_datetime.hour][3] = []
141 141
                    quater = 0
142 142

  
143
                interval = IntervalSet.between(start_datetime, end_datetime)
144
                if interval.issubset(occurrences_set[participant.id]):
143
                interval = IntervalSet.between(start_datetime, end_datetime, False)
144
                if interval.intersection(occurrences_set[participant.id]):
145 145
                    result[start_datetime.hour][quater].append({'id': participant.id, 'dispo': 'busy'})
146
                elif not interval.issubset(timetables_set[participant.id]):
146
                elif not interval.intersection(timetables_set[participant.id]):
147 147
                    result[start_datetime.hour][quater].append({'id': participant.id, 'dispo': 'away'})
148 148
                else:
149 149
                    result[start_datetime.hour][quater].append({'id': participant.id, 'dispo': 'free'})

Also available in: Unified diff