0001-agenda-display-a-summary-of-service-activity.patch

Serghei Mihai, 18 July 2014 11:12 AM

View differences: inline side by side

Subject: [PATCH] agenda: display a summary of service activity

Closes #2735

 calebasse/agenda/appointments.py                   | 14 +++++-
 .../templates/agenda/agendas-therapeutes.html      | 47 +++++++++++++++++--
 calebasse/agenda/views.py                          | 10 +++--
 calebasse/static/css/agenda.css                    | 52 +++++++++++++++++++++-
 calebasse/static/css/print.css                     | 10 ++++-
 5 files changed, 123 insertions(+), 10 deletions(-)

         """
         """
         appointments = []
         activity = {'absences': []}
         timetables_set = IntervalSet((t.to_interval(date) for t in time_tables))
         holidays_set = IntervalSet((h.to_interval(date) for h in holidays))
-...
         validation_states.pop('VALIDE')
         validation_states.pop('ACT_LOST')
         validation_states = vs + sorted(validation_states.items(), key=lambda tup: tup[0])
         events.sort(key=lambda event: event.start_datetime)
         # get first and last events start times
         if events:
             activity['first_appointment'], activity['last_appointment'] = (e.start_datetime.time() for e in (events[0], events[-1]))
         for event in events:
             appointment = Appointment()
             appointment.init_from_event(event, service, validation_states)
-...
                 label = u"Absence de groupe : %s" % holiday.holiday_type.name
             else:
                 label = u"Absence indiv. : %s" % holiday.holiday_type.name
             appointment.init_holiday_time(label,
                         delta_minutes,
                         time(interval.lower_bound.hour, interval.lower_bound.minute),
                         description=holiday.comment)
             activity['absences'].append(label)
             services = holiday.services.all()
             if service not in services:
                 appointment.type = 'busy-elsewhere'
