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

agenda: current service free periods only displaying fix

This commit is contained in:
Serghei Mihai 2014-09-22 16:10:25 +02:00
parent 6ab97b7974
commit be3ba5b3dd
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/appointments.py
View File

@ -141,7 +141,8 @@ def get_daily_appointments(date, worker, service, time_tables, events, holidays)
appointments = []
activity = {'absences': []}
timetables_set = IntervalSet((t.to_interval(date) for t in time_tables))
service_time_tables = time_tables.filter(services=service)
timetables_set = IntervalSet((t.to_interval(date) for t in service_time_tables))
holidays_set = IntervalSet((h.to_interval(date) for h in holidays))
busy_occurrences_set = IntervalSet((o.to_interval() for o in events if not o.is_event_absence() and service in o.services.all()))
for free_time in timetables_set - (busy_occurrences_set+holidays_set):