dossiers: add state date on quotation page and a bit of refactoring (fixes #5977).
This commit is contained in:
parent
99a62b84f2
commit
97fbc1322c
|
@ -48,46 +48,7 @@
|
|||
</div>
|
||||
<div class="content">
|
||||
<table id="dossiers" class="main screen-only">
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">N° dossier
|
||||
</th><th rowspan="2">Nom</th>
|
||||
<th rowspan="2">Prénom</th>
|
||||
<th rowspan="2">Date de naissance</th>
|
||||
<th rowspan="2">État du dossier</th>
|
||||
<th rowspan="2">Date du prochain rendez-vou</th>
|
||||
<th rowspan="2">Date du dernier rendez-vous</th>
|
||||
<th rowspan="2">Mises</th>
|
||||
<th rowspan="2">ANAP</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>papier</th>
|
||||
<th>inform.</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
{% for patient_record in patient_records %}
|
||||
<tr style="display: table-row;" class="pr-line {{ patient_record.state_class }}" data-link="{{ patient_record.object.id }}/view">
|
||||
<td>{{ patient_record.object.paper_id|default_if_none:"" }}</td>
|
||||
<td>{{ patient_record.object.id }}</td>
|
||||
<td><span class="lastname">{{ patient_record.object.last_name }}</span></td>
|
||||
<td>{{ patient_record.object.first_name }}</td>
|
||||
<td>{{ patient_record.object.birthdate|date:"d-m-Y" }}</td>
|
||||
<td class="{{ patient_record.state_class }}">{{ patient_record.state }}</td>
|
||||
<td>{% if patient_record.next_rdv_date %}
|
||||
{{ patient_record.next_rdv_date|date:"d-m-Y, H:i" }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{% if patient_record.last_rdv_date %}
|
||||
{{ patient_record.last_rdv_date|date:"d-m-Y, H:i" }}
|
||||
{% endif %}</td>
|
||||
<td>{% if patient_record.mises %}<span class="icon-ok"></span>{% endif %}</td>
|
||||
<td>{% if patient_record.anap %}<span class="icon-ok"></span>{% endif %}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
</tbody>
|
||||
{% include "dossiers/quotations_patients_table_content.html" %}
|
||||
</table>
|
||||
|
||||
{% if request.GET %}
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">N° dossier
|
||||
</th><th rowspan="2">Nom</th>
|
||||
<th rowspan="2">Prénom</th>
|
||||
<th rowspan="2">Date de naissance</th>
|
||||
<th rowspan="2">État du dossier</th>
|
||||
<th rowspan="2">Date du prochain rendez-vou</th>
|
||||
<th rowspan="2">Date du dernier rendez-vous</th>
|
||||
<th rowspan="2">Mises</th>
|
||||
<th rowspan="2">ANAP</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>papier</th>
|
||||
<th>inform.</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for patient_record in patient_records %}
|
||||
<tr style="display: table-row;" class="pr-line {{ patient_record.state.status.type|lower }}" data-link="{{ patient_record.object.id }}/view">
|
||||
<td>{{ patient_record.object.paper_id|default_if_none:"" }}</td>
|
||||
<td>{{ patient_record.object.id }}</td>
|
||||
<td><span class="lastname">{{ patient_record.object.last_name }}</span></td>
|
||||
<td>{{ patient_record.object.first_name }}</td>
|
||||
<td>{{ patient_record.object.birthdate|date:"d-m-Y" }}</td>
|
||||
<td class="{{ patient_record.state.status.type|lower }}">{{ patient_record.state.status.name }} le {{ patient_record.state.date_selected|date:"d-m-Y" }}</td>
|
||||
<td>{% if patient_record.next_rdv_date %}
|
||||
{{ patient_record.next_rdv_date|date:"d-m-Y, H:i" }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{% if patient_record.last_rdv_date %}
|
||||
{{ patient_record.last_rdv_date|date:"d-m-Y, H:i" }}
|
||||
{% endif %}</td>
|
||||
<td>{% if patient_record.mises %}<span class="icon-ok"></span>{% endif %}</td>
|
||||
<td>{% if patient_record.anap %}<span class="icon-ok"></span>{% endif %}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
|
@ -1,40 +1,3 @@
|
|||
<table class="main print-only">
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">N° dossier
|
||||
</th><th rowspan="2">Nom</th>
|
||||
<th rowspan="2">Prénom</th>
|
||||
<th rowspan="2">Date de naissance</th>
|
||||
<th rowspan="2">État du dossier</th>
|
||||
<th rowspan="2">Date du prochain rendez-vou</th>
|
||||
<th rowspan="2">Date du dernier rendez-vous</th>
|
||||
<th rowspan="2">Mises</th>
|
||||
<th rowspan="2">ANAP</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>papier</th>
|
||||
<th>inform.</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for patient_record in patient_records %}
|
||||
<tr style="display: table-row;" class="pr-line {{ patient_record.state_class }}">
|
||||
<td>{{ patient_record.object.paper_id|default_if_none:"" }}</td>
|
||||
<td>{{ patient_record.object.id }}</td>
|
||||
<td><span class="lastname">{{ patient_record.object.last_name }}</span></td>
|
||||
<td>{{ patient_record.object.first_name }}</td>
|
||||
<td>{{ patient_record.object.birthdate|date:"d-m-Y" }}</td>
|
||||
<td class="{{ patient_record.state_class }}">{{ patient_record.state }}</td>
|
||||
<td>{% if patient_record.next_rdv_date %}
|
||||
{{ patient_record.next_rdv_date|date:"d-m-Y, H:i" }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{% if patient_record.last_rdv_date %}
|
||||
{{ patient_record.last_rdv_date|date:"d-m-Y, H:i" }}
|
||||
{% endif %}</td>
|
||||
<td>{% if patient_record.mises %}<span class="icon-ok"></span>{% endif %}</td>
|
||||
<td>{% if patient_record.anap %}<span class="icon-ok"></span>{% endif %}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
{% include "dossiers/quotations_patients_table_content.html" %}
|
||||
</table>
|
||||
|
|
|
@ -863,8 +863,6 @@ class PatientRecordsQuotationsView(cbv.ListView):
|
|||
patient_records = []
|
||||
for patient_record in paginate_patient_records:
|
||||
current_state = patient_record.get_current_state() or patient_record.get_state()
|
||||
state = current_state.status.name
|
||||
state_class = current_state.status.type.lower()
|
||||
deficiencies = [getattr(patient_record, field) \
|
||||
for field in self.model.DEFICIENCY_FIELDS]
|
||||
anap = any(deficiencies)
|
||||
|
@ -883,8 +881,7 @@ class PatientRecordsQuotationsView(cbv.ListView):
|
|||
patient_records.append(
|
||||
{
|
||||
'object': patient_record,
|
||||
'state': state,
|
||||
'state_class': state_class,
|
||||
'state': current_state,
|
||||
'anap': anap,
|
||||
'mises': mises,
|
||||
'next_rdv_date': next_rdv_datetime,
|
||||
|
|
Reference in New Issue