Treatments: more work on db treatments efficiency (refs #3108)

1 files changed, 12 insertions, 2 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 14e88e720..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 humanize %}
+{% load i18n window_field from_dict link_to_window window_tables humanize %}
 
 {% block head_sheet %}
 {{block.super}}
@@ -73,7 +73,7 @@
 {% 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|intcomma '' ' '|add:CURRENCY %}
+{% 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%}
@@ -83,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>
@@ -129,6 +132,13 @@
 </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 %}