Administrativ act: adapt forms, models and sheet

1 files changed, 30 insertions, 21 deletions

diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
index 92246ba80..1ea2a789d 100644
--- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html
+++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
@@ -1,9 +1,9 @@
 {% extends "ishtar/sheet.html" %}
 {% load i18n window_header window_field %}
 
-{% block head_title %}{% trans "Administrative act" %}{% endblock %}
+{% block head_title %}<strong>{% trans "Administrative act" %}</strong> - {{item.full_ref}}{% endblock %}
 
-{% block content %}
+{% block toolbar %}
 {% if item.operation %}
 {% window_nav item window_id 'show-administrativeact' 'operation_administrativeactop_modify' %}
 {% endif %}
@@ -16,31 +16,40 @@
 {% if item.treatment_file %}
 {% window_nav item window_id 'show-administrativeact' 'treatmentfile_administrativeacttreatmentfile_modify' %}
 {% endif %}
+{% endblock %}
+
+{% block content %}
 
 <h3>{% trans "General"%}</h3>
-<ul class='form-flex'>
-    {% field_li "Year" item.year %}
-    {% field_li "Index" item.index %}
-    {% field_li "Internal reference" item.ref_sra %}
-    {% field_li "Type" item.act_type %}
-    {% field_li "Object" item.act_object %}
-    {% field_li "Signature date" item.signature_date %}
-    {% field_li "In charge" item.in_charge %}
-    {% field_li "Archaeological preventive operator" item.operator %}
-    {% field_li_detail "Associated file" item.associated_file %}
-    {% field_li_detail "Operation" item.operation %}
-    {% field_li_detail "Treatment" item.treatment %}
-    {% field_li_detail "Treatment request" item.treatment_file %}
+<div class="row">
+    {% field_flex "Year" item.year %}
+    {% field_flex "Index" item.index %}
+    {% field_flex "Internal reference" item.ref_sra %}
+    {% field_flex "Type" item.act_type %}
+    {% field_flex "Object" item.act_object %}
+    {% field_flex "Signature date" item.signature_date %}
+    {% field_flex "In charge" item.in_charge %}
+    {% field_flex "Archaeological preventive operator" item.operator %}
+    {% field_flex_detail "Associated file" item.associated_file %}
+    {% field_flex_detail "Operation" item.operation %}
+    {% field_flex_detail "Treatment" item.treatment %}
+    {% field_flex_detail "Treatment request" item.treatment_file %}
 
     {% if item.operation and item.operation.surface %}
-    <li><label>{% trans "Surface"%}</label> <span class='value'>{{ item.operation.surface }} m<sup>2</sup> ({{ item.operation.surface_ha }} ha)</span></li>
+    <div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
+        <dt class="col-5">{% trans "Surface"%}</dt>
+        <dd class='col-7'>
+            {{ item.operation.surface }} m<sup>2</sup> ({{ item.operation.surface_ha }} ha)
+        </dd>
+    </div>
     {% endif %}
-    {% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
-{% comment %}{% if item.general_contractor.attached_to %}<p>
+    {% field_flex_detail "Created by" item.history_creator.ishtaruser.person %}
+
+    {% comment %}{% 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 %}
-{% endcomment %}
-</ul>
+    {% if item.general_contractor %}<p><label>{%trans "General contractor"%}</label> <span class='value'>{{ item.general_contractor.full_label }}</span></p>{% endif %}
+    {% endcomment %}
+</div>
 
 {% endblock %}