Improve find sheet / search

2 files changed, 65 insertions, 28 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 58adb1de8..be4465537 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -942,7 +942,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
     form_admin_name = _("Find - 001 - Search")
     form_slug = "find-001-search"
     FORM_FILTERS = [
-        (_(u"Find origin"), [
+        (_("Find origin"), [
             "base_finds__cache_short_id",
             "base_finds__cache_complete_id",
             "base_finds__context_record__town",
@@ -957,7 +957,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
             "ope_relation_types",
             "cr_relation_types",
         ]),
-        (_(u"Discovery date"), [
+        (_("Discovery date"), [
             "base_finds__discovery_date__before",
             "base_finds__discovery_date__after",
             "base_finds__discovery_date_tpq__before",
@@ -965,7 +965,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
             "base_finds__discovery_date_taq__before",
             "base_finds__discovery_date_taq__after"
         ]),
-        (_(u"Dimensions"), [
+        (_("Dimensions"), [
             "length__higher", "width__higher", "height__higher",
             "thickness__higher", "diameter__higher", "circumference__higher",
             "volume__higher", "weight__higher", "clutter_long_side__higher",
@@ -976,7 +976,7 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
             "clutter_short_side__lower", "clutter_height__lower",
             "dimensions_comment",
         ]),
-        (_(u"Preservation"), (
+        (_("Preservation"), (
             "integrities", "remarkabilities", "conservatory_state",
             "conservatory_comment",
             "alterations", "alteration_causes", "preservation_to_considers",
@@ -1273,51 +1273,51 @@ class FindSelectWarehouseModule(FindSelect):
     #        reverse_lazy('autocomplete-warehouse'),
     #        associated_model=Warehouse),
     #    validators=[valid_id(Warehouse)])
-    container = forms.IntegerField(
-        label=_("Current container"),
+    container_ref = forms.IntegerField(
+        label=_("Reference container"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-container'),
             associated_model=Container),
         validators=[valid_id(Container)])
-    container__location = forms.IntegerField(
-        label=_("Current container - Warehouse (location)"),
+    container_ref__location = forms.IntegerField(
+        label=_("Reference container - Warehouse (location)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
     """
-    container__responsible = forms.IntegerField(
-        label=_(u"Current container - Warehouse (responsible)"),
+    container_ref__responsible = forms.IntegerField(
+        label=_("Reference container - Warehouse (responsible)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
-    container__index = forms.IntegerField(label=_(u"Current container ID"))
-    container__reference = forms.CharField(label=_(u"Current container ref."))
+    container_ref__index = forms.IntegerField(
+        label=_(u"Reference container ID"))
+    container_ref__reference = forms.CharField(
+        label=_(u"Reference container ref."))
     """
-    container_ref = forms.IntegerField(
-        label=_("Reference container"),
+    container = forms.IntegerField(
+        label=_("Current container"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-container'),
             associated_model=Container),
         validators=[valid_id(Container)])
-    container_ref__location = forms.IntegerField(
-        label=_("Reference container - Warehouse (location)"),
+    container__location = forms.IntegerField(
+        label=_("Current container - Warehouse (location)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
     """
-    container_ref__responsible = forms.IntegerField(
-        label=_("Reference container - Warehouse (responsible)"),
+    container__responsible = forms.IntegerField(
+        label=_(u"Current container - Warehouse (responsible)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
-    container_ref__index = forms.IntegerField(
-        label=_(u"Reference container ID"))
-    container_ref__reference = forms.CharField(
-        label=_(u"Reference container ref."))
+    container__index = forms.IntegerField(label=_(u"Current container ID"))
+    container__reference = forms.CharField(label=_(u"Current container ref."))
     """
 
 
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 2a1cf595a..44a463fe9 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -266,12 +266,49 @@
       {% if item.container or item.container_ref %}
       <h3>{% trans "Warehouse - container" %}</h3>
       <div class='row'>
-          {% field_flex_detail "Container" item.container "large" %}
-          {% field_flex_detail "Reference container" item.container_ref "large" %}
-          {% field_flex "Container ID" item.container.cached_location %}
-          {% field_flex_detail "Responsible warehouse" item.container.responsible %}
-          {% field_flex_detail "Location (warehouse)" item.container.location %}
-          {% field_flex "Precise localisation" item.container.cached_division %}
+          {% if item.container_ref != item.container and item.container_ref %}
+          <dl class="col-12 flex-wrap">
+              <dt>{% trans "Reference container" %}</dt>
+              <dd>
+                  <nav aria-label="breadcrumb">
+                      <ol class="breadcrumb">
+                          {% for loca in item.container_ref.get_localisations %}
+                          <li class="breadcrumb-item">
+                              {{loca.short_label}}&nbsp;{{loca|simple_link_to_window}}
+                          </li>
+                          {% endfor %}
+                          <li class="breadcrumb-item">
+                              {{item.container_ref.short_label}}&nbsp;{{item.container_ref|simple_link_to_window}}
+                          </li>
+                      </ol>
+                  </nav>
+              </dd>
+          </dl>
+          {% endif %}
+          {% if item.container %}
+          <dl class="col-12 flex-wrap">
+              <dt>
+                  {% if item.container_ref != item.container %}
+                  {% trans "Current container" %}{% else %}
+                  {% trans "Reference container / current container" %}
+                  {% endif %}
+              </dt>
+              <dd>
+                  <nav aria-label="breadcrumb">
+                      <ol class="breadcrumb">
+                          {% for loca in item.container.get_localisations %}
+                          <li class="breadcrumb-item">
+                              {{loca.short_label}}&nbsp;{{loca|simple_link_to_window}}
+                          </li>
+                          {% endfor %}
+                          <li class="breadcrumb-item">
+                              {{item.container.short_label}}&nbsp;{{item.container|simple_link_to_window}}
+                          </li>
+                      </ol>
+                  </nav>
+              </dd>
+          </dl>
+          {% endif %}
       </div>
       {% endif %}
       {% if item.upstream_treatment or item.downstream_treatment or non_modif_treatments_count %}