From e95afd17d217d41e91f7510ed0a9b2fd273b9fa5 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 18 Oct 2017 12:58:54 +0200
Subject: Json fields: adapt main sheets to display dynamic json fields (refs
 #3077)

---
 .../templates/ishtar/sheet_contextrecord.html                           | 2 ++
 archaeological_files/templates/ishtar/sheet_file.html                   | 2 ++
 archaeological_finds/templates/ishtar/sheet_find.html                   | 2 ++
 archaeological_finds/templates/ishtar/sheet_treatment.html              | 2 ++
 archaeological_finds/templates/ishtar/sheet_treatmentfile.html          | 2 ++
 archaeological_warehouse/templates/ishtar/sheet_container.html          | 2 ++
 archaeological_warehouse/templates/ishtar/sheet_warehouse.html          | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 170c2d87c..e1ea9019b 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -29,6 +29,8 @@
 </ul>
 {% field "Comment on datings" item.datings_comment "<pre>" "</pre>" %}
 
+{% include "ishtar/blocks/sheet_json.html" %}
+
 {% if item.diameter or item.depth_of_appearance or item.documentations.count or item.description or item.lenght or item.width or item.depth or item.thickness or item.comment %}
 <h3>{% trans "Description"%}</h3>
 {% field "Description" item.description "<pre>" "</pre>" %}
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 6d64a975f..6eda1124a 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -44,6 +44,8 @@
 </ul>
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 
+{% include "ishtar/blocks/sheet_json.html" %}
+
 <h3>{% trans "Localisation"%}</h3>
 {% if item.towns.count %}<p><label>{%trans "Towns"%}</label> <span class='value'>{{ item.towns.all|join:", " }}</span></p>{% endif %}
 {% if item.departments.count %}<p><label>{%trans "Departments"%}</label> <span class='value'>{{ item.departments.all|join:", " }}</span></p>{% endif %}
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index efd38e406..68304740d 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -58,6 +58,8 @@
 {% field "Description" item.description "<pre>" "</pre>" %}
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 
+{% include "ishtar/blocks/sheet_json.html" %}
+
 {% if item.conservatory_state or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.treatment_emergency or item.insurance_value %}
 <h4>{% trans "Preservation" %}</h4>
 <ul class='form-flex'>
diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html
index 5fc8f2aac..94f6e20a7 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatment.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatment.html
@@ -42,6 +42,8 @@
 {% field "Goal" item.goal "<pre>" "</pre>" %}
 {% endif %}
 
+{% include "ishtar/blocks/sheet_json.html" %}
+
 {% trans "Upstream finds" as finds %}
 {% if item.upstream.count %}
 {% dynamic_table_document finds 'finds_for_treatment' 'downstream_treatment' item.pk 'TABLE_COLS_FOR_OPE' output %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
index f8fb3e0aa..9567d3081 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html
@@ -26,6 +26,8 @@
 </ul>
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 
+{% include "ishtar/blocks/sheet_json.html" %}
+
 {% if item.applicant %}
 <h3>{% trans "Applicant" %}</h3>
 <ul class='form-flex'>
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 7845da2c1..7c9f84a32 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -23,6 +23,8 @@
 {% field "Location" item.precise_location %}
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 
+{% include "ishtar/blocks/sheet_json.html" %}
+
 {% if item.finds.count %}
 <h4>{% trans "Content" %}</h4>
 {% dynamic_table_document finds 'finds' 'container' item.pk 'TABLE_COLS' output 'large' %}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index 3d39f9845..de93f9af3 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -17,6 +17,8 @@
 {% include "ishtar/blocks/sheet_address_section.html" %}
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 
+{% include "ishtar/blocks/sheet_json.html" %}
+
 {% if item.containers.count %}
 <h4>{% trans "Containers" %}</h4>
 {% dynamic_table_document '' 'containers' 'location' item.pk 'TABLE_COLS' output %}
-- 
cgit v1.2.3