1 files changed, 37 insertions, 2 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index d23de0e8e..741eb0d16 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n window_field from_dict link_to_window %}
+{% load i18n window_field from_dict link_to_window window_tables humanize %}
 
 {% block head_sheet %}
 {{block.super}}
@@ -32,7 +32,18 @@
 {% field_li "Free-ID" item.label %}
 {% field_li "Previous ID" item.previous_id %}
 {% field_li "Description" item.description %}
-{% field_li "Created by" item.history_creator.ishtaruser.full_label %}
+{% 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 %}
+{% 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 %}
+{% field_li "Last modified by" modifier|safe %}
+{% endwith %}
+{% endwith %}
+{% endif %}
 {% field_li "Administrative index" item.administrative_index %}
 {% field_li_multiple "Material types" item.material_types %}
 {% field_li "Dating" item.dating %}
@@ -61,6 +72,8 @@
 {% field_li_multiple "Type of preservation to consider" item.preservation_to_considers %}
 {% field_li_multiple "Object types" item.object_types %}
 {% field_li_multiple "Integrity" item.integrities %}
+{% field_li_multiple "Remarkability" item.remarkabilities %}
+{% field_li "Estimated value" item.estimated_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %}
 {% if item.CHECK_DICT %}
 {% field_li "Checked" item.checked|from_dict:item.CHECK_DICT %}
 {% endif%}
@@ -70,6 +83,9 @@
 {% field_li "Container" item.container %}
 </ul>
 
+{% if item.upstream_treatment or item.downstream_treatment %}
+<h3>{% trans "Associated base finds"%}</h3>
+
 {% if item.upstream_treatment %}
 <table class='simple' id='{{window_id}}-upstream'>
   <caption>{% trans "Upstream treatment" %}</caption>
@@ -116,12 +132,31 @@
 </table>
 {% endif %}
 
+{% comment %}
+{% trans "Upstream treatments" as treatments  %}
+{% dynamic_table_document treatments 'finds_treatments' 'find_id' item.pk '' output %}
+{% endcomment %}
+
+{% endif %}
+
 <h3>{% trans "Associated base finds"%}</h3>
 
 {% for base_find in item.base_finds.all %}
 <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 %}
+{% 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 %}
+{% field_li "Last modified by" modifier|safe %}
+{% endwith %}
+{% endwith %}
+{% endif %}
 {% if base_find.IS_ISOLATED_DICT %}
 {% field_li "Batch/object" base_find.batch|from_dict:base_find.IS_ISOLATED_DICT %}
 {% endif %}