From 7014a6989dfa21c5f7c4604a0e9c79a3bf355820 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 2 Dec 2020 12:12:02 +0100 Subject: Sheet: complete identifier --- .../templates/ishtar/sheet_contextrecord.html | 4 +++- archaeological_files/templates/ishtar/sheet_file.html | 3 +++ archaeological_finds/templates/ishtar/sheet_find.html | 5 ++++- archaeological_finds/templates/ishtar/sheet_treatment.html | 4 ++-- archaeological_finds/templates/ishtar/sheet_treatmentfile.html | 4 ++-- archaeological_operations/templates/ishtar/sheet_operation.html | 3 +++ archaeological_operations/templates/ishtar/sheet_site.html | 3 +++ archaeological_warehouse/templates/ishtar/sheet_container.html | 3 +++ archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 3 +++ ishtar_common/templates/ishtar/sheet_document.html | 2 +- 10 files changed, 27 insertions(+), 7 deletions(-) diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index bcfb8db97..e6097db42 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -108,7 +108,9 @@
{% include "ishtar/blocks/window_image.html" %}
-

+ {% if item.complete_identifier %}

+ {{ item.complete_identifier }}

{% endif %}

{{ item.parcel.short_label }}

{{ item.label|default:"" }}

{% include "ishtar/blocks/sheet_external_id.html" %} diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 58a8e5a78..955dbc32a 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -23,6 +23,9 @@ {% include "ishtar/blocks/window_image.html" %}
+ {% if item.complete_identifier %}

+ {{ item.complete_identifier }}

{% endif %}

{{item.full_internal_ref|default:''}}

{{item.internal_reference|default:''}}

{{item.name|default:''}}

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 50a21402b..163946fae 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -101,7 +101,7 @@ - {{base_find.short_id}} + {% if base_find.complete_identifier %}{{ base_find.complete_identifier }}{% else %}{{base_find.short_id}}{% endif %} {% endfor %} @@ -126,6 +126,9 @@
{% include "ishtar/blocks/sheet_external_id.html" %} + {% if item.complete_identifier %}

+ {{ item.complete_identifier }}

{% endif %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html index e6bd83aab..c82ba53f5 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatment.html +++ b/archaeological_finds/templates/ishtar/sheet_treatment.html @@ -52,7 +52,7 @@
{% include "ishtar/blocks/window_image.html" %}
-

+

{{ item.label|default:"" }}

{% if item.other_reference %}

{{ item.other_reference }}

{% endif %} @@ -64,7 +64,7 @@ {% else %}

{% trans "Active" context "Treatment" %}

{% endif %} -

+
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html index 32b79a9fe..0c036978f 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html @@ -13,7 +13,7 @@
-

+

{{ item.name|default:"" }}

{% if item.internal_reference %}

{{ item.internal_reference }}

{% endif %} @@ -25,7 +25,7 @@ {% else %}

{% trans "Active" context "Treatment request" %}

{% endif %} -

+
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 868040666..647fbb792 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -118,6 +118,9 @@ {% if item.year or item.operation_code %} {{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}
{% if item.code_patriarche %}OA{{item.code_patriarche}}{% endif %} + {% if item.complete_identifier %}

+ {{ item.complete_identifier }}

{% endif %}
{% include "ishtar/blocks/sheet_external_id.html" %} diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html index a69d61a13..a7955572d 100644 --- a/archaeological_operations/templates/ishtar/sheet_site.html +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -18,6 +18,9 @@
{{item.reference}} {{item.name|default:''}} + {% if item.complete_identifier %}

+ {{ item.complete_identifier }}

{% endif %}
{% include "ishtar/blocks/sheet_external_id.html" %} diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index 4ea1d36c5..6357c8be4 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -65,6 +65,9 @@ {% else %}
{% endif %} + {% if item.complete_identifier %}

+ {{ item.complete_identifier }}

{% endif %}

{{ item.container_type|default:"" }} {{ item.reference|default:"" }}

{{ item.location.name }} - {{ item.index }}

{% include "ishtar/blocks/sheet_external_id.html" %} diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 65be64648..0adf3c1b8 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -59,6 +59,9 @@

{{ item.name|default:"" }}

+ {% if item.complete_identifier %}

+ {{ item.complete_identifier }}

{% endif %}

{{ item.warehouse_type|default:"" }}

diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 0497e7f5a..08af1e928 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -35,7 +35,7 @@
{% if item.complete_identifier %}

- {{ item.complete_identifier|default:"" }}

{% endif %} + {{ item.complete_identifier }}

{% endif %}

{{ item.reference|default:"" }}