From 42cca8f9cf8eecb5df19d39b1e1557dabe83f7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@ens.fr>
Date: Tue, 30 Aug 2016 23:32:54 +0200
Subject: [PATCH] =?UTF-8?q?Page=20d=C3=A9tails=20inventaire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kfet/templates/kfet/inventory.html      |  2 +-
 kfet/templates/kfet/inventory_read.html | 62 +++++++++++++++++++++++++
 kfet/templates/kfet/order.html          | 14 ++++--
 kfet/urls.py                            |  3 ++
 kfet/views.py                           | 13 ++++++
 5 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 kfet/templates/kfet/inventory_read.html

diff --git a/kfet/templates/kfet/inventory.html b/kfet/templates/kfet/inventory.html
index 4f74b31e..5d8a28f4 100644
--- a/kfet/templates/kfet/inventory.html
+++ b/kfet/templates/kfet/inventory.html
@@ -37,7 +37,7 @@
               {% for inventory in inventories %}
                 <tr>
                   <td class="text-center">
-                    <a href="">
+                    <a href="{% url 'kfet.inventory.read' inventory.pk %}">
                       <span class="glyphicon glyphicon-cog"></span>
                     </a>
                   </td>
diff --git a/kfet/templates/kfet/inventory_read.html b/kfet/templates/kfet/inventory_read.html
new file mode 100644
index 00000000..aef6b326
--- /dev/null
+++ b/kfet/templates/kfet/inventory_read.html
@@ -0,0 +1,62 @@
+{% extends 'kfet/base.html' %}
+
+{% block title %}Inventaire #{{ inventory.pk }}{% endblock %}
+{% block content-header-title %}Inventaire #{{ inventory.pk }}{% endblock %}
+
+{% block content %}
+
+<div class="row">
+  <div class="col-sm-4 col-md-3 col-content-left">
+    <div class="content-left">
+      <div class="content-left-top">
+        <div class="line"><b>Date:</b> {{ inventory.at }}</div>
+        <div class="line"><b>Par:</b> {{ inventory.by.trigramme }}</div>
+        {% if inventory.order %}
+          <div class="line">
+            <b>Commande relative:</b>&nbsp;
+            <a href="{% url 'kfet.order.read' inventory.order.pk %}">
+              #{{ inventory.order.pk }}
+            </a>
+          </div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-8 col-md-9 col-content-right">
+    {% include 'kfet/base_messages.html' %}
+    <div class="content-right">
+      <div class="content-right-block">
+        <h2>Détails</h2>
+        <div class="table-responsive">
+          <table class="table table-condensed">
+            <thead>
+              <tr>
+                <td>Article</td>
+                <td>Stock avant</td>
+                <td>Stock après</td>
+                <td>Erreur</td>
+              </tr>
+            </thead>
+            <tbody>
+              {% for inventoryart in inventoryarts %}
+                {% ifchanged inventoryart.article.category %}
+                  <tr class="section">
+                    <td colspan="4">{{ inventoryart.article.category.name }}</td>
+                  </tr>
+                {% endifchanged %}
+                <tr>
+                  <td>{{ inventoryart.article.name }}</td>
+                  <td>{{ inventoryart.stock_old }}</td>
+                  <td>{{ inventoryart.stock_new }}</td>
+                  <td>{{ inventoryart.stock_error }}</td>
+                </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% endblock %}
diff --git a/kfet/templates/kfet/order.html b/kfet/templates/kfet/order.html
index f52e41a1..d1fb0442 100644
--- a/kfet/templates/kfet/order.html
+++ b/kfet/templates/kfet/order.html
@@ -9,6 +9,8 @@
   <div class="col-sm-4 col-md-3 col-content-left">
     <div class="content-left">
       <div class="content-left-top">
+        <div class="line line-big">{{ orders|length }}</div>
+        <div class="line line-bigsub">commande{{ orders|length|pluralize }}</div>
       </div>
       <div class="buttons">
       </div>
@@ -64,15 +66,14 @@
                 <td></td>
                 <td>Date</td>
                 <td>Fournisseur</td>
+                <td>Inventaire</td>
               </tr>
             </thead>
             <tbody>
               {% for order in orders %}
                 <tr>
                   <td class="no-padding">
-                    {% if order.inventory %}
-                      <a href="" class="btn btn-primary">Inventaire</a>
-                    {% else %}
+                    {% if not order.inventory %}
                       <a href="{% url 'kfet.order.to_inventory' order.pk %}" class="btn btn-primary">
                         Générer inventaire
                       </a>
@@ -85,6 +86,13 @@
                   </td>
                   <td>{{ order.at }}</td>
                   <td>{{ order.supplier }}</td>
+                  <td>
+                    {% if order.inventory %}
+                      <a href="{% url 'kfet.inventory.read' order.inventory.pk %}">
+                        #{{ order.inventory.pk }}
+                      </a>
+                    {% endif %}
+                  </td>
                 </tr>
               {% endfor %}
             </tbody>
diff --git a/kfet/urls.py b/kfet/urls.py
index 18718aa0..33a19b57 100644
--- a/kfet/urls.py
+++ b/kfet/urls.py
@@ -171,6 +171,9 @@ urlpatterns = [
         name = 'kfet.inventory'),
     url(r'^inventaires/new$', views.inventory_create,
         name = 'kfet.inventory.create'),
+    url(r'^inventaires/(?P<pk>\d+)$',
+        permission_required('kfet.is_team')(views.InventoryRead.as_view()),
+        name = 'kfet.inventory.read'),
 
     # -----
     # Order urls
diff --git a/kfet/views.py b/kfet/views.py
index de521782..d99d3262 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -1390,6 +1390,19 @@ def inventory_create(request):
         'formset': formset,
     })
 
+class InventoryRead(DetailView):
+    model = Inventory
+    template_name = 'kfet/inventory_read.html'
+    context_object_name = 'inventory'
+
+    def get_context_data(self, **kwargs):
+        context = super(InventoryRead, self).get_context_data(**kwargs)
+        inventoryarticles = (InventoryArticle.objects
+                .select_related('article', 'article__category')
+                .filter(inventory = self.object)
+                .order_by('article__category__name', 'article__name'))
+        context['inventoryarts'] = inventoryarticles
+        return context
 
 # -----
 # Order views