From e5322fcc631b62adff51a9a0f7ff3c7b0c96f609 Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Tue, 16 Sep 2014 11:20:14 +0200 Subject: [PATCH] agenda: display availabilities and schedules only for current service Closes #5467 --- calebasse/agenda/views.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/calebasse/agenda/views.py b/calebasse/agenda/views.py index bd8b46e..9bb2fd6 100644 --- a/calebasse/agenda/views.py +++ b/calebasse/agenda/views.py @@ -543,14 +543,14 @@ class AjaxWorkerTabView(TemplateView): .select_related() events = Event.objects.for_today(self.date) \ .exclude(event_type_id=1) \ - .filter(participants=worker) \ + .filter(participants=worker, services=self.service) \ .order_by('start_datetime') \ .select_related() \ .prefetch_related('services', 'exceptions', 'participants') eventswithact = EventWithAct.objects.for_today(self.date) \ - .filter(participants=worker) \ + .filter(participants=worker, services=self.service) \ .order_by('start_datetime') \ .select_related() \ .prefetch_related('patient__addresses', @@ -604,7 +604,8 @@ class AjaxDisponibilityColumnView(TemplateView): self.date.day, 8, 0) end_datetime = datetime.datetime(self.date.year, self.date.month, self.date.day, 8, 15) - events = Event.objects.filter(ressource__id=ressource_id).today_occurrences(self.date) + events = Event.objects.filter(ressource__id=ressource_id, + services=self.service).today_occurrences(self.date) while (start_datetime.hour <= 19): if start_datetime.hour not in disponibility: @@ -644,12 +645,12 @@ class AjaxDisponibilityColumnView(TemplateView): order_by('start_date') events = Event.objects.for_today(self.date) \ .exclude(event_type_id=1) \ - .filter(participants=worker) \ + .filter(services=self.service, participants=worker) \ .order_by('start_datetime') \ .select_related() \ .prefetch_related('participants', 'exceptions') eventswithact = EventWithAct.objects.for_today(self.date) \ - .filter(participants=worker) \ + .filter(services=self.service, participants=worker) \ .order_by('start_datetime') \ .select_related() \ .prefetch_related('participants', 'exceptions', -- 2.1.0