Sheet: complete identifier

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 @@
             <div class="card float-left col-12 col-md-6 col-lg-4">
                 {% include "ishtar/blocks/window_image.html" %}
                 <div class="card-body">
-                    <p class="card-text">
+                    {% if item.complete_identifier %}<p class="window-refs"
+                            title="{% trans 'Complete identifier' %}">
+                    <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
                     <p class='window-refs'>{{ item.parcel.short_label }}</p>
                     <p class="window-refs">{{ item.label|default:"" }}</p>
                     {% 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" %}
       <div class="card-body">
         <div class="card-text">
+            {% if item.complete_identifier %}<p class="window-refs"
+                    title="{% trans 'Complete identifier' %}">
+            <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
             <p class='window-refs'>{{item.full_internal_ref|default:''}}</p>
             <p class='window-refs'>{{item.internal_reference|default:''}}</p>
             <p class='window-refs'>{{item.name|default:''}}</p>
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 @@
                   <a class="nav-link{% if forloop.first %} active{% endif %}"
                      data-toggle="tab" href="#{{window_id}}-base-find-{{forloop.counter}}"
                      role="tab">
-                      {{base_find.short_id}}
+                      {% if base_find.complete_identifier %}{{ base_find.complete_identifier }}{% else %}{{base_find.short_id}}{% endif %}
                   </a>
               </li>
               {% endfor %}
@@ -126,6 +126,9 @@
 
       <div class='text-center'>
           {% include "ishtar/blocks/sheet_external_id.html" %}
+          {% if item.complete_identifier %}<p class="window-refs"
+              title="{% trans 'Complete identifier' %}">
+          <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
       </div>
 
       <div class='row'>
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 @@
                 <div class="card">
                     {% include "ishtar/blocks/window_image.html" %}
                     <div class="card-body">
-                        <p class="card-text">
+                        <div class="card-text">
                             <p class="window-refs">{{ item.label|default:"" }}</p>
                             {% if item.other_reference %}
                             <p class="window-refs">{{ item.other_reference }}</p>{% endif %}
@@ -64,7 +64,7 @@
                             {% else %}
                             <p class="window-refs">{% trans "Active" context "Treatment" %}</p>
                             {% endif %}
-                            </p>
+                        </div>
                     </div>
                 </div>
             </div>
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 @@
     <div class="offset-lg-4 col-lg-4 offset-md-3 col-md-6 offset-sm-1 col-sm-10 col-12">
         <div class="card">
             <div class="card-body">
-                <p class="card-text">
+                <div class="card-text">
                     <p class="window-refs">{{ item.name|default:"" }}</p>
                     {% if item.internal_reference %}
                     <p class="window-refs">{{ item.internal_reference }}</p>{% endif %}
@@ -25,7 +25,7 @@
                     {% else %}
                     <p class="window-refs">{% trans "Active" context "Treatment request" %}</p>
                     {% endif %}
-                </p>
+                </div>
             </div>
         </div>
     </div>
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 %}<br>
                             {% if item.code_patriarche %}OA{{item.code_patriarche}}{% endif %}
+                            {% if item.complete_identifier %}<p class="window-refs"
+                                    title="{% trans 'Complete identifier' %}">
+                            <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
                         </div>
                         <div class="col text-muted">
                             {% 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 @@
                 <div class="col main">
                     {{item.reference}}
                     {{item.name|default:''}}
+                    {% if item.complete_identifier %}<p class="window-refs"
+                        title="{% trans 'Complete identifier' %}">
+                        <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
                 </div>
                 <div class="col text-muted">
                     {% 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 %}
             <div class="float-left col-6 col-md-3 text-center">
             {% endif %}
+                {% if item.complete_identifier %}<p class="window-refs"
+                            title="{% trans 'Complete identifier' %}">
+                <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
                 <p class="window-refs">{{ item.container_type|default:"" }} {{ item.reference|default:"" }}</p>
                 <p class="window-refs">{{ item.location.name }} - {{ item.index }}</p>
                 {% 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 @@
                         <p class="window-refs">
                             <strong>{{ item.name|default:"" }}</strong>
                         </p>
+                        {% if item.complete_identifier %}<p class="window-refs"
+                                    title="{% trans 'Complete identifier' %}">
+                        <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
                         <p class="window-refs">
                             {{ item.warehouse_type|default:"" }}
                         </p>
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 @@
         <div class="col-12 col-md-6 col-lg-3 flex-wrap">
             {% if item.complete_identifier %}<p class="window-refs"
                        title="{% trans 'Complete identifier' %}">
-            <strong>{{ item.complete_identifier|default:"" }}</strong></p>{% endif %}
+            <strong>{{ item.complete_identifier }}</strong></p>{% endif %}
             <p class="window-refs"
                 title="{% trans 'Reference' %}">{{ item.reference|default:"" }}</p>
             <p class="window-refs"