Manage reference containers - manage loan and loan return

2 files changed, 23 insertions, 7 deletions

diff --git a/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html b/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html
index ef3906735..f20f0cb65 100644
--- a/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html
+++ b/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html
@@ -27,20 +27,26 @@
     </div>
 
     <div class="form-row">
+        {{ form.reference_container }}&nbsp;<label for="{{form.reference_container.auto_id}}">
+        {% trans "Change the reference container" %}
+    </label>
+    </div>
+
+    <div class="form-row">
         {{ form.create_treatment }}&nbsp;<label for="{{form.create_treatment.auto_id}}">
             {% trans "Associate a treatment" %}
         </label>
     </div>
     <div id="new-treatment">
-        {% for field in form %}
-        {% if field.name != 'container' and field.name != 'create_treatment' %}
-        {% if forloop.counter0|divisibleby:2 %}
+        {% with force_large_col=True %}{% for field in form %}
+        {% if field.name != 'reference_container' and field.name != 'container' and field.name != 'create_treatment' %}
+        {% if forloop.counter|divisibleby:2 %}
         <div class="form-row">{% endif %}
             {% include "blocks/bs_field_snippet.html" %}
         {% if not forloop.counter0|divisibleby:2 %}
         </div>{% endif %}
         {% endif %}
-        {% endfor %}
+        {% endfor %}{% endwith %}
     </div>
 {% endblock %}
 
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 4d6fe568c..1aa5220bf 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -39,7 +39,7 @@
         </a>
     </li>
     {% endif %}
-    {% if item.container or item.upstream_treatment or item.downstream_treatment or item.treatments.count %}
+    {% if item.container or item.container_ref or item.upstream_treatment or item.downstream_treatment or item.treatments.count %}
     <li class="nav-item">
         <a class="nav-link" id="{{window_id}}-warehouse-tab"
            data-toggle="tab" href="#{{window_id}}-warehouse" role="tab"
@@ -228,8 +228,18 @@
   </div>
   <div class="tab-pane fade" id="{{window_id}}-warehouse"
        role="tabpanel" aria-labelledby="{{window_id}}-warehouse-tab">
-      {% if item.container %}
-      <h3>{% trans "Warehouse"%}</h3>
+      {% if item.container_ref %}
+      <h3>{% trans "Warehouse - reference container"%}</h3>
+      <div class='row'>
+          {% field_flex_detail "Container" item.container_ref %}
+          {% field_flex "Container ID" item.container_ref.cached_location %}
+          {% field_flex_detail "Responsible warehouse" item.container_ref.responsible %}
+          {% field_flex_detail "Location (warehouse)" item.container_ref.location %}
+          {% field_flex "Precise localisation" item.container_ref.cached_division %}
+      </div>
+      {% endif %}
+      {% if item.container and item.container_ref.pk != item.container.pk %}
+      <h3>{% trans "Warehouse - current container"%}</h3>
       <div class='row'>
           {% field_flex_detail "Container" item.container %}
           {% field_flex "Container ID" item.container.cached_location %}