1 files changed, 36 insertions, 8 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 0e5ddfac0..c5bd637a5 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -28,25 +28,35 @@
 <a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}"><img src='{{item.thumbnail.url}}'/></a>
 {% endif%}
 
-<p><label>{%trans "Name"%}{% trans ":"%}</label>
-<span class='value'>{{item.label}}</span></p>
+{% if item.label %}<p><label>{%trans "Name"%}{% trans ":"%}</label>
+<span class='value'>{{item.label}}</span></p>{% endif %}
 {% if item.description %}<p><label>{%trans "Description"%}{% trans ":"%}</label>
 <span class='value'>{{item.description}}</span></p>{% endif%}
 <p><label>{%trans "Created by:"%}</label> <span class='value'>{{ item.history_creator.ishtaruser.full_label }}</span></p>
 <p><label>{%trans "Material type"%}{% trans ":"%}</label>
 <span class='value'>{{item.material_type}}</span></p>
-<p><label>{%trans "Dating"%}{% trans ":"%}</label>
-<span class='value'>{{item.dating}}</span></p>
+{% if item.dating %}<p><label>{%trans "Dating"%}{% trans ":"%}</label>
+<span class='value'>{{item.dating}}</span></p>{% endif %}
 {% if item.volume %}<p><label>{%trans "Volume (l)"%}{% trans ":"%}</label>
 <span class='value'>{{item.volume}}</span></p>{% endif%}
-{% if item.weight %}<p><label>{%trans "Weight (g)"%}{% trans ":"%}</label>
-<span class='value'>{{item.weight}}</span></p>{% endif%}
+{% if item.weight %}<p><label>{%trans "Weight"%}{% trans ":"%}</label>
+<span class='value'>{{item.weight}} {% if item.weight_unit %}{{item.weight_unit}}{% else %}g{% endif %}</span></p>{% endif%}
 {% if item.find_number %}<p><label>{%trans "Find number"%}{% trans ":"%}</label>
 <span class='value'>{{item.find_number}}</span></p>{% endif%}
+
+{% if item.conservatory_state  %}
+<p><label>{%trans "Conservatory state"%}{% trans ":"%}</label>
+<span class='value'>{{item.conservatory_state}}</span></p>
+{% endif %}
+{% if item.preservation_to_consider %}
+<p><label>{%trans "Type of preservation to consider"%}{% trans ":"%}</label>
+<span class='value'>{{item.preservation_to_consider}}</span></p>
+{% endif %}
+
 {% if item.upstream_treatment %}<p><label>{%trans "Upstream treatment"%}{% trans ":"%}</label>
-<span class='value'>{{item.upstream_treatment}}</span></p>{% endif%}
+<span class='value'>{{item.upstream_treatment}} ({% for up in item.upstream_treatment.upstream_treatment.all %}{% if forloop.counter0 %}, {%endif %}{{up}}{% endfor %})</span></p>{% endif%}
 {% if item.downstream_treatment %}<p><label>{%trans "Downstream treatment"%}{% trans ":"%}</label>
-<span class='value'>{{item.downstream_treatment}}</span></p>{% endif%}
+<span class='value'>{{item.downstream_treatment}} ({% for dt in item.downstream_treatment.downstream_treatment.all %}{% if forloop.counter0 %}, {%endif %}{{dt}}{% endfor %})</span></p>{% endif%}
 {% if item.container %}<p><label>{%trans "Container"%}{% trans ":"%}</label>
 <span class='value'>{{item.container}}</span></p>{% endif%}
 
@@ -55,6 +65,24 @@
 {% for base_find in item.base_finds.all %}
 <p><label>{%trans "Complete ID"%}{% trans ":"%}</label>
 <span class='value'>{{base_find.complete_id}}</span></p>
+
+{% if base_find.discovery_date %}
+<p><label>{%trans "Discovery date"%}{% trans ":"%}</label>
+<span class='value'>{{base_find.discovery_date}}</span></p>
+{% endif%}
+{% if base_find.description %}
+<p><label>{%trans "Description"%}{% trans ":"%}</label>
+<span class='value'>{{base_find.description}}</span></p>
+{% endif%}
+{% if base_find.comment %}
+<p><label>{%trans "Comment"%}{% trans ":"%}</label>
+<span class='value'>{{base_find.comment}}</span></p>
+{% endif%}
+{% if base_find.special_interest %}
+<p><label>{%trans "Special interest"%}{% trans ":"%}</label>
+<span class='value'>{{base_find.special_interest}}</span></p>
+{% endif%}
+
 <p><label>{%trans "Related context record"%}{% trans ":"%}</label>
 <span class='value'><a href="#" onclick='load_window("{% url show-contextrecord base_find.context_record.pk ''%}");'>{{ base_find.context_record }}</a></span></p>
 <p><label>{%trans "Related parcel"%}{% trans ":"%}</label>