From 4558de0e0589dce0ff19903d3fd67bcdff61155a Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Thu, 28 Aug 2014 13:00:31 +0200 Subject: [PATCH] agenda: fixing condition of displaying the other services appointments summary Closes #5023 --- calebasse/agenda/views.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/calebasse/agenda/views.py b/calebasse/agenda/views.py index 0790dee..4abb1ed 100644 --- a/calebasse/agenda/views.py +++ b/calebasse/agenda/views.py @@ -433,6 +433,7 @@ class AgendasTherapeutesView(AgendaHomepageView): def get_context_data(self, **kwargs): context = super(AgendasTherapeutesView, self).get_context_data(**kwargs) + current_service_only = settings.CURRENT_SERVICE_EVENTS_ONLY time_tables = TimeTable.objects.select_related('worker'). \ filter(services=self.service). \ @@ -444,14 +445,12 @@ class AgendasTherapeutesView(AgendaHomepageView): .select_related() events = Event.objects.for_today(self.date) \ .exclude(event_type_id=1) \ - .filter(services=self.service) \ .order_by('start_datetime') \ .select_related() \ .prefetch_related('services', 'exceptions', 'participants') eventswithact = EventWithAct.objects.for_today(self.date) \ - .filter(services=self.service) \ .order_by('start_datetime') \ .select_related() \ .prefetch_related( @@ -460,7 +459,11 @@ class AgendasTherapeutesView(AgendaHomepageView): 'act_set__actvalidationstate_set', 'exceptions', 'participants') - context['CURRENT_SERVICE_EVENTS_ONLY'] = settings.CURRENT_SERVICE_EVENTS_ONLY + if current_service_only: + events = events.filter(services=self.service) + eventswithact = eventswithact.filter(services=self.service) + + context['CURRENT_SERVICE_EVENTS_ONLY'] = current_service_only events = [ e.today_occurrence(self.date) for e in events ] \ + [ e.today_occurrence(self.date) for e in eventswithact ] -- 2.1.0