From 8d26381f6de80884598e45ca653f5255da0236c7 Mon Sep 17 00:00:00 2001
From: nanoy <me@nanoy.fr>
Date: Sun, 23 Dec 2018 14:36:29 +0100
Subject: [PATCH] Liste des pintes

---
 gestion/templates/gestion/products_index.html |  4 +--
 gestion/urls.py                               |  4 ++-
 gestion/views.py                              | 25 +++++++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/gestion/templates/gestion/products_index.html b/gestion/templates/gestion/products_index.html
index 5b5543a..7df35e8 100644
--- a/gestion/templates/gestion/products_index.html
+++ b/gestion/templates/gestion/products_index.html
@@ -66,13 +66,13 @@
 	Actions possibles :
 	<ul>
 		{% if perms.gestion.add_pinte %}
-		<li><a href="{% url 'gestion:createPintes' %}">Créer une ou plusieurs pintes</a></li>
+		<li><a href="{% url 'gestion:addPintes' %}">Créer une ou plusieurs pintes</a></li>
 		{% endif %}
 		{% if perms.gestion.change_pinte %}
 		<li><a href="{% url 'gestion:releasePintes' %}">Libérer des pintes</a></li>
 		{% endif %}
 		{% if perms.gestion.view_pinte %}
-		<li><a href="{% url 'gestion:menusList' %}">Lister les pintes</a></li>
+		<li><a href="{% url 'gestion:pintesList' %}">Lister les pintes</a></li>
 		{% endif %}
 	</ul>
 </section>
diff --git a/gestion/urls.py b/gestion/urls.py
index e2bc803..ffce4b8 100644
--- a/gestion/urls.py
+++ b/gestion/urls.py
@@ -33,8 +33,10 @@ urlpatterns = [
     path('cancelConsumption/<int:pk>', views.cancel_consumption, name="cancelConsumption"),
     path('cancelMenu/<int:pk>', views.cancel_menu, name="cancelMenu"),
     path('productProfile/<int:pk>', views.productProfile, name="productProfile"),
-    path('createPintes', views.create_pintes, name="createPintes"),
+    path('addPintes', views.add_pintes, name="addPintes"),
     path('releasePintes', views.release_pintes, name="releasePintes"),
+    path('pintesList', views.pintes_list, name="pintesList"),
+    path('release/<int:pinte_pk>', views.release, name="release"),
     path('products-autocomplete', views.ProductsAutocomplete.as_view(), name="products-autocomplete"),
     path('kegs-positive-autocomplete', views.KegPositiveAutocomplete.as_view(), name="kegs-positive-autocomplete"),
     path('kegs-active-autocomplete', views.KegActiveAutocomplete.as_view(), name="kegs-active-autocomplete"),
diff --git a/gestion/views.py b/gestion/views.py
index 0e70809..1767943 100644
--- a/gestion/views.py
+++ b/gestion/views.py
@@ -914,10 +914,23 @@ def allocate(pinte_pk, user):
     except Pinte.DoesNotExist:
         return False
 
+@active_required
+@login_required
+@permission_required('gestion.change_pinte')
+def release(request, pinte_pk):
+    """
+    View to release a pinte
+    """
+    if allocate(pinte_pk, None):
+        messages.success(request, "La pinte a bien été libérée")
+    else:
+        messages.error(request, "Impossible de libérer la pinte")
+    return redirect(reverse('gestion:pintesList'))
+    
 @active_required
 @login_required
 @permission_required('gestion.add_pinte')
-def create_pintes(request):
+def add_pintes(request):
     form = PinteForm(request.POST or None)
     if form.is_valid():
         ids = form.cleaned_data['ids']
@@ -952,4 +965,12 @@ def release_pintes(request):
                 i += 1
         messages.success(request, str(i) + " pinte(s) a(ont) été libérée(s)")
         return redirect(reverse('gestion:productsIndex'))
-    return render(request, "form.html", {"form": form, "form_title": "Libérer des pintes", "form_button": "Libérer"})
\ No newline at end of file
+    return render(request, "form.html", {"form": form, "form_title": "Libérer des pintes", "form_button": "Libérer"})
+
+@active_required
+@login_required
+@permission_required('gestion.view_pinte')
+def pintes_list(request):
+    free_pintes = Pinte.objects.filter(current_owner=None)
+    taken_pintes = Pinte.objects.exclude(current_owner=None)
+    return render(request, "gestion/pintes_list.html", {"free_pintes": free_pintes, "taken_pintes": taken_pintes})
\ No newline at end of file