✨ adapt sheet to manage sheet filters

3 files changed, 15 insertions, 5 deletions

diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
index 1044a3dad..f344a1fb6 100644
--- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html
+++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
@@ -85,10 +85,12 @@
     {% endif %}
 
 {% if not is_external %}
+{% if item.history_creator or item.last_edition_date or item.created %}
 <h3>{% trans "Sheet"%}</h3>
 <div class="row">
     {% include "ishtar/blocks/sheet_creation_section.html" %}
 </div>
 {% endif %}
+{% endif %}
 
 {% endblock %}
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index be490ba28..8613d2da6 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -147,6 +147,7 @@
                 </div>
                 <div class="row p-0 m-0">
                     {% if item.year %}<span class="col-4"><strong>{% trans "Year" %}</strong></span><span class="col-8">{{ item.year|unlocalize }}</span>{% endif %}
+                    {% if next or item.cached_towns_label %}
                     <span class="col-4"><strong>{% trans "Towns" %}</strong></span><span class="col-8">
                         {% if next %}
                         {{ item|m2m_listing:'towns'|join:" ; "|default:''  }}
@@ -154,6 +155,7 @@
                         {{ item.cached_towns_label }}
                         {% endif %}
                     </span>
+                    {% endif %}
                     {% if item.common_name %}<span class="col-4"><strong>{% trans "Name" %}</strong></span><span class="col-8">{{ item.common_name }}</span>{% endif %}
                     {% if item.address %}<span class="col-4"><strong>{% trans "Address / Locality" %}</strong></span><span class="col-8">{{ item.address }}</span>{% endif %}
                 </div>
@@ -174,6 +176,7 @@
                 {% field_flex_2 date_label dates %}
                 {% endwith %}{% endwith %}{% endwith %}
                 {% endif %}{% endif %}
+                {% if item.is_active != None %}
                 <dl class="col-12 col-md-6 col-lg-3 flex-wrap">
                     <dt>
                         {% trans "State" %}
@@ -187,7 +190,7 @@
                         {% trans "Closed operation" %}
                         {% endif %}
                     </dd>
-                </dl>
+                </dl>{% endif %}
                 {% field_flex_2 "Code DRASSM" item.drassm_code %}
                 {% field_flex_2 "Old code" item.old_code %}
 
@@ -297,7 +300,7 @@
         </div>
         {% endif %}
 
-        {% if not item.code_patriarche %}
+        {% if item.code_patriarche == "" %}
         <div class="alert alert-warning" role="alert">
             <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> &nbsp;
             {% trans "Patriarche OA code not yet recorded!"%}
@@ -328,7 +331,7 @@
             {% field_flex_detail "Writer of the minutes" item.minutes_writer %}
         </div>
         {% endif %}
-
+        {% if item.geodata_list or item.towns or item.address or item.associated_file.address or item.associated_file.address_complement or item.associated_file.postal_code %}
         <h3>{% trans "Geographic localisation" %}</h3>
 
         <div class="row">
@@ -339,7 +342,7 @@
         <div class="row">
             {% if next %}
             {% field_flex "Towns" item|m2m_listing:'towns'|join:" ; "  %}
-            {% else %}
+            {% elif item.towns %}
             {% field_flex_detail_multiple_full "Towns" item.towns %}
             {% endif %}
             {% field_flex "Address" item.address %}
@@ -349,12 +352,15 @@
             {% field_flex "Postal code" item.associated_file.postal_code %}
             {% endif %}
         </div>
+        {% endif %}
         {% if not is_external %}
+        {% if item.history_creator or item.last_edition_date or item.created %}
         <h3>{% trans "Sheet"%}</h3>
         <div class="row">
             {% include "ishtar/blocks/sheet_creation_section.html" %}
         </div>
         {% endif %}
+        {% endif %}
 
     </div>
 
@@ -649,4 +655,4 @@ $(document).ready( function () {
 
 {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html
index f87888655..c3154fdf5 100644
--- a/archaeological_operations/templates/ishtar/sheet_site.html
+++ b/archaeological_operations/templates/ishtar/sheet_site.html
@@ -118,11 +118,13 @@
 {% endif %}
 
 {% if not is_external %}
+{% if item.history_creator or item.last_edition_date or item.created %}
 <h3>{% trans "Sheet"%}</h3>
 <div class="row">
     {% include "ishtar/blocks/sheet_creation_section.html" %}
 </div>
 {% endif %}
+{% endif %}
 
 {% endwith %} {% endwith %} {% endwith %}
 {% endblock %}