From 19144377fecca3c197197f7ad4cbd12aa70f9ff1 Mon Sep 17 00:00:00 2001
From: Kayn Ty <tykayn@gmail.com>
Date: Tue, 22 May 2018 17:21:35 +0200
Subject: [PATCH] x axis on graphs

---
 app/Resources/views/festival/index.html.twig  | 11 ++++++++
 app/Resources/views/logged/history.html.twig  | 25 +++++++++++++++----
 .../Controller/DefaultController.php          |  3 +--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/Resources/views/festival/index.html.twig b/app/Resources/views/festival/index.html.twig
index 43f76490..3ecb5828 100755
--- a/app/Resources/views/festival/index.html.twig
+++ b/app/Resources/views/festival/index.html.twig
@@ -68,6 +68,17 @@
                             choisir comme actuel
                         </a>
                     {% endif %}
+
+                    {% if festival.user|length %}
+                        {% for u in festival.user %}
+                            <span class="badge badge-info">{{ u.username }}</span>
+                        {% endfor %}
+                    {% else %}
+                        <div class="alert alert-info">
+
+                        pas d'owner.
+                        </div>
+                    {% endif %}
                     <ul>
                         <li class="pull-left">
                             <a class="btn btn-primary" href="{{ path('festival_show', { 'id': festival.id }) }}">voir
diff --git a/app/Resources/views/logged/history.html.twig b/app/Resources/views/logged/history.html.twig
index 9609b704..17d5ec50 100755
--- a/app/Resources/views/logged/history.html.twig
+++ b/app/Resources/views/logged/history.html.twig
@@ -95,17 +95,32 @@
     <script>
 
         var dataPoints = [
-            {% for pair in statisticsSoldProducts %}
-            { label: "{{ pair.name }}",  y: {{ pair.count }}  },
+          {% for pair in statisticsSoldProducts %}
+            {
+                label: "{{ pair.name }}",
+                x: {{ pair.count }},
+                y: {{ pair.count }}
+            },
             {% endfor %}
         ];
         var dataPointsChiffreAffaire = [
             {% for pair in statisticsSoldProducts %}
-            { label: "{{ pair.name }}",  y: {{ pair.value }}  },
+            {
+                label: "{{ pair.name }}",
+                x: {{ pair.value }},
+                y: {{ pair.value }}
+            },
             {% endfor %}
-        ];var dataPointsFestivals = [
+        ];
+        var dataPointsFestivals = [
             {% for pair in statisticsFestivals %}
-            { label: "{{ pair.name }}",  y: {{ pair.chiffreAffaire }} , countClients : {{ pair.clients_count }},  date: "{{ pair.date |date('Y-m-d')}}" },
+            {
+                label: "{{ pair.name }}",
+                name: "{{ pair.name }}",
+                x: "{{ pair.date |date('Y-m-d')}}",
+                y: {{ pair.chiffreAffaire }} ,
+                countClients : {{ pair.clients_count }}
+            },
             {% endfor %}
         ];
         console.log(dataPointsFestivals);
diff --git a/src/AppBundle/Controller/DefaultController.php b/src/AppBundle/Controller/DefaultController.php
index d8936d39..306dbd32 100755
--- a/src/AppBundle/Controller/DefaultController.php
+++ b/src/AppBundle/Controller/DefaultController.php
@@ -59,7 +59,6 @@ class DefaultController extends Controller
                     1);
         }
         if ($lastFestival) {
-
             $lastFestival->recalculateChiffreAffaire();
         }
         $categRepo = $m->getRepository('AppBundle:ProductCategory');
@@ -453,7 +452,7 @@ class DefaultController extends Controller
         $m->flush();
 
         // replace this example code with whatever you need
-        return $this->redirectToRoute('dashboard');
+        return $this->redirectToRoute('festival_index');
     }
 
     /**