-...
             end_time = interval_set.upper_bound()
             appointment = Appointment()
             appointment.init_start_stop(u"Arrivée", start_time)
             activity['arrival'] = start_time
             appointment.weight = -1
             appointments.append(appointment)
             appointment = Appointment()
             appointment.init_start_stop(u"Départ", end_time)
             activity['departure'] = end_time
             appointment.weight = 1
             appointments.append(appointment)
         return sorted(appointments, key=lambda app: (app.begin_time, app.weight, app.event_id))
         return activity, sorted(appointments, key=lambda app: (app.begin_time, app.weight, app.event_id))
     def get_daily_usage(date, ressource, service, occurrences):
         """

     {% block appbar %}
     <h2>Tous les agendas des intervenants du {{ service_name }} - {{ date|date:"DATE_FORMAT"|title }}</h2>
     <a href="..">Retourner à l'agenda</a>
     <button id='print-button-therapeutes'>Imprimer</button>
     {% endblock %}
     {% block agenda-content %}
     <button id="uncheck-all" type="button">Tout décocher</button>
     <button id="check-all" type="button" style="display: none">Tout cocher</button>
     <div id="activity" class="screen-only">
       <span class="actions screen-only"><button id='print-button-therapeutes-activity' class="icon-print screen-only">Imprimer</button></span>
       <br class="clear" />
       <span class="header"><strong>{{ service_name }}:</strong> {{ date|date:"DATE_FORMAT"|title }}</span>
       <h3>Activité du personnel</h4>
     <table>
       <thead>
         <tr>
           <th>Nom</th><th>Arrivée</th><th>Premier rendez-vous</th>
           <th>Dernier rendez-vous</th><th>Départ</th><th>Absences</th>
         </tr>
       </thead>
       <tbody>
     {% for worker_agenda in workers_agenda %}
     <tr>
       <td>{{ worker_agenda.worker.first_name}} <span class="lastname">{{ worker_agenda.worker.last_name }}</span></td>
       <td>{{ worker_agenda.activity.arrival }}</td><td>{{ worker_agenda.activity.first_appointment }}</td>
       <td>{{ worker_agenda.activity.last_appointment }}</td><td>{{ worker_agenda.activity.departure }}</td>
       <td>{% for absence in worker_agenda.activity.absences %}
         {{ absence }}<br />
         {% endfor %}
       </td>
     </tr>
     {% endfor %}
       </tbody>
     </table>
     </div>
     <br class="clear" />
     <span class="actions screen-only">
       <button id="uncheck-all" type="button" class="icon-uncheck screen-only">Tout décocher</button>
       <button id="check-all" type="button" style="display: none" class="icon-check screen-only">Tout cocher</button>
       <button id='print-button-therapeutes' class="icon-print screen-only">Imprimer</button>
     </span>
     {% for worker_agenda in workers_agenda %}
     {% if worker_agenda.appointments %}
     <div class="worker-agenda">
-...
                 update_page_break();
                 $('button#print-button-therapeutes').click(function() {
                   $('div#activity').addClass('screen-only');
                   $.each($(".printable"), function(k, v) {
                     if ($(v).is(':checked')) {
                         $(v).parents('.worker-agenda').removeClass('screen-only');
-...
                   window.print();
                   });
                 $('button#print-button-therapeutes-activity').click(function() {
                     $('div#activity').removeClass('screen-only');
                     $.each($('.content div:not(#activity)'), function(k, v) {
                       $(v).addClass('screen-only');
                     });
                   update_page_break();
                   window.print();
                   });
                 $('#uncheck-all').on('click', function () {
                     $('.printable').attr('checked', false);
                     $('.printable').trigger('change');

                 events_workers[worker.id] = events_worker
                 time_tables_workers[worker.id] = time_tables_worker
                 holidays_workers[worker.id] = holidays_worker
                 daily_appointments = get_daily_appointments(context['date'], worker, self.service,
                 activity, daily_appointments = get_daily_appointments(context['date'], worker, self.service,
                             time_tables_worker, events_worker, holidays_worker)
                 if all(map(lambda x: x.holiday, daily_appointments)):
                     continue
                 context['workers_agenda'].append({'worker': worker,
                         'appointments': daily_appointments,
                         'activity': activity,
                         'has_events': True if events_worker else False})
             for worker_agenda in context.get('workers_agenda', []):
-...
                             'exceptions', 'participants')
             events = [ e.today_occurrence(self.date) for e in events ] \
                  + [ e.today_occurrence(self.date) for e in eventswithact ]
             activity, appointments = get_daily_appointments(context['date'], worker,
                                                             self.service, time_tables_worker,
                                                             events, holidays_worker)
             context['worker_agenda'] = {'worker': worker,
                         'appointments': get_daily_appointments(context['date'], worker, self.service,
                             time_tables_worker, events, holidays_worker)}
                                         'appointments': appointments}
             if settings.RTF_TEMPLATES_DIRECTORY:
                 context['mail'] = True

     br.clear {
         clear: both;
+    }
     td#dispos {
     	vertical-align: top;
+    }
-...
         display: block;
+    }
     .icon-print:before {
         content: "\f02f";
         margin-right: 5px;
+    }
     .icon-check:before {
         content: "\f046";
         margin-right: 5px;
+    }
     .icon-uncheck:before {
         content: "\f096";
         margin-right: 5px;
+    }
     #users .icon-toggle {
         float: right;
         display: none;
-...
     button.screen-only {
         margin: 1em 0;
         float: right;
         /* float: right; */
+    }
     h3 .icon-comment {
-...
     .worker-agenda {
         margin-top: 2em;
+    }
     #activity {
         float: right;
         font-size: .8em;
         margin-bottom: 2em;
+    }
     #activity h3 {
         background: #eee;
         border: 1px solid #aaa;
         padding: 2px 5px;
         margin:0;
         border-bottom: 0;
+    }
     #activity table {
         border-collapse: collapse;
+    }
     #activity .header {
         display: none;
+    }
     #activity table td, #activity table th {
         border: 1px solid #bbb;
         padding: 2px 5px;
+    }
     #activity #print-button-therapeutes-activity {
         float: right;
+    }

       font-size: 70%;
+    }
     table#activity{
     table#activity, div#activity {
       font-size: 80%;
+    }
-...
       position: fixed;
       top: 0;
+    }
     div#activity {
         float: left;
+    }
     div#activity .header {
         display: block;
+    }
+    -

Project

General

Profile

Produits Entr'ouvert » Calebasse

0001-agenda-display-a-summary-of-service-activity.patch