1 files changed, 28 insertions, 6 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 00470906d..1dd6145c8 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -44,11 +44,9 @@
 {% field_li "Width (cm)" item.width %}
 {% field_li "Height (cm)" item.height %}
 {% field_li "Diameter (cm)" item.diameter %}
+{% field_li "Thickness (cm)" item.thickness %}
 {% field_li "Volume (l)" item.volume %}
-
-{% if item.weight %}{% with item.weight|add:' '|add:item.weight_unit as weight %}
-{% field_li "Weight" weight %}
-{% endwith %}{% endif %}
+{% field_li "Weight" item.weight_string %}
 {% if item.dimensions_comment %}
 </ul>
 {% field "Dimensions comment" item.dimensions_comment "<pre>" "</pre>" %}
@@ -56,6 +54,8 @@
 {% endif %}
 
 {% field_li "Find number" item.find_number %}
+{% field_li "Minimum number of individuals (MNI)" item.min_number_of_individuals %}
+{% field_li "Point of topographic reference" item.topographic_reference_point %}
 {% field_li "Conservatory state" item.conservatory_state %}
 {% if item.conservatory_comment %}
 </ul>
@@ -85,6 +85,9 @@
 <div class='clean-table-wrap'>
 <table id='{{window_id}}-upstream'>
   <tr>
+    <th>&nbsp;</th>
+    <th>{% trans "Year - index" %}</th>
+    <th>{% trans "Label" %}</th>
     <th>{% trans "Type" %}</th>
     <th>{% trans "Related finds" %}</th>
     <th>{% trans "Doer" %}</th>
@@ -94,7 +97,15 @@
   </tr>
   {% for items, treatment in item.upstream_treatments %}
   <tr>
-    <td class='string'>{{ treatment.treatment_type }}</td>
+    <td>
+      <a class="display_details" href="#"
+         onclick="load_window('{% url 'show-treatment' treatment.id %}/');">
+        <i class="fa fa-info-circle" aria-hidden="true"></i>
+      </a>
+    </td>
+    <td class='string'>{{ treatment.year }} - {{treatment.index}}</td>
+    <td class='string'>{{ treatment.label }}</td>
+    <td class='string'>{{ treatment.treatment_types_lbl }}</td>
     <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td>
     <td class='string'>{{ treatment.person|default_if_none:"-" }}</td>
     <td class='string'>{{ treatment.container|default_if_none:"-" }}</td>
@@ -114,6 +125,9 @@
 <div class='clean-table-wrap'>
 <table id='{{window_id}}-downstream'>
   <tr>
+    <th>&nbsp;</th>
+    <th>{% trans "Year - index" %}</th>
+    <th>{% trans "Label" %}</th>
     <th>{% trans "Type" %}</th>
     <th>{% trans "Related finds" %}</th>
     <th>{% trans "Doer" %}</th>
@@ -123,7 +137,15 @@
   </tr>
   {% for items, treatment in item.downstream_treatments %}
   <tr>
-    <td class='string'>{{ treatment.treatment_type }}</td>
+    <td>
+      <a class="display_details" href="#"
+         onclick="load_window('{% url 'show-treatment' treatment.id %}/');">
+        <i class="fa fa-info-circle" aria-hidden="true"></i>
+      </a>
+    </td>
+    <td class='string'>{{ treatment.year }} - {{treatment.index}}</td>
+    <td class='string'>{{ treatment.label }}</td>
+    <td class='string'>{{ treatment.treatment_types_lbl }}</td>
     <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td>
     <td class='string'>{{ treatment.person|default_if_none:"" }}</td>
     <td class='string'>{{ treatment.container|default_if_none:"-" }}</td>