Sheets: add ishtar ID (refs #3517)

1 files changed, 13 insertions, 19 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index b088f3161..7889870b9 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -15,26 +15,13 @@
 <p class='window-refs'>{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} &ndash; {% endif %}{{base_find.short_id}}{% endfor %}</p>
 <p class="window-refs">{{ item.administrative_index|default:"" }}</p>
 <p class="window-refs">{{ item.contextrecord|default:"" }}</p>
-
+{% include "ishtar/blocks/sheet_external_id.html" %}
 
 
 <ul class='form-flex'>
-{% field_li "Previous ID" item.previous_id %}
-
-  <li><label>{%trans "Creation:"%}</label>
-    <span class='value'>
-        {{item.history_creator.ishtaruser.person}}<br/>
-        <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small>
-    </span>
-  </li>
-  {% if item.history_creation_date != item.last_edition_date %}
-  <li><label>{%trans "Modification:"%}</label>
-    <span class='value'>
-        {{item.history_modifier.ishtaruser.person}}<br/>
-        <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small>
-    </span>
-  </li>
-  {% endif %}
+  {% field_li "Previous ID" item.previous_id %}
+
+  {% include "ishtar/blocks/sheet_creation_section.html" %}
 {% field_li "Administrative index" item.administrative_index %}
 {% field_li_multiple "Material types" item.material_types %}
 {% field_li "Dating" item.dating %}
@@ -176,9 +163,16 @@
 <h3>{% trans "Associated base finds"%}</h3>
 
 {% for base_find in item.base_finds.all %}
+<p class='window-refs'>{{base_find.complete_id }}</p>
+<p class='window-refs'>{{base_find.short_id }}</p>
+{% if base_find.external_id %}
+<p class='window-refs external-id'>
+  <small title="{% trans 'Internal ID' %}">
+    <i class="fa fa-key" aria-hidden="true"></i>
+    {{base_find.external_id|default:''}}
+  </small>
+</p>{% endif %}
 <ul class='form-flex'>
-{% field_li "Complete ID" base_find.complete_id %}
-{% field_li "Short ID" base_find.short_id %}
 {% 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_li "Created by" creator|safe %}