0001-agenda-display-the-arrivals-and-departure-for-other-.patch

Serghei Mihai, 21 juillet 2014 11:32

Voir les différences: en ligne côte à côte

Subject: [PATCH] agenda: display the arrivals and departure for other services

Closes #2532

 calebasse/agenda/appointments.py | 7 +++++--
 calebasse/agenda/views.py        | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

                 continue
             start_time = interval_set.lower_bound()
             end_time = interval_set.upper_bound()
             services = [s.slug for s in time_table.services.all() if s != service]
             appointment = Appointment()
             appointment.other_services_names = services
             appointment.init_start_stop(u"Arrivée", start_time)
             activity['arrival'] = start_time
             appointment.weight = -1
             appointment.weight = 1
             appointments.append(appointment)
             appointment = Appointment()
             appointment.init_start_stop(u"Départ", end_time)
             appointment.other_services_names = services
             activity['departure'] = end_time
             appointment.weight = 1
             appointment.weight = -1
             appointments.append(appointment)
         return activity, sorted(appointments, key=lambda app: (app.begin_time, app.weight, app.event_id))

             worker = Worker.objects.get(id=worker_id)
             time_tables_worker = TimeTable.objects.select_related('worker'). \
                     filter(services=self.service, worker=worker) \
                     filter(worker=worker) \
                     .for_today(self.date) \
                     .order_by('start_date') \
                     .select_related()
             holidays_worker = Holiday.objects.for_worker(worker) \
                     .for_period(self.date, self.date) \
                     .order_by('start_date') \
+    -

Produits Entr'ouvert » Calebasse