🐛 Sheet: add missing fields, improve layout (refs #5863, #5864, #5865, #5866, #5867, #5868, #5869, #5870, #5871, #5872)

1 files changed, 15 insertions, 11 deletions

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 6f3bafed7..fa639f177 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -16,8 +16,8 @@
 {% with permission_view_own_find=permission_view_own_find %}
 {% with permission_change_own_geovectordata=permission_change_own_geovectordata %}
 {% with permission_change_geovectordata=permission_change_geovectordata %}
-
 {% with permission_change_geo=permission_change_own_geovectordata|or_:permission_change_geovectordata %}
+{% with dating_list=item|m2m_listing:"datings" %}
 
 {% with can_view_documents=permission_view_own_document|or_:permission_view_document %}
 {% with has_documents=item|safe_or:"documents.count" %}
@@ -25,8 +25,8 @@
 {% with display_relations=item|safe_or:"right_relations.count|left_relations.count" %}
 {% with has_image=item|safe_or:"images.count" %}
 {% with has_cultural_attributions=item|safe_or:"cultural_attributions.count" %}
-{% with display_interpretation=item.activity|or_:item.identification|or_:item.interpretation|or_:item.filling %}
-{% with display_datations=item.taq|or_:item.taq_estimated|or_:item.tpq|or_:item.tpq_estimated|or_:has_cultural_attributions %}
+{% with display_interpretation=item.activity|or_:item.identification|or_:item.interpretation %}
+{% with display_datations=dating_list|or_:item.taq|or_:item.taq_estimated|or_:item.tpq|or_:item.tpq_estimated|or_:has_cultural_attributions %}
 {% with can_view_finds=permission_view_own_find|or_:permission_view_find %}
 {% with has_finds=item|safe_or:"base_finds.count" %}
 {% with display_finds=has_finds|and_:can_view_finds %}
@@ -141,11 +141,12 @@
             {% field_flex_multiple_obj "Excavation techniques" item 'excavation_technics' has_image %}
             {% field_flex_multiple_obj "Periods" item 'datings' has_image %}
             {% field_flex_multiple_obj "Documentation" item 'documentations' has_image %}
-            {% field_flex "Opening date" item.opening_date '' '' has_image %}
-            {% field_flex "Closing date" item.closing_date '' '' has_image %}
-            {% field_flex_full "Comment on datings" item.datings_comment "<pre>" "</pre>" has_image %}
+            {% field_flex "Opening date" item.opening_date|date:"DATE_FORMAT" '' '' has_image %}
+            {% field_flex "Closing date" item.closing_date|date:"DATE_FORMAT" '' '' has_image %}
+            {% field_flex_full "Filling" item.filling "<pre>" "</pre>" %}
+            {% field_flex_full "Location" item.location "<pre>" "</pre>" has_image %}
             {% field_flex_full "Description" item.description "<pre>" "</pre>" has_image %}
-            {% field_flex_full "Comment" item.comment "<pre>" "</pre>" has_image %}
+            {% field_flex_full "General comment" item.comment "<pre>" "</pre>" has_image %}
             {% if item.surface  %}
             <dl class="col-12 col-md-6 col-lg-3 flex-wrap">
                 <dt>{%trans "Surface"%}</dt>
@@ -184,10 +185,8 @@
        role="tabpanel" aria-labelledby="{{window_id}}-interpretation-tab">
         <h3>{% trans "Interpretation"%}</h3>
         <div class='row'>
-            {% field_flex_multiple "Documentation" item.documentations %}
             {% field_flex "Activity" item.activity %}
             {% field_flex "Identification" item.identification %}
-            {% field_flex_full "Filling" item.filling "<pre>" "</pre>" %}
             {% field_flex_full "Interpretation" item.interpretation "<pre>" "</pre>" %}
         </div>
     </div>
@@ -196,13 +195,18 @@
     {% if display_datations %}
     <div class="tab-pane fade" id="{{window_id}}-datations"
        role="tabpanel" aria-labelledby="{{window_id}}-datations-tab">
-        <h3>{% trans "Datations"%}</h3>
+        {% if dating_list %}
+        <h3>{% trans "Datations" %}</h3>
+        {% endif %}
+        {% include "ishtar/blocks/sheet_dating_list.html" %}
+        <h3>{% trans "Dating complements" %}</h3>
         <div class='row'>
             {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %}
             {% field_flex "TAQ" item.taq %}
             {% field_flex "Estimated TAQ" item.taq_estimated %}
             {% field_flex "TPQ" item.tpq %}
             {% field_flex "Estimated TPQ" item.tpq_estimated %}
+            {% field_flex_full "Comment on datings" item.datings_comment "<pre>" "</pre>" has_image %}
         </div>
     </div>
     {% endif %}
@@ -347,6 +351,6 @@
     {% endif %}
 </div>
 
-{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
 
 {% endblock %}