Projet

Général

Profil

« Précédent | Suivant » 

Révision dce0454a

Ajouté par Serghei Mihai il y a presque 10 ans

agenda: display a summary of service activity

Closes #2735

Voir les différences:

calebasse/agenda/views.py
509 509
            events_workers[worker.id] = events_worker
510 510
            time_tables_workers[worker.id] = time_tables_worker
511 511
            holidays_workers[worker.id] = holidays_worker
512
            daily_appointments = get_daily_appointments(context['date'], worker, self.service,
512
            activity, daily_appointments = get_daily_appointments(context['date'], worker, self.service,
513 513
                        time_tables_worker, events_worker, holidays_worker)
514 514
            if all(map(lambda x: x.holiday, daily_appointments)):
515 515
                continue
516

  
516 517
            context['workers_agenda'].append({'worker': worker,
517 518
                    'appointments': daily_appointments,
519
                    'activity': activity,
518 520
                    'has_events': True if events_worker else False})
519 521

  
520 522
        for worker_agenda in context.get('workers_agenda', []):
......
584 586
                        'exceptions', 'participants')
585 587
        events = [ e.today_occurrence(self.date) for e in events ] \
586 588
             + [ e.today_occurrence(self.date) for e in eventswithact ]
589
        activity, appointments = get_daily_appointments(context['date'], worker,
590
                                                        self.service, time_tables_worker,
591
                                                        events, holidays_worker)
587 592

  
588 593
        context['worker_agenda'] = {'worker': worker,
589
                    'appointments': get_daily_appointments(context['date'], worker, self.service,
590
                        time_tables_worker, events, holidays_worker)}
594
                                    'appointments': appointments}
591 595

  
592 596
        if settings.RTF_TEMPLATES_DIRECTORY:
593 597
            context['mail'] = True

Formats disponibles : Unified diff