Project

General

Profile

« Previous | Next » 

Revision 2a13a353

Added by Serghei Mihai almost 10 years ago

agenda: display availabilities and schedules only for current service

Closes #5467

View differences:

calebasse/agenda/views.py
543 543
                .select_related()
544 544
        events = Event.objects.for_today(self.date) \
545 545
                .exclude(event_type_id=1) \
546
                .filter(participants=worker) \
546
                .filter(participants=worker, services=self.service) \
547 547
                .order_by('start_datetime') \
548 548
                .select_related() \
549 549
                .prefetch_related('services',
550 550
                        'exceptions',
551 551
                        'participants')
552 552
        eventswithact = EventWithAct.objects.for_today(self.date) \
553
                .filter(participants=worker) \
553
                .filter(participants=worker, services=self.service) \
554 554
                .order_by('start_datetime') \
555 555
                .select_related() \
556 556
                .prefetch_related('patient__addresses',
......
604 604
                                           self.date.day, 8, 0)
605 605
        end_datetime = datetime.datetime(self.date.year, self.date.month,
606 606
                                         self.date.day, 8, 15)
607
        events = Event.objects.filter(ressource__id=ressource_id).today_occurrences(self.date)
607
        events = Event.objects.filter(ressource__id=ressource_id,
608
                                      services=self.service).today_occurrences(self.date)
608 609

  
609 610
        while (start_datetime.hour <= 19):
610 611
            if start_datetime.hour not in disponibility:
......
644 645
                order_by('start_date')
645 646
        events = Event.objects.for_today(self.date) \
646 647
                .exclude(event_type_id=1) \
647
                .filter(participants=worker) \
648
                .filter(services=self.service, participants=worker) \
648 649
                .order_by('start_datetime') \
649 650
                .select_related() \
650 651
                .prefetch_related('participants', 'exceptions')
651 652
        eventswithact = EventWithAct.objects.for_today(self.date) \
652
                .filter(participants=worker) \
653
                .filter(services=self.service, participants=worker) \
653 654
                .order_by('start_datetime') \
654 655
                .select_related() \
655 656
                .prefetch_related('participants', 'exceptions',

Also available in: Unified diff