Merge branch 'master' into v0.9

3 files changed, 58 insertions, 1 deletions

diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index c31fc93b4..eb31392e4 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -26,4 +26,48 @@
 {% dynamic_table_document '' 'containers' 'responsible' item.pk 'TABLE_COLS' output %}
 {% endif %}
 
+<h3>{% trans "Statistics" %}</h3>
+<small class="centered"><em>{% trans "These numbers are updated hourly" %}</em></small>
+
+<h4>{% trans "Finds" %}</h4>
+<ul class='form-flex'>
+    {% field_li "Number of attached finds" item.number_of_finds %}
+    {% field_li "Number of hosted finds" item.number_of_finds_hosted %}
+</ul>
+
+{% if item.number_of_finds_by_place %}
+<h4>{% trans "Finds by location in the warehouse" %}</h4>
+<ul class='form-flex'>
+    {% for items in item.number_of_finds_by_place %}
+    <li>
+        <table class='clean-table small'>
+            {% for item in items %}
+                <tr><th>{{item.0}}</th><td>{{item.1}}</td></tr>
+            {% endfor %}
+        </table>
+    </li>
+    {% endfor %}
+</ul>
+{% endif %}
+
+<h4>{% trans "Containers" %}</h4>
+<ul class='form-flex'>
+    {% field_li "Number of containers" item.number_of_containers %}
+</ul>
+
+{% if item.number_of_containers_by_place %}
+<h4>{% trans "Containers by location in the warehouse" %}</h4>
+<ul class='form-flex'>
+    {% for items in item.number_of_containers_by_place %}
+    <li>
+        <table class='clean-table small'>
+            {% for item in items %}
+            <tr><th>{{item.0}}</th><td>{{item.1}}</td></tr>
+            {% endfor %}
+        </table>
+    </li>
+    {% endfor %}
+</ul>
+{% endif %}
+
 {% endblock %}
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
index 2e817ff41..41be02748 100644
--- a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
@@ -3,7 +3,9 @@
 {% load url from future %}
 {% block form_head %}
 {% if not wizard.form.fields %}
-<p class='warning'>{% trans "No division set for this warehouse. Define at least one division to localise containers in this warehouse." %}<br/>
+<p class="alert">
+    <i class="fa fa-exclamation-triangle"></i>
+    {% trans "No division set for this warehouse. Define at least one division to localise containers in this warehouse." %}<br/>
     {{wizard.form.warehouse}}
     <a href="{% url 'warehouse_modify' wizard.form.warehouse.pk  %}">
         <span class="fa-stack fa-lg">
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
new file mode 100644
index 000000000..83dbfc0fe
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
@@ -0,0 +1,11 @@
+{% extends "ishtar/wizard/default_wizard.html" %}
+{% load i18n %}
+{% load url from future %}
+{% block form_head %}
+{% if wizard.form.readonly %}
+<p class="alert">
+    <i class="fa fa-exclamation-triangle"></i>
+    {% trans "Containers with localisation are associated to this warehouse. You cannot change divisions." %}<br/>
+</p>
+{% endif %}
+{% endblock %}