From ee52553baad7d5b28a44e55a79104bbcf71e5ed1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 22 Aug 2018 14:34:52 +0200 Subject: Warehouse sheet: better display of stats tables --- .../templates/ishtar/sheet_warehouse.html | 42 +++++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) (limited to 'archaeological_warehouse/templates') diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 61553b839..b3446c15a 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -62,13 +62,22 @@ {% if item.number_of_finds_by_place %}

{% trans "Finds by location in the warehouse" %}

{% for items in item.number_of_finds_by_place %} - +
+ + {% for location_type in item.location_types %} + {% endfor %} + + + + {% for item in items %} - + {% for local in item.0 %}{% endfor %} {% endfor %} +
{{location_type|title}}{% trans "Total" %}
{{item.0}}{{local}}{{item.1}}
{% endfor %} {% endif %} @@ -82,15 +91,38 @@ {% if item.number_of_containers_by_place %}

{% trans "Containers by location in the warehouse" %}

{% for items in item.number_of_containers_by_place %} - +
+ + {% for location_type in item.location_types %} + {% endfor %} + + + + {% for item in items %} - - + {% for local in item.0 %}{% endfor %} + {% endfor %} +
{{location_type|title}}{% trans "Total" %}
{{item.0}}{{item.1}}{{local}}{{item.1}}
{% endfor %} {% endif %} + + {% endblock %} -- cgit v1.2.3