Statistiques par région et année

app/assets/javascripts/regions.js.coffee

@@ -7,12 +7,14 @@ $(document).ready ->
 
     $(this).find('.sparkline').sparkline vals, width: '5em'
 
-  vals = $('table.list.dates tfoot th.quantity').map ->
-    return parseInt $(this).html().replace(' ', '')
 
-  $('tfoot .sparkline').sparkline vals,
+  $('table.list.dates tfoot').each ->
-    type: 'bar'
+    vals = $(this).find('th.quantity').map ->
-    height: '3em'
+      return parseInt $(this).html().replace(' ', '')
-    barWidth: '80em'
+
-    barColor: '#9CC5EE'
+    $(this).find('.sparkline').sparkline vals,
-    barSpacing: 2
+      type: 'bar'
+      height: '3em'
+      barWidth: '100%'
+      barColor: '#9CC5EE'
+      barSpacing: 2

app/controllers/stats_controller.rb

@@ -5,13 +5,12 @@ class StatsController < ApplicationController
   private
 
   def set_temporal
-    @year_events = Event.group(year_grouping).count
+    @years = Event.group(year_grouping).count
-    @month_events = Event.group(year_grouping, month_grouping).count
+    @months = Event.group(year_grouping, month_grouping).count
   end
 
   def set_local
-    @region_events = Event.joins(:related_region).group(:name)
+    @regions = Event.joins(:related_region).group(:region, year_grouping).count
-                     .order('count(name) desc').count
     @city_events = Event.group(:city).having('count(city) > 3')
                    .order('count(city) desc').count
   end

app/views/stats/index.html.haml

@@ -17,15 +17,15 @@
   %thead
     %tr
       %th/
-      - @year_events.each do |year|
+      - @years.each do |year|
         %th= year[0]
   %tbody
     - (1..12).each do |m|
       %tr
         %th.month= I18n.t('date.month_names')[m]
-        - @year_events.each do |year|
+        - @years.each do |year|
           %td.quantity
-            - line = @month_events.find { |line| line[0][0] == year[0] && line[0][1].try(:to_i) == m }
+            - line = @months.find { |line| line[0][0] == year[0] && line[0][1].try(:to_i) == m }
             = link_to root_path(start_date: "#{year[0]}-#{m}-01") do
               = number_with_delimiter line[1] if line
         %td.sparkline/
@@ -33,23 +33,32 @@
   %tfoot
     %tr
       %th=t '.total'
-      - @year_events.each do |year|
+      - @years.each do |year|
         %th.quantity= number_with_delimiter year[1]
 
     %tr
       %th/
-      %td.sparkline(colspan="#{@year_events.size}")/
+      %td.sparkline(colspan="#{@years.size}")/
 
 %h3
   %em.fa.fa-shield
   =t '.regional'
 
-%dl
+%table.list.dates
-  - @region_events.each do |region|
+  %thead
-    %dt.item
+    %tr
-      = link_to root_path region: Region.find_by_name(region[0]).id do
+      %th/
-        = region[0]
+      - @years.each do |year|
-    %dd.quantity= number_with_delimiter region[1]
+        %th= year[0]
+  %tbody
+    - Region.all.each do |region|
+      %tr
+        %th.month= region
+        - @years.each do |year|
+          %td.quantity
+            = link_to root_path(year: "#{year[0]}", region: region.id) do
+              = number_with_delimiter @regions[[region.id, year[0]]]
+        %td.sparkline/
 
 %h3=t '.city'