From d55a5ec58047dc53118dce1d3aecbeb398cf57de Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 7 Jun 2024 13:34:38 +0200
Subject: 🐛 Sheet: add missing fields, improve layout (refs #5863, #5864,
 #5865, #5866, #5867, #5868, #5869, #5870, #5871, #5872)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/ishtar/sheet_find.html               | 33 +---------------------
 .../templates/ishtar/sheet_treatment.html          |  4 +--
 .../templates/ishtar/sheet_treatmentfile.html      |  6 ++--
 3 files changed, 6 insertions(+), 37 deletions(-)

(limited to 'archaeological_finds')

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 6af22839f..c0f525dfa 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -253,38 +253,7 @@
       </div>
       {% endif %}
       {% if dating_list %}
-      <table id='{{window_id}}-datings' class="table table-striped">
-          <tr>
-              <th>{% trans "Chronological period" %}</th>
-              <th>{% trans "Start date" %}</th>
-              <th>{% trans "End date" %}</th>
-              <th>{% trans "Dating type" %}</th>
-              <th>{% trans "Quality" %}</th>
-              <th>{% trans "Precise on this dating" %}</th>
-          </tr>
-          {% for dating in dating_list %}
-          <tr>
-              <td>
-                  {{dating.period}}
-              </td>
-              <td>
-                  {{dating.start_date|default_if_none:"-"}}
-              </td>
-              <td>
-                  {{dating.end_date|default_if_none:"-"}}
-              </td>
-              <td>
-                  {{dating.dating_type|default_if_none:"-"}}
-              </td>
-              <td>
-                  {{dating.quality|default_if_none:"-"}}
-              </td>
-              <td>
-                  {{dating.precise_dating|default_if_none:"-"}}
-              </td>
-          </tr>
-          {% endfor %}
-      </table>
+      {% include "ishtar/blocks/sheet_dating_list.html" %}
       {% endif %}
       <div class='row'>
           {% field_flex_full "Comment on dating" item.dating_comment "<pre>" "</pre>" %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html
index b5025b3fe..772cfd903 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatment.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatment.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n window_field from_dict link_to_window window_tables window_ope_tables window_header humanize %}
+{% load i18n l10n window_field from_dict link_to_window window_tables window_ope_tables window_header humanize %}
 
 {% block head_title %}<strong>{% trans "Treatment" %}</strong> - {{ item|default:"" }}{% endblock %}
 
@@ -63,7 +63,7 @@
                             <p class="window-refs">{{ item.label|default:"" }}</p>
                             {% if item.other_reference %}
                             <p class="window-refs">{{ item.other_reference }}</p>{% endif %}
-                            <p class="window-refs">{{ item.year }} - {{ item.index }}</p>
+                            <p class="window-refs">{{ item.year|unlocalize }} - {{ item.index|unlocalize }}</p>
                             {% if item.external_id %}
                             <p class="window-refs">{{ item.external_id }}</p>{% endif %}
                             {% if item.end_date %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
index eacf853ca..676d3b4a6 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
@@ -40,9 +40,9 @@
     {% field_flex "Type" item.type %}
     {% field_flex_detail "Responsible" item.in_charge %}
     {% field_flex_detail "Associated basket" item.associated_basket %}
-    {% field_flex "Reception date" item.reception_date %}
-    {% field_flex "Start date" item.creation_date %}
-    {% field_flex "Closing date" item.end_date %}
+    {% field_flex "Reception date" item.reception_date|date:"DATE_FORMAT" %}
+    {% field_flex "Start date" item.creation_date|date:"DATE_FORMAT" %}
+    {% field_flex "Closing date" item.end_date|date:"DATE_FORMAT" %}
     {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
     {% include "ishtar/blocks/sheet_json.html" %}
 </div>
-- 
cgit v1.2.3