Merge pull request #3334 from betagouv/improve-satisfaction-graph

Stats : amélioration du graphique de satisfaction

app/controllers/stats_controller.rb

@@ -129,9 +129,9 @@ class StatsController < ApplicationController
 
   def satisfaction_usagers
     legend = {
-      Feedback.ratings.fetch(:happy)    => "Satisfaits",
-      Feedback.ratings.fetch(:neutral)  => "Neutres",
-      Feedback.ratings.fetch(:unhappy)  => "Mécontents"
+      Feedback.ratings.fetch(:unhappy) => "Mécontents",
+      Feedback.ratings.fetch(:neutral) => "Neutres",
+      Feedback.ratings.fetch(:happy)   => "Satisfaits"
     }
 
     number_of_weeks = 6
@@ -139,7 +139,7 @@ class StatsController < ApplicationController
       .group_by_week(:created_at, last: number_of_weeks, current: false)
       .count
 
-    Feedback.ratings.values.map do |rating|
+    legend.keys.map do |rating|
       data = Feedback
         .where(rating: rating)
         .group_by_week(:created_at, last: number_of_weeks, current: false)

app/views/stats/index.html.haml

@@ -25,8 +25,12 @@
 
       .chart-container
         .chart
-          = line_chart @satisfaction_usagers,
-            colors: ["#15AD70", "#F28900", "rgba(161, 0, 5, 0.9)"]
+          = area_chart @satisfaction_usagers,
+            stacked: true,
+            suffix: ' %',
+            max: 100,
+            library: { plotOptions: { series: { marker: { enabled: true }}}},
+            colors: ["#C31C25", "#F5962A", "#25B177"]
 
     .stat-card.stat-card-half.pull-left
       %span.stat-card-title

config/initializers/chartkick.rb

@@ -1,5 +1,7 @@
 Chartkick.options = {
   content_for: :charts_js,
   defer: true,
-  colors: ["rgba(61, 149, 236, 1)"]
+  colors: ["rgba(61, 149, 236, 1)"],
+  thousands: ' ',
+  decimal: ','
 }