✨ sheet find: improve fields orderdevelop-5.0

3 files changed, 44 insertions, 41 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html
index ed040b75d..8018af9c0 100644
--- a/archaeological_finds/templates/ishtar/sheet_basefind.html
+++ b/archaeological_finds/templates/ishtar/sheet_basefind.html
@@ -17,10 +17,17 @@
         {% field_flex_detail "Operation" base_find.context_record.operation first %}
         {% field_flex_detail "Archaeological site" base_find.context_record.archaeological_site first %}
         {% field_flex_detail "Context record" base_find.context_record first %}
-        {% field_flex_detail "Details on context record" base_find.context_record_comment %}
         {% field_flex_detail "Town" base_find.context_record.town first %}
         {% field_flex "Parcel" base_find.context_record.parcel '' '' first %}
+        {% field_flex "Excavation ID" base_find.excavation_id '' '' first %}
+
+        {% field_flex "Special interest" base_find.special_interest '' '' first %}
+        {% field_flex_full "Description" base_find.description "<pre>" "</pre>" first %}
 
+    </div>
+    {% if base_find.discovery_method or base_find.discovery_date or base_find.discovery_date_taq or base_find.batch or base_find.comment or base_find.context_record_comment or base_find.topographic_localisation %}
+    <h3>{% trans "Discovery" %}</h3>
+    <div class='row'>
         {% field_flex _("Discovery method") base_find.discovery_method '' '' first %}
         {# START discovery dates #}
         {% with base_find.discovery_date|date:"SHORT_DATE_FORMAT" as discovery_date %}
@@ -40,17 +47,16 @@
         {% endif %}
         {% endwith %}
         {# END discovery dates #}
-
-        {% field_flex "Excavation ID" base_find.excavation_id '' '' first %}
         {% field_flex "Batch/object" base_find.batch '' '' first %}
         {% if base_find.history_object and base_find.history_object.IS_ISOLATED_DICT %}
         {% field_flex "Batch/object" base_find.batch|from_dict:base_find.history_object.IS_ISOLATED_DICT '' '' first %}
         {% endif %}
-
-        {% field_flex "Special interest" base_find.special_interest '' '' first %}
-        {% field_flex_full "Description" base_find.description "<pre>" "</pre>" first %}
         {% field_flex_full _("Comment on the circumstances of discovery") base_find.comment "<pre>" "</pre>" first %}
+        {% field_flex_detail "Details on context record" base_find.context_record_comment %}
+        {% field_flex_full "Point of topographic reference" base_find.topographic_localisation %}
+
     </div>
+    {% endif %}
     {% with item=base_find %}
     {% include "ishtar/blocks/sheet_json.html" %}
     {% endwith %}
@@ -65,9 +71,6 @@
         {% endwith %}
     </div>
     {% endif %}
-    <div class="row">
-        {% field_flex_full "Point of topographic reference" base_find.topographic_localisation %}
-    </div>
     {% if not is_external %}
     {% if item.history_creator or item.last_edition_date or item.created %}
     <h3>{% trans "Sheet"%}</h3>
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 20b325e73..f068a921f 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -124,21 +124,22 @@
 
         <div class='row'>
             {% field_flex _("Denomination") item.denomination %}
-            {% field_flex _("Title") item.title %}
             {% field_flex _("Complete museum ID") item.cache_complete_museum_id %}
             {% field_flex _("Free ID") item.label %}
             {% field_flex _("Previous ID") item.previous_id %}
             {% field_flex _("Excavation ID") item.excavation_ids %}
             {% field_flex _("Laboratory ID") item.laboratory_id %}
+            {% field_flex _("Title") item.title %}
             {% field_flex _("Seal number") item.seal_number %}
             {# no index admin #}
         </div>
 
         <h3>{% trans "Description" %}</h3>
         <div class='row'>
+            {% field_flex_full _("Inventory transcript") item.museum_inventory_transcript %}
             {% field_flex_full _("Description") item.description "<pre>" "</pre>" %}
             {% field_flex_full _("Public description") item.public_description "<pre>" "</pre>" %}
-            {% field_flex_full _("Comparanda") item.comparanda "<pre>" "</pre>" %}
+            {% field_flex_full _("General comment") item.comment "<pre>" "</pre>" %}
             {% field_flex _("Is complete?") item.is_complete %}
             {% field_flex_detail_multiple _("Actors") item.actors %}
             {% with material=item.get_hierarchical_material_types %}{% if material %}
@@ -152,19 +153,15 @@
             {% field_flex _("Object type quality") item.object_type_quality %}
             {% field_flex_multiple_obj _("Functional areas") item 'functional_areas' %}
             {% field_flex_multiple_obj _("Technical areas") item 'technical_areas' %}
+            {% field_flex_full _("Inscription") item.inscription "<pre>" "</pre>" %}
+            {% field_flex_full _("Decoration") item.decoration "<pre>" "</pre>" %}
             {% field_flex_multiple_obj _("Iconographic patterns") item 'iconographic_patterns' %}
             {% field_flex_full _("Notes on iconography") item.iconography_notes "<pre>" "</pre>" %}
-            {% field_flex _("Number of remains") item.find_number %}
-            {% field_flex _("Minimum number of individuals (MNI)") item.min_number_of_individuals %}
-            {% field_flex _("Inventory quantity") item.museum_inventory_quantity %}
-            {% field_flex _("Observed quantity") item.museum_observed_quantity %}
-            {% field_flex_full _("Comment on quantity") item.quantity_comment "<pre>" "</pre>" %}
-            {% field_flex_full _("Decoration") item.decoration "<pre>" "</pre>" %}
-            {% field_flex_full _("Inscription") item.inscription "<pre>" "</pre>" %}
             {% field_flex _("Manufacturing place") item.manufacturing_place %}
+            {% field_flex_multiple_obj _("Workshop, movement, style") item 'workshop_movement_styles' %}
+            {% field_flex_full _("Comparanda") item.comparanda "<pre>" "</pre>" %}
             {% field_flex_multiple_obj _("Cultural attributions") item 'cultural_attributions' %}
             {% field_flex_multiple_obj _("Communicability") item 'communicabilities' %}
-            {% field_flex_full _("General comment") item.comment "<pre>" "</pre>" %}
         </div>
 
         {% if item.has_listed_building_section %}
@@ -197,12 +194,13 @@
             {% field_flex_detail _("Custodian institution") item.museum_custodian_institution %}
             {% field_flex _("Depositor inventory number") item.museum_depositor_inventory_number %}
             {% field_flex _("Collections entry mode") item.museum_collection_entry_mode %}
+            {% field_flex _("Purchase price") item.museum_purchase_price %}
             {% field_flex _("Comment on museum entry mode") item.museum_entry_mode_comment %}
+            {% field_flex _("Date of museum allocation") item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %}
             {% trans "Museum entry date" as museum_entry_date_label %}
             {% field_flex museum_entry_date_label item.museum_entry_date_label %}
             {% field_flex _("Comment on museum entry date") item.museum_entry_date_comment %}
             {% field_flex_detail_multiple _("Donors, testators or vendors") item.museum_donors %}
-            {% field_flex_multiple_obj _("Workshop, movement, style") item 'workshop_movement_styles' %}
             {% field_flex_multiple_obj _("Presence of inventory marking") item "museum_inventory_marking_presence" %}
             {% field_flex_multiple_obj _("Type of marking") item "museum_marking_type" %}
             {% field_flex _("Transcription of the marking") item.mark_text %}
@@ -210,16 +208,18 @@
             {% field_flex _("Conformity with inventory") item.museum_inventory_conformity %}
             {% field_flex _("Comment on conformity") item.museum_conformity_comment %}
             {% field_flex _("Inventory entry year") item.museum_inventory_entry_year %}
-            {% field_flex_full _("Inventory transcript") item.museum_inventory_transcript %}
             {% field_flex _("Original/reproduction") item.museum_original_repro %}
-            {% field_flex _("Date of museum allocation") item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %}
-            {% field_flex _("Purchase price") item.museum_purchase_price %}
         </div>
         {% endif %}
 
-        {% if item.length or item.width or item.height or item.diameter or item.thickness or item.volume or item.weight_string or item.dimensions_comment or item.clutter_long_side or item.clutter_short_side or item.clutter_height %}
-        <h3>{% trans "Dimensions" %}</h3>
+        {% if item.find_number or item.min_number_of_individuals or item.museum_inventory_quantity or item.museum_observed_quantity or item.quantity_comment or item.length or item.width or item.height or item.diameter or item.thickness or item.volume or item.weight_string or item.dimensions_comment or item.clutter_long_side or item.clutter_short_side or item.clutter_height %}
+        <h3>{% trans "Quantities and dimensions" %}</h3>
         <div class='row'>
+            {% field_flex _("Number of remains") item.find_number %}
+            {% field_flex _("Minimum number of individuals (MNI)") item.min_number_of_individuals %}
+            {% field_flex _("Inventory quantity") item.museum_inventory_quantity %}
+            {% field_flex _("Observed quantity") item.museum_observed_quantity %}
+            {% field_flex_full _("Comment on quantity") item.quantity_comment "<pre>" "</pre>" %}
             {% field_flex _("Length (cm)") item.length %}
             {% field_flex _("Width (cm)") item.width %}
             {% field_flex _("Height (cm)") item.height %}
diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html
index fdbcaa3ee..5be9ecaa6 100644
--- a/archaeological_finds/templates/ishtar/sheet_museum_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html
@@ -124,21 +124,22 @@
 
         <div class='row'>
             {% field_flex _("Denomination") item.denomination %}
-            {% field_flex _("Title") item.title %}
             {% field_flex _("Complete museum ID") item.cache_complete_museum_id %}
             {% field_flex _("Free ID") item.label %}
             {% field_flex _("Previous ID") item.previous_id %}
             {% field_flex _("Excavation ID") item.excavation_ids %}
             {% field_flex _("Laboratory ID") item.laboratory_id %}
+            {% field_flex _("Title") item.title %}
             {% field_flex _("Seal number") item.seal_number %}
             {# no index admin #}
         </div>
 
         <h3>{% trans "Description" %}</h3>
         <div class='row'>
+            {% field_flex_full _("Inventory transcript") item.museum_inventory_transcript %}
             {% field_flex_full _("Description") item.description "<pre>" "</pre>" %}
             {% field_flex_full _("Public description") item.public_description "<pre>" "</pre>" %}
-            {% field_flex_full _("Comparanda") item.comparanda "<pre>" "</pre>" %}
+            {% field_flex_full _("General comment") item.comment "<pre>" "</pre>" %}
             {% field_flex _("Is complete?") item.is_complete %}
             {% field_flex_detail_multiple _("Actors") item.actors %}
             {% with material=item.get_hierarchical_material_types %}{% if material %}
@@ -152,19 +153,15 @@
             {% field_flex _("Object type quality") item.object_type_quality %}
             {% field_flex_multiple_obj _("Functional areas") item 'functional_areas' %}
             {% field_flex_multiple_obj _("Technical areas") item 'technical_areas' %}
+            {% field_flex_full _("Inscription") item.inscription "<pre>" "</pre>" %}
+            {% field_flex_full _("Decoration") item.decoration "<pre>" "</pre>" %}
             {% field_flex_multiple_obj _("Iconographic patterns") item 'iconographic_patterns' %}
             {% field_flex_full _("Notes on iconography") item.iconography_notes "<pre>" "</pre>" %}
-            {% field_flex _("Number of remains") item.find_number %}
-            {% field_flex _("Minimum number of individuals (MNI)") item.min_number_of_individuals %}
-            {% field_flex _("Inventory quantity") item.museum_inventory_quantity %}
-            {% field_flex _("Observed quantity") item.museum_observed_quantity %}
-            {% field_flex_full _("Comment on quantity") item.quantity_comment "<pre>" "</pre>" %}
-            {% field_flex_full _("Decoration") item.decoration "<pre>" "</pre>" %}
-            {% field_flex_full _("Inscription") item.inscription "<pre>" "</pre>" %}
             {% field_flex _("Manufacturing place") item.manufacturing_place %}
+            {% field_flex_multiple_obj _("Workshop, movement, style") item 'workshop_movement_styles' %}
+            {% field_flex_full _("Comparanda") item.comparanda "<pre>" "</pre>" %}
             {% field_flex_multiple_obj _("Cultural attributions") item 'cultural_attributions' %}
             {% field_flex_multiple_obj _("Communicability") item 'communicabilities' %}
-            {% field_flex_full _("General comment") item.comment "<pre>" "</pre>" %}
         </div>
 
         {% if item.has_listed_building_section %}
@@ -197,12 +194,13 @@
             {% field_flex_detail _("Custodian institution") item.museum_custodian_institution %}
             {% field_flex _("Depositor inventory number") item.museum_depositor_inventory_number %}
             {% field_flex _("Collections entry mode") item.museum_collection_entry_mode %}
+            {% field_flex _("Purchase price") item.museum_purchase_price %}
             {% field_flex _("Comment on museum entry mode") item.museum_entry_mode_comment %}
+            {% field_flex _("Date of museum allocation") item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %}
             {% trans "Museum entry date" as museum_entry_date_label %}
             {% field_flex museum_entry_date_label item.museum_entry_date_label %}
             {% field_flex _("Comment on museum entry date") item.museum_entry_date_comment %}
             {% field_flex_detail_multiple _("Donors, testators or vendors") item.museum_donors %}
-            {% field_flex_multiple_obj _("Workshop, movement, style") item 'workshop_movement_styles' %}
             {% field_flex_multiple_obj _("Presence of inventory marking") item "museum_inventory_marking_presence" %}
             {% field_flex_multiple_obj _("Type of marking") item "museum_marking_type" %}
             {% field_flex _("Transcription of the marking") item.mark_text %}
@@ -210,16 +208,18 @@
             {% field_flex _("Conformity with inventory") item.museum_inventory_conformity %}
             {% field_flex _("Comment on conformity") item.museum_conformity_comment %}
             {% field_flex _("Inventory entry year") item.museum_inventory_entry_year %}
-            {% field_flex_full _("Inventory transcript") item.museum_inventory_transcript %}
             {% field_flex _("Original/reproduction") item.museum_original_repro %}
-            {% field_flex _("Date of museum allocation") item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %}
-            {% field_flex _("Purchase price") item.museum_purchase_price %}
         </div>
         {% endif %}
 
-        {% if item.length or item.width or item.height or item.diameter or item.thickness or item.volume or item.weight_string or item.dimensions_comment or item.clutter_long_side or item.clutter_short_side or item.clutter_height %}
-        <h3>{% trans "Dimensions" %}</h3>
+        {% if item.find_number or item.min_number_of_individuals or item.museum_inventory_quantity or item.museum_observed_quantity or item.quantity_comment or item.length or item.width or item.height or item.diameter or item.thickness or item.volume or item.weight_string or item.dimensions_comment or item.clutter_long_side or item.clutter_short_side or item.clutter_height %}
+        <h3>{% trans "Quantities and dimensions" %}</h3>
         <div class='row'>
+            {% field_flex _("Number of remains") item.find_number %}
+            {% field_flex _("Minimum number of individuals (MNI)") item.min_number_of_individuals %}
+            {% field_flex _("Inventory quantity") item.museum_inventory_quantity %}
+            {% field_flex _("Observed quantity") item.museum_observed_quantity %}
+            {% field_flex_full _("Comment on quantity") item.quantity_comment "<pre>" "</pre>" %}
             {% field_flex _("Length (cm)") item.length %}
             {% field_flex _("Width (cm)") item.width %}
             {% field_flex _("Height (cm)") item.height %}