Sheets: Full address display for organizations and persons

1 files changed, 21 insertions, 8 deletions

diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 10ee82232..67341c07d 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -76,14 +76,27 @@
 
 <h3>{% trans "Preventive archaelogical file"%}</h3>
 {% 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 %}
-{% if item.permit_reference %}<p><label>{%trans "Permit reference:"%}</label> <span class='value'>{{ item.permit_reference }}</span></p>{% endif %}
-{% if item.general_contractor.attached_to %}<p><label>{%trans "General contractor organisation:"%}</label> <span class='value'>{{ item.general_contractor.attached_to }}</span></p>{% endif %} <!-- Contractor's organisation displayed as concat of Name/Adress/postal_code/city -->
-{% if item.general_contractor %}<p><label>{%trans "General contractor:"%}</label> <span class='value'>{{ item.general_contractor.full_label }}</span></p>{% endif %}
-
-{%else%}
+
+{% field "Saisine type" item.saisine_type %}
+
+{% field "Responsible for town planning service" item.responsible_town_planning_service.full_address %}
+{% if item.town_planning_service %}
+  {% field "Town planning service organization" item.town_planning_service.full_address %}
+{% else %}
+  {% field "Town planning service organization" item.responsible_town_planning_service.attached_to.full_address %}
+{% endif %}
+
+{% field "Permit type" item.permit_type %}
+{% field "Permit reference" item.reference %}
+
+{% field "General contractor" item.general_contractor.full_address %}
+{% if item.corporation_general_contractor %}
+  {% field "General contractor organization" item.corporation_general_contractor.full_address %}
+{% else%}
+  {% field "General contractor organization" item.general_contractor.attached_to.full_address %}
+{% endif %}
+
+{% else %}
 
 <h3>{% trans "Research archaeology"%}</h3>
 {% if item.departments.count %}<p><label>{%trans "Departments"%}{%trans ":"%}</label> <span class='value'>{% for department in item.departments.all %}{% if forloop.counter0 %}, {% endif %}{{ department }}{% endfor %}</span></p>{% endif %}