Revision 7db9b9ef
Added by Jérôme Schneider over 12 years ago
calebasse/agenda/templates/agenda/service-activity.html | ||
---|---|---|
14 | 14 |
|
15 | 15 |
<table class="main" id="activity"> |
16 | 16 |
<thead> |
17 |
<tr> <th>Heure</th> <th>Libellé</th> <th>Type d'acte</th> <th>Intervenants</th> </tr>
|
|
17 |
<tr> <th>Heure</th> <th>Libellé</th> <th>Type d'acte</th> <th>Intervenants</th> <th>Statut</th> </tr>
|
|
18 | 18 |
</thead> |
19 | 19 |
<tbody> |
20 | 20 |
{% for row_appointments in appointments_times %} |
... | ... | |
31 | 31 |
<span class="lastname">{{ participant.last_name }}</span> {{ participant.first_name }}<br/> |
32 | 32 |
{% endfor %} |
33 | 33 |
</td> |
34 |
<td>{{ appointment.state }}</td> |
|
34 | 35 |
</tr> |
35 | 36 |
{% endfor %} |
36 | 37 |
</tr> |
calebasse/agenda/views.py | ||
---|---|---|
85 | 85 |
appointment['type'] = 1 |
86 | 86 |
appointment['label'] = event.patient.display_name |
87 | 87 |
appointment['act'] = event.act_type.name |
88 |
appointment['state'] = event.act.get_state() |
|
88 | 89 |
else: |
89 | 90 |
appointment['type'] = 2 |
90 | 91 |
if event.event_type.label == 'Autre' and event.title: |
Also available in: Unified diff
agenda: add act state into service activity