Projet

Général

Profil

« Précédent | Suivant » 

Révision b778d740

Ajouté par Jérôme Schneider il y a plus de 9 ans

agenda: show date on each page of activity and split table correctly

Fixes #2359

Voir les différences:

calebasse/agenda/templates/agenda/service-activity.html
10 10

  
11 11
{% block agenda-content %}
12 12

  
13
<div class="print-only page-header">{{ date|date:"DATE_FORMAT"|lower }}</div>
14

  
15
<h2 class="print-only">Activité du {{ service_name }} - {{ date|date:"DATE_FORMAT"|title }}</h2>
16 13

  
17 14
<table class="main" id="activity">
18 15
  <thead>
16
      <tr><th class="no-border" colspan=5 style="border: 0;">
17
          <h2 class="print-only">Activité du {{ service_name }} - {{ date|date:"DATE_FORMAT"|title }}</h2>
18
      </th></tr>
19 19
      <tr> <th>Heure</th> <th>Libellé</th> <th>Absence</th> <th>Type d'acte</th> <th>Intervenants</th> </tr>
20 20
  </thead>
21 21
  <tbody>
22 22
    {% for row_appointments in appointments_times %}
23 23
    <tr class="hour-change">
24
      <td class="hour"  rowspan="{{ row_appointments.1.row }}">{{ row_appointments.0 }}</td>
24
      <td class="hour" rowspan="{{ row_appointments.1.row }}">{{ row_appointments.0 }}</td>
25 25
      {% for appointment in row_appointments.1.appointments %}
26 26
      {% if forloop.counter != 1 %}
27 27
      <tr>
28 28
        {% endif %}
29
        <td {% if appointment.type == 2 %}colspan="2"{% endif %}>{{ appointment.label }}{% if appointment.paper_id %} - {{ appointment.paper_id }} {% endif %}{% if appointment.workers_absent %} <span title="Au moins un intervenant est absent" class="icon-warning-sign absent"></span>{% endif %}</td>
29
        <td {% if appointment.type == 2 %}colspan="2"{% endif %} class="avoid-page-break-before" style="page-break-before: avoid;">{{ appointment.label }}{% if appointment.paper_id %} - {{ appointment.paper_id }} {% endif %}{% if appointment.workers_absent %} <span title="Au moins un intervenant est absent" class="icon-warning-sign absent"></span>{% endif %}</td>
30 30
        <td>{% if appointment.absent %}{{ appointment.state }}{% endif %}</td>
31 31
        {% if appointment.type != 2 %}<td>{{ appointment.act }}</td>{% endif %}
32 32
        <td>
calebasse/static/css/print.css
88 88
  display: none;
89 89
}
90 90

  
91
div.page-header {
92
  position: fixed;
93
  top: 0;
94
}
95

  
96 91
div#activity {
97 92
    float: none;
98 93
}
......
159 154
    display: none;
160 155
}
161 156

  
157
td.avoid-page-break-before {
158
    page-break-before: avoid;
159
}
160

  
162 161
#tabs-8 label:after {
163 162
    content: ':';
164
}
163
}
calebasse/static/css/style.css
1443 1443

  
1444 1444
.lightgray {
1445 1445
    color: #bbb;
1446
}
1446
}
1447

  
1448
.no-border {
1449
    border: 0;
1450
}

Formats disponibles : Unified diff