Merge pull request #560 from hacken-in/bugs/515-statement-invalid-in-…

…statistics-show

Fixed statistics page for postgres, closes #515

app/controllers/statistics_controller.rb

@@ -5,12 +5,14 @@ def index
   end
 
   def show
-    week_data = SingleEvent.in_region(@current_region).where("occurrence <= ?", Date.yesterday).group("weekday(occurrence)").count
+    week_data = SingleEvent.unscoped.in_region(@current_region).where("occurrence <= ?", Date.yesterday).select("extract('dow' from occurrence) as dow, count(*)").group("extract('dow' from occurrence)")
 
     day_names = I18n.t(:"date.day_names").rotate
 
-    @chart_data = week_data.keys.sort.map do |key|
-      [day_names[key], week_data[key]]
+    @chart_data = day_names.map {|name| [name, 0] }
+
+    week_data.map do |key|
+      @chart_data[key.dow - 1][1] = key.count
     end
   end
 

app/models/region.rb

@@ -5,6 +5,8 @@ class Region < ActiveRecord::Base
   has_many :region_organizers
   has_many :organizers, :through => :region_organizers, :source => :user
 
+  scope :active, -> { where(active: true) }
+
   def to_param
     "#{self.id}-#{self.slug}"
   end

app/views/statistics/_other_regions.html.haml

@@ -0,0 +1,3 @@
+%ul
+  - Region.active.each do |region|
+    %li= link_to region.name, show_statistic_path(region: region.slug)

app/views/statistics/index.html.haml

@@ -1,5 +1,4 @@
-%h2 Statistiken
+%h2= t("statistics.index.headline")
+
+= render partial: 'other_regions'
 
-%ul
-  - Region.all.each do |region|
-    %li= link_to region.name, show_statistic_path(region: region.slug)

app/views/statistics/show.html.haml

@@ -1,12 +1,7 @@
-%h2 Statistiken für #{@current_region.name}
+%h2= t("statistics.show.headline", region: @current_region.name)
 
-%h3 Wochentage
+%h3= t("statistics.show.weekdays")
 
 = column_chart @chart_data
 
-%p
-  Weitere Statistiken für
-
-%ul
-  - Region.all.each do |region|
-    %li= link_to region.name, show_statistic_path(region: region.slug)
+= render partial: 'other_regions'

config/locales/de.yml

@@ -269,3 +269,9 @@ de:
     next_label: Nächste →
     page_gap: "…"
     previous_label: "← Zurück"
+  statistics:
+    index:
+      headline: "Statistiken"
+    show:
+      headline: "Statistiken für %{region}"
+      weekdays: "Wochentage"

config/locales/en.yml

@@ -269,3 +269,9 @@ en:
     next_label: Next →
     page_gap: "…"
     previous_label: "← Back"
+  statistics:
+    index:
+      headline: "Statistics"
+    show:
+      headline: "Statistics for %{region}"
+      weekdays: "Weekdays"