diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-04 16:48:31 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-04 16:48:31 +0200 |
| commit | bec5cecd414d97cb1a5b4a9ba8433efaec3f7ff9 (patch) | |
| tree | 618ee3c01220dbe7b87af97ffb60dcf6456a7a6f | |
| parent | e3e9c9f31dbd629fcd20e6e73a34aded4058e8c6 (diff) | |
| download | Ishtar-bec5cecd414d97cb1a5b4a9ba8433efaec3f7ff9.tar.bz2 Ishtar-bec5cecd414d97cb1a5b4a9ba8433efaec3f7ff9.zip | |
Preservation: adapt sheet find (refs #3639)
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 6187a300f..506dd0bb7 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -43,13 +43,6 @@ {% field_li "Find number" item.find_number %} {% field_li "Minimum number of individuals (MNI)" item.min_number_of_individuals %} -{% field_li "Conservatory state" item.conservatory_state %} -{% if item.conservatory_comment %} -</ul> -{% field "Conservatory comment" item.conservatory_comment "<pre>" "</pre>" %} -<ul class='form-flex'> -{% endif %} -{% field_li_multiple "Type of preservation to consider" item.preservation_to_considers %} {% field_li_multiple "Object types" item.object_types %} {% field_li_multiple "Integrity / interest" item.integrities %} {% field_li_multiple "Remarkability" item.remarkabilities %} @@ -65,6 +58,22 @@ {% field "Description" item.description "<pre>" "</pre>" %} {% field "Comment" item.comment "<pre>" "</pre>" %} +{% 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'> + {% field_li "Conservatory state" item.conservatory_state %} + {% field_li_multiple "Alteration" item.alterations %} + {% field_li_multiple "Alteration cause" item.alteration_causes %} + {% field_li_multiple "Type of preservation to consider" item.preservation_to_considers %} + {% field_li "Treatment emergency" item.treatment_emergency %} + {% field_li "Insurance value" item.insurance_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %} + {% field_li "Appraisal date" item.appraisal_date %} + {% if item.conservatory_comment %} +</ul> + {% field "Conservatory comment" item.conservatory_comment "<pre>" "</pre>" %} + {% endif %} +{% endif %} + {% if item.container %} <h3>{% trans "Warehouse"%}</h3> {% field_detail "Container" item.container %} |