Improve layout of parcels

1 files changed, 4 insertions, 23 deletions

diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index cec748dfc..11a90df9e 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -41,7 +41,7 @@
 <p><label>{%trans "In charge:"%}</label> <span class='value'>{{ item.in_charge.full_label }}</span></p>
 <p><label>{%trans "State:"%}</label> <span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
 {% else %}{%trans "Closed file"%}</span></p>
-<p><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user }}</span></p>
+{% if item.closing %}<p><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user.full_label }}</span></p>{% endif %}
 {% endif %}
 
 <p><label>{%trans "Type:"%}</label> <span class='value'>{{ item.file_type }}</span></p>
@@ -62,7 +62,7 @@
 {% if item.is_preventive %}
 
 <h3>{% trans "Preventive archaelogical file"%}</h3>
-<p><label>{%trans "Developed surface:"%}</label> <span class='value'>{{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)</span></p>
+{% if item.total_developed_surface %}<p><label>{%trans "Developed surface:"%}</label> <span class='value'>{{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)</span></p>{% endif %}
 <p><label>{%trans "Saisine type:"%}</label> <span class='value'>{{ item.saisine_type }}</span></p>
 {% if item.town_planning_service %}<p><label>{%trans "Town planning service:"%}</label> <span class='value'>{{ item.town_planning_service }}</span></p>{% endif %}
 {% if item.permit_type %}<p><label>{%trans "Permit type:"%}</label> <span class='value'>{{ item.permit_type }}</span></p>{% endif %}
@@ -86,27 +86,8 @@
 
 {% endif %}
 
-<table>
-  <caption>{%trans "Associated parcels"%}</caption>
-  <tr>
-    <th>{% trans "Town" %}</th>
-    <th>{% trans "Year" %}</th>
-    <th>{% trans "Section" %}</th>
-    <th>{% trans "Parcels" %}</th>
-    {#<th>{% trans "Owner" %}</th>#}
-  </tr>
-  {% for parcel in item.grouped_parcels %}
-  <tr>
-    <td class='string'>{{parcel.town}}</td>
-    <td>{{parcel.year}}</td>
-    <td>{{parcel.section}}</td>
-    <td>{{parcel.parcel_numbers|join:", "}}</td>
-    {#<td class='string'>{{operation.parcel.owner}}</td>#}
-  </tr>
-  {% empty %}
-  <tr><td colspan="4" class='no_items'>{% trans "No parcel associated to this operation" %}</td></tr>
-  {% endfor %}
-</table>
+{% trans "Associated parcels" as parcels_label %}
+{% include "ishtar/blocks/window_tables/parcels.html" %}
 
 {% trans "Administrativ acts" as administrativeacts_label %}
 {% table_administrativact administrativeacts_label item.administrative_act.all %}