diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-01-15 19:51:13 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-01-15 19:51:13 +0100 |
| commit | da134bb54a9a197ebf37f67f48dc88e15088a25b (patch) | |
| tree | 1a56c573f48ffbae64a92ace27b9ca55ee63c2e2 /archaeological_operations/templates | |
| parent | 529c871277bb5dfee6b411ae8688fbc240ffb63e (diff) | |
| download | Ishtar-da134bb54a9a197ebf37f67f48dc88e15088a25b.tar.bz2 Ishtar-da134bb54a9a197ebf37f67f48dc88e15088a25b.zip | |
Operation - sites: settings for M2M history
Diffstat (limited to 'archaeological_operations/templates')
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 13 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_site.html | 15 |
2 files changed, 23 insertions, 5 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 8801855cd..f13a21336 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -96,8 +96,8 @@ </div> </div> <div class="row"> - {% field_flex_multiple "Remains" item.remains %} - {% field_flex_multiple "Periods" item.periods %} + {% field_flex_multiple_obj "Remains" item 'remains' %} + {% field_flex_multiple_obj "Periods" item 'periods' %} {% field_flex "Record quality" item.record_quality_type %} {% field_flex "Report delivery date" item.report_delivery_date %} {% field_flex "Report processing" item.report_processing %} @@ -155,7 +155,14 @@ </div> {% endif %} -{% if not next %} +{% if next %} +{% if item|m2m_listing:'towns' %} +<h3>{% trans "Localisation"%}</h3> +<div class="row"> + {% field_flex_full "Towns" item|m2m_listing:'towns'|join:" ; " %} +</div> +{% endif %} +{% else %} {% if item.towns.count %} <h3>{% trans "Localisation"%}</h3> <div class="row"> diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html index 0108d3db6..14c30bd38 100644 --- a/archaeological_operations/templates/ishtar/sheet_site.html +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -34,12 +34,22 @@ <div class="row"> {% include "ishtar/blocks/sheet_creation_section.html" %} - {% field_flex_multiple "Periods" item.periods %} - {% field_flex_multiple "Remains" item.remains %} + {% field_flex_multiple_obj "Periods" item 'periods' %} + {% field_flex_multiple_obj "Remains" item 'remains' %} {% field_flex_multiple "Collaborators" item.collaborators %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} </div> +{% if next %} +{% if item|m2m_listing:'towns' or item.locality_ngi or item.locality_cadastral %} +<h3>{% trans "Localisation"%}</h3> +<div class="row"> + {% field_flex_full "Towns" item|m2m_listing:'towns'|join:" ; " %} + {% field_flex_full "National Geographic Institute locality" item.locality_ngi "<pre>" "</pre>" %} + {% field_flex_full "Cadastral locality" item.locality_cadastral "<pre>" "</pre>" %} +</div> +{% endif %} +{% else %} {% if item.towns.count or item.locality_ngi or item.locality_cadastral %} <h3>{% trans "Localisation"%}</h3> <div class="row"> @@ -48,6 +58,7 @@ {% field_flex_full "Cadastral locality" item.locality_cadastral "<pre>" "</pre>" %} </div> {% endif %} +{% endif %} {% if item.affmar_number or item.drassm_number or item.oceanographic_service_localisation or item.shipwreck_code or item.sinking_date or item.discovery_area or item.shipwreck_name %} <h3>{% trans "Underwater"%}</h3> |