From 29fb0af893519d2c81e4551c0ae759bb24bac468 Mon Sep 17 00:00:00 2001
From: guillaume-renaud <renaudg779@gmail.com>
Date: Tue, 8 Nov 2016 18:14:41 +0100
Subject: [PATCH] Addition of the stock parameter to the counter admin list

---
 counter/templates/counter/counter_list.jinja |  7 +++++-
 sith/urls.py                                 |  1 +
 stock/templates/stock/stock_main.jinja       | 12 +++++++++-
 stock/urls.py                                |  5 +++--
 stock/views.py                               | 23 +++++++++++++++++++-
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/counter/templates/counter/counter_list.jinja b/counter/templates/counter/counter_list.jinja
index 195d1175..68c33cbf 100644
--- a/counter/templates/counter/counter_list.jinja
+++ b/counter/templates/counter/counter_list.jinja
@@ -33,7 +33,12 @@
     <a href="{{ url('counter:stats', counter_id=c.id) }}">{% trans %}Stats{% endtrans %}</a> -
     {% endif %}
     {% if user.is_owner(c) %}
-    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a>
+    <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
+    {%if c.stock %}
+    <a href="{{ url('stock:main', stock_id=c.stock.id) }}">{{c.stock}}</a>
+    {% else %}
+    <a href="{{ url('stock:new', counter_id=c.id) }}">{% trans %}Create new stock{% endtrans%}</a>
+    {% endif %}
     {% endif %}
     </li>
     {% endfor %}
diff --git a/sith/urls.py b/sith/urls.py
index d759979e..075e2f20 100644
--- a/sith/urls.py
+++ b/sith/urls.py
@@ -34,6 +34,7 @@ urlpatterns = [
     url(r'^com/', include('com.urls', namespace="com", app_name="com")),
     url(r'^club/', include('club.urls', namespace="club", app_name="club")),
     url(r'^counter/', include('counter.urls', namespace="counter", app_name="counter")),
+    url(r'^stock/', include('stock.urls', namespace="stock", app_name="stock")),
     url(r'^accounting/', include('accounting.urls', namespace="accounting", app_name="accounting")),
     url(r'^eboutic/', include('eboutic.urls', namespace="eboutic", app_name="eboutic")),
     url(r'^launderette/', include('launderette.urls', namespace="launderette", app_name="launderette")),
diff --git a/stock/templates/stock/stock_main.jinja b/stock/templates/stock/stock_main.jinja
index fe9f8145..3cf56022 100644
--- a/stock/templates/stock/stock_main.jinja
+++ b/stock/templates/stock/stock_main.jinja
@@ -1 +1,11 @@
-TOTO
\ No newline at end of file
+{% extends "core/base.jinja" %}
+
+{% block title %}
+{{stock}}
+{% endblock %}
+
+{% block content %}
+<h3>{{stock}}</h3>
+<a href="{{ url('stock:new_item', stock_id=stock.id) }}">{{stock.name}}</a>
+{% endblock %}
+
diff --git a/stock/urls.py b/stock/urls.py
index 1b3a504e..0f5ae091 100644
--- a/stock/urls.py
+++ b/stock/urls.py
@@ -3,6 +3,7 @@ from django.conf.urls import include, url
 from stock.views import *
 
 urlpatterns = [
-    url(r'^(?P<counter_id>[0-9]+)$', StockListView.as_view(), name='stock_list'),
-    url(r'^(?P<counter_id>[0-9]+)/new$', StockCreateView.as_view(), name='stock_new'),
+    url(r'^(?P<stock_id>[0-9]+)$', StockMain.as_view(), name='main'),
+    url(r'^new/counter/(?P<counter_id>[0-9]+)$', StockCreateView.as_view(), name='new'),
+    url(r'^(?P<stock_id>[0-9]+)/newItem$', StockItemCreateView.as_view(), name='new_item'),
 ]
diff --git a/stock/views.py b/stock/views.py
index 91ea44a2..c60c3528 100644
--- a/stock/views.py
+++ b/stock/views.py
@@ -1,3 +1,24 @@
 from django.shortcuts import render
+from django.views.generic import ListView, DetailView, RedirectView, TemplateView
+from django.views.generic.edit import UpdateView, CreateView, DeleteView, ProcessFormView, FormMixin
 
-# Create your views here.
+
+from stock.models import Stock
+
+class StockMain(DetailView):
+	"""
+		The stock view for the counter owner
+	"""
+	model = Stock
+	template_name = 'stock/stock_main.jinja'
+	pk_url_kwarg = "stock_id"
+
+class StockCreateView(CreateView):
+	"""
+		docstring for StockCreateView
+	"""
+
+class StockItemCreateView(CreateView):
+	"""
+	
+	"""
\ No newline at end of file