✨ find container history: manage first packaging info

1 files changed, 20 insertions, 10 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 465e2e1d5..371888317 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -360,7 +360,7 @@
               <dl class="col-12 flex-wrap">
                   <dt>{% trans "Index" %}</dt>
                   <dd>
-                    {{ item.container.location }} - {{ item.container.index }}
+                    {{ item.container.location }} - {{ item.container.index|unlocalize }}
                   </dd>
               </dl>
           </div>
@@ -387,8 +387,7 @@
               <th>{% trans "Related finds (max. 15 displayed)" %}</th>
               <th>{% trans "Doer" %}</th>
               {% if can_view_container %}<th>{% trans "Container" %}</th>{% endif %}
-              <th>{% trans "Start date" %}</th>
-              <th>{% trans "End date" %}</th>
+              <th>{% trans "Date start/end" %}</th>
           </tr>
           {# {% for treatment in item.treatments.all %} #}
           {% for items, treatment in item.non_modif_treatments %}
@@ -404,11 +403,22 @@
               <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td>
               <td class='item-list'>{% for it in items %}<span>{{it}} {{it|link_to_window:request}}</span>{% endfor %}</td>
               <td class='string'>{{ treatment.person|default_if_none:"-" }}</td>
-              {% if can_view_container %}<td class='string'>{% for find_treatment in treatment.get_find_treatment_list %}{% if find_treatment.find.pk == item.pk %}{{ find_treatment.full_location|default_if_none:"-" }}{% endif %}{% endfor %}</td>{% endif %}
-              <td class='string'>{{ treatment.start_date|default_if_none:"-" }}</td>
-              <td class='string'>{{ treatment.end_date|default_if_none:"-" }}</td>
+              {% if can_view_container %}<td class='string'>{% for find_treatment in treatment.get_find_treatment_list %}{% if find_treatment.find.pk == item.pk %}{{ find_treatment.full_location|default_if_none:"-" }} <span class="badge badge-secondary">{{find_treatment.location_type_label}}</span>{% endif %}{% endfor %}</td>{% endif %}
+              <td class='string'>{{ treatment.start_date|default_if_none:"-" }}{% if treatment.end_date %}/{{ treatment.end_date|default_if_none:"-" }}{% endif %}</td>
           </tr>
           {% endfor %}
+          {% if can_view_container and item.container_fisrt_full_location %}
+          <tr>
+              <td class="string" colspan="6">{% trans "First packaging" %}</td>
+              <td class="string" colspan="2">{{ item.container_fisrt_full_location }} <span class="badge badge-secondary">{% if item.container_fisrt_full_location == item.container_ref_fisrt_full_location %}{% trans "Reference/current" %}{% else %}{% trans "Current" %}{% endif %}</span></td>
+          </tr>
+          {% endif %}
+          {% if can_view_container and item.container_ref_fisrt_full_location and item.container_ref_fisrt_full_location != item.container_fisrt_full_location %}
+          <tr>
+              <td class="string" colspan="6">{% trans "First packaging" %}</td>
+              <td class="string" colspan="2">{{ item.container_ref_fisrt_full_location }} <span class="badge badge-secondary">{% trans "Reference" %}</span></td>
+          </tr>
+          {% endif %}
       </table>
       {% endif %}
 
@@ -423,7 +433,7 @@
               <th>{% trans "State" %}</th>
               <th>{% trans "Related finds (max. 15 displayed)" %}</th>
               <th>{% trans "Doer" %}</th>
-              <th>{% trans "Container" %}</th>
+              {% if can_view_container %}<th>{% trans "Container" %}</th>{% endif %}
               <th>{% trans "Start date" %}</th>
               <th>{% trans "End date" %}</th>
           </tr>
@@ -441,7 +451,7 @@
               <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td>
               <td class='item-list'>{% for it in items %}<span>{{it}} {{it|link_to_window:request}}</span>{% endfor %}</td>
               <td class='string'>{{ treatment.person|default_if_none:"-" }}</td>
-              <td class='string'>{{ treatment.container|default_if_none:"-" }}</td>
+              {% if can_view_container %}<td class='string'>{{ treatment.container|default_if_none:"-" }}</td>{% endif %}
               <td class='string'>{{ treatment.start_date|default_if_none:"-" }}</td>
               <td class='string'>{{ treatment.end_date|default_if_none:"-" }}</td>
           </tr>
@@ -461,7 +471,7 @@
               <th>{% trans "State" %}</th>
               <th>{% trans "Related finds (max. 15 displayed)" %}</th>
               <th>{% trans "Doer" %}</th>
-              <th>{% trans "Container" %}</th>
+              {% if can_view_container %}<th>{% trans "Container" %}</th>{% endif %}
               <th>{% trans "Start date" %}</th>
               <th>{% trans "End date" %}</th>
           </tr>
@@ -479,7 +489,7 @@
               <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td>
               <td class='item-list'>{% for it in items %}<span>{{it}} {{ it|link_to_window:request}}</span>{% endfor %}</td>
               <td class='string'>{{ treatment.person|default_if_none:"" }}</td>
-              <td class='string'>{{ treatment.container|default_if_none:"-" }}</td>
+              {% if can_view_container %}<td class='string'>{{ treatment.container|default_if_none:"-" }}</td>{% endif %}
               <td class='string'>{{ treatment.start_date|default_if_none:"" }}</td>
               <td class='string'>{{ treatment.end_date|default_if_none:"" }}</td>
           </tr>