Sheet find: put base find on top

1 files changed, 83 insertions, 83 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index af7997e67..092d0fc1e 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -33,6 +33,89 @@
 </div>
 {% endif %}
 
+<h2>{% trans "Associated base finds"%}</h2>
+
+<div class="subsection">
+    {% for base_find in item.base_finds.all %}
+    <p class='window-refs text-center'>{{base_find.complete_id }}</p>
+    <p class='window-refs text-center'>{{base_find.short_id }}</p>
+    {% if base_find.external_id %}
+    <p class='window-refs text-center external-id'>
+        <small title="{% trans 'Internal ID' %}">
+            <i class="fa fa-key" aria-hidden="true"></i>
+            {{base_find.external_id|default:''}}
+        </small>
+    </p>{% endif %}
+
+    <div class='row'>
+        {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %}
+        {% with item.history_creator.ishtaruser.full_label|add:"<br/><i>"|add:creation_date|add:"</i>" as creator %}
+        {% field_flex "Created by" creator|safe %}
+        {% endwith %}{% endwith %}
+        {% if item.history_creation_date != item.last_edition_date %}
+        {% with item.last_edition_date|date:"SHORT_DATETIME_FORMAT" as edition_date %}
+        {% with item.history_modifier.ishtaruser.full_label|add:"<br/><i>"|add:edition_date|add:"</i>" as modifier %}
+        {% trans "Last modified by" as lastmodifiedby_label %}
+        {% field_flex lastmodifiedby_label modifier|safe %}
+        {% endwith %}{% endwith %}
+        {% endif %}
+        {% field_flex "Excavation ID" base_find.excavation_id %}
+        {% field_flex "Batch/object" base_find.batch %}
+        {% 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 %}
+        {% endif %}
+
+        {# START discovery dates #}
+        {% if not base_find.discovery_date_taq %}
+        {% trans "Discovery date" as discovery_date_label %}
+        {% field_flex discovery_date_label base_find.discovery_date %}
+        {% elif base_find.discovery_date.year == base_find.discovery_date_taq.year and base_find.discovery_date_taq|date:"d-m" == "31-12" and base_find.discovery_date|date:"d-m" == "01-01" %}
+        {% trans "Discovery year" as discovery_year_label %}
+        {% field_flex discovery_year_label base_find.discovery_date.year %}
+        {% else %}
+        {% trans "Discovery date (TPQ)" as discovery_tpq_label %}
+        {% field_flex discovery_tpq_label base_find.discovery_date %}
+        {% trans "Discovery date (TAQ)" as discovery_taq_label %}
+        {% field_flex discovery_taq_label base_find.discovery_date_taq %}
+        {% endif %}
+        {# END discovery dates #}
+
+        {% field_flex "Special interest" base_find.special_interest %}
+        {% field_flex_detail "Context record" base_find.context_record %}
+        {% field_flex "Town" base_find.context_record.parcel.town %}
+        {% field_flex "Parcel" base_find.context_record.parcel %}
+        {% field_flex_detail "Operation" base_find.context_record.operation %}
+        {% field_flex_detail "Archaeological site" base_find.context_record.archaeological_site %}
+        {% field_flex_full "Description" base_find.description "<pre>" "</pre>" %}
+        {% field_flex_full "Comment" base_find.comment "<pre>" "</pre>" %}
+    </div>
+
+    {% if base_find.x or base_find.y or base_find.topographic_localisation %}
+    <h3>{% trans "Coordinates"%}</h3>
+    <div class='row'>
+        {% field_flex "Point of topographic reference" base_find.topographic_localisation %}
+        <dl class="col-12 d-flex flex-wrap row">
+            <dt class="col-2">{% trans "Coordinates" %}</dt>
+            <dd class="col-10">
+                {% trans "X:"%} {{base_find.x|default_if_none:"-"}}
+                {% if base_find.estimated_error_x %} ({% trans "error:" %} {{base_find.estimated_error_x}}){% endif %},
+                {% trans "Y:"%} {{base_find.y|default_if_none:"-"}},
+                {% if base_find.estimated_error_y %} ({% trans "error:" %} {{base_find.estimated_error_y}}){% endif %},
+                {% trans "Z:"%} {{base_find.z|default_if_none:"-"}}
+                {% if base_find.estimated_error_z %} ({% trans "error:" %} {{base_find.estimated_error_z}}){% endif %}
+                {% if base_find.spatial_reference_system %}
+                &ndash; {{base_find.spatial_reference_system.label}}{% if base_find.spatial_reference_system.srid %} -
+                {% trans "SRID"%} {{base_find.spatial_reference_system.srid}}{% endif %}
+                {% endif %}
+            </dd>
+        </dl>
+    </div>
+    {% endif %}
+
+</div>
+{% if forloop.counter0 %}<hr/>{% endif %}
+{% endfor %}
+
 <h3>{% trans "Identification" %}</h3>
 
 <div class='row'>
@@ -213,89 +296,6 @@
 
 {% endif %}
 
-<h2>{% trans "Associated base finds"%}</h2>
-
-<div class="subsection">
-{% for base_find in item.base_finds.all %}
-<p class='window-refs text-center'>{{base_find.complete_id }}</p>
-<p class='window-refs text-center'>{{base_find.short_id }}</p>
-{% if base_find.external_id %}
-<p class='window-refs text-center external-id'>
-  <small title="{% trans 'Internal ID' %}">
-    <i class="fa fa-key" aria-hidden="true"></i>
-    {{base_find.external_id|default:''}}
-  </small>
-</p>{% endif %}
-
-<div class='row'>
-    {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %}
-    {% with item.history_creator.ishtaruser.full_label|add:"<br/><i>"|add:creation_date|add:"</i>" as creator %}
-    {% field_flex "Created by" creator|safe %}
-    {% endwith %}{% endwith %}
-    {% if item.history_creation_date != item.last_edition_date %}
-    {% with item.last_edition_date|date:"SHORT_DATETIME_FORMAT" as edition_date %}
-    {% with item.history_modifier.ishtaruser.full_label|add:"<br/><i>"|add:edition_date|add:"</i>" as modifier %}
-    {% trans "Last modified by" as lastmodifiedby_label %}
-    {% field_flex lastmodifiedby_label modifier|safe %}
-    {% endwith %}{% endwith %}
-    {% endif %}
-    {% field_flex "Excavation ID" base_find.excavation_id %}
-    {% field_flex "Batch/object" base_find.batch %}
-    {% 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 %}
-    {% endif %}
-
-    {# START discovery dates #}
-    {% if not base_find.discovery_date_taq %}
-    {% trans "Discovery date" as discovery_date_label %}
-    {% field_flex discovery_date_label base_find.discovery_date %}
-    {% elif base_find.discovery_date.year == base_find.discovery_date_taq.year and base_find.discovery_date_taq|date:"d-m" == "31-12" and base_find.discovery_date|date:"d-m" == "01-01" %}
-    {% trans "Discovery year" as discovery_year_label %}
-    {% field_flex discovery_year_label base_find.discovery_date.year %}
-    {% else %}
-    {% trans "Discovery date (TPQ)" as discovery_tpq_label %}
-    {% field_flex discovery_tpq_label base_find.discovery_date %}
-    {% trans "Discovery date (TAQ)" as discovery_taq_label %}
-    {% field_flex discovery_taq_label base_find.discovery_date_taq %}
-    {% endif %}
-    {# END discovery dates #}
-
-    {% field_flex "Special interest" base_find.special_interest %}
-    {% field_flex_detail "Context record" base_find.context_record %}
-    {% field_flex "Town" base_find.context_record.parcel.town %}
-    {% field_flex "Parcel" base_find.context_record.parcel %}
-    {% field_flex_detail "Operation" base_find.context_record.operation %}
-    {% field_flex_detail "Archaeological site" base_find.context_record.archaeological_site %}
-    {% field_flex_full "Description" base_find.description "<pre>" "</pre>" %}
-    {% field_flex_full "Comment" base_find.comment "<pre>" "</pre>" %}
-</div>
-
-{% if base_find.x or base_find.y or base_find.topographic_localisation %}
-<h3>{% trans "Coordinates"%}</h3>
-<div class='row'>
-    {% field_flex "Point of topographic reference" base_find.topographic_localisation %}
-    <dl class="col-12 d-flex flex-wrap row">
-        <dt class="col-2">{% trans "Coordinates" %}</dt>
-        <dd class="col-10">
-            {% trans "X:"%} {{base_find.x|default_if_none:"-"}}
-            {% if base_find.estimated_error_x %} ({% trans "error:" %} {{base_find.estimated_error_x}}){% endif %},
-            {% trans "Y:"%} {{base_find.y|default_if_none:"-"}},
-            {% if base_find.estimated_error_y %} ({% trans "error:" %} {{base_find.estimated_error_y}}){% endif %},
-            {% trans "Z:"%} {{base_find.z|default_if_none:"-"}}
-            {% if base_find.estimated_error_z %} ({% trans "error:" %} {{base_find.estimated_error_z}}){% endif %}
-            {% if base_find.spatial_reference_system %}
-            &ndash; {{base_find.spatial_reference_system.label}}{% if base_find.spatial_reference_system.srid %} -
-            {% trans "SRID"%} {{base_find.spatial_reference_system.srid}}{% endif %}
-            {% endif %}
-        </dd>
-    </dl>
-</div>
-{% endif %}
-
-</div>
-{% if forloop.counter0 %}<hr/>{% endif %}
-{% endfor %}
-
 {% if item.source.count %}
 <h3>{% trans "Documents"%}</h3>
 <table id='{{window_id}}-docs' class="table table-striped">