entrouvert
/
calebasse
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

agenda: format act time in the template not the view

This commit is contained in:
Benjamin Dauvergne 2013-01-06 02:13:54 +01:00
parent 2ea544113d
commit 55ace1fb38
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calebasse/agenda/templates/agenda/act-validation.html
View File

@ -36,7 +36,7 @@
<div id="actes">
{% for acte, last_status, last_status_name in actes %}
<div class="frame acte" id="acte-frame-{{ acte.id }}">
<h3>{{ acte.date }} - <strong><span class="lastname">{{ acte.patient.last_name }}</span> {{ acte.patient.first_name }}</strong>
<h3>{{ acte.time|date:"H:M" }} - <strong><span class="lastname">{{ acte.patient.last_name }}</span> {{ acte.patient.first_name }}</strong>
{% if acte.patient.paper_id %} {{ acte.patient.paper_id }} {% endif %}({{ acte.patient.id }}) -
<strong>{{ acte.act_type }}</strong>
<p>{% if acte.doctors %}{% for doctor in acte.doctors.all %}<span class="lastname">{{ doctor.last_name }}</span> {{ doctor.first_name }} {% endfor %}{% endif %}</p>

1
calebasse/agenda/views.py
View File

@ -244,7 +244,6 @@ class AgendaServiceActValidationView(TemplateView):
display_name = VALIDATION_STATES[state.state_name]
if not state.previous_state:
state = None
act.date = act.date.strftime("%H:%M")
actes.append((act, state, display_name))
context['validation_states'] = dict(VALIDATION_STATES)
if self.service.name != 'CMPP' and \