From 5f9fdefa537c105762e5fd7c50dbbaa8376ee3fc Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 26 Oct 2023 18:33:38 +0200
Subject: 🐛 Operation sheet: add missing preventive archaeology fields,
 improve date format
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/ishtar/sheet_operation.html          | 38 +++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 6fbc2e404..93ea999e4 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -237,13 +237,29 @@
             {% field_flex_multiple_obj "Remains" item 'remains' %}
             {% field_flex_multiple_obj "Chronological period" item 'periods' %}
             {% field_flex "Record quality" item.record_quality_type %}
-            {% field_flex "Report delivery date" item.report_delivery_date %}
+            {% with report_delivery_date=item.report_delivery_date|date:"DATE_FORMAT"|default:"" %}
+            {% field_flex "Report delivery date" report_delivery_date %}
+            {% endwith %}
             {% field_flex "Report processing" item.report_processing %}
-            {% field_flex "Deadline for submission of the documentation" item.documentation_deadline %}
+
+            {% with documentation_deadline=item.documentation_deadline|date:"DATE_FORMAT"|default:"" %}
+            {% field_flex "Deadline for submission of the documentation" documentation_deadline %}
+            {% endwith %}
             {% field_flex "Documentation received" item.documentation_received %}
-            {% field_flex "Deadline for submission of the finds" item.finds_deadline %}
+
+            {% with finds_deadline=item.finds_deadline|date:"DATE_FORMAT"|default:"" %}
+            {% field_flex "Deadline for submission of the finds" finds_deadline %}
+            {% endwith %}
             {% field_flex "Finds received" item.finds_received %}
             {% field_flex_detail "Associated file" item.associated_file %}
+
+            {% field_flex "Résultat considéré comme négatif" item.negative_result %}
+            {% field_flex_detail "Rapporteur CTRA/CIRA" item.cira_rapporteur %}
+            {% with cira_date=item.cira_date|date:"DATE_FORMAT"|default:"" %}
+            {% field_flex "Date avis CTRA/CIRA" cira_date %}
+            {% endwith %}
+
+            {% field_flex "Operator reference" item.operator_reference %}
             {% field_flex "Responsible for planning service" item.associated_file.responsible_town_planning_service.full_address %}
             {% if item.associated_file.town_planning_service %}
             {% field_flex "Planning service organization" item.associated_file.town_planning_service.full_address %}
@@ -278,8 +294,22 @@
         </div>
         {% endif %}
 
+        {% if item.fnap_financing or item.fnap_cost or item.zoning_prescription or item.large_area_prescription or item.geoarchaeological_context_prescription or item.scheduled_man_days or item.optional_man_days or item.effective_man_days %}
+        <h3>{% trans "Preventive" %}</h3>
+        <div class="row">
+            {% field_flex "Financement FNAP (%)" item.fnap_financing %}
+            {% field_flex "Financement FNAP (€)" item.fnap_cost %}
+            {% field_flex "Prescription on zoning" item.zoning_prescription %}
+            {% field_flex "Prescription on large area" item.large_area_prescription %}
+            {% field_flex "Prescription on geoarchaeological context" item.geoarchaeological_context_prescription %}
+            {% field_flex "Scheduled man-days" item.scheduled_man_days %}
+            {% field_flex "Optional man-days" item.optional_man_days %}
+            {% field_flex "Effective man-days" item.effective_man_days %}
+        </div>
+        {% endif %}
+
         {% if item.seizure_name or item.official_report_number or item.name_of_the_protagonist or item.applicant_authority or item.minutes_writer %}
-        <h3>{% trans "Court-ordered seizure"%}</h3>
+        <h3>{% trans "Court-ordered seizure" %}</h3>
         <div class="row">
             {% field_flex "Seizure name" item.seizure_name %}
             {% field_flex "Official report number" item.official_report_number %}
-- 
cgit v1.2.3