diff --git a/app/controllers/regions_controller.rb b/app/controllers/regions_controller.rb index 7dcda037..e18ebae2 100644 --- a/app/controllers/regions_controller.rb +++ b/app/controllers/regions_controller.rb @@ -7,17 +7,26 @@ class RegionsController < InheritedResources::Base @city_events = Event.group(:city).having('count(city) > 3') .order('count(city) desc').count :city - # Used in sqlite - # .group('strftime("%Y", start_time)') - @year_events = Event - .group('extract(year from start_time)').count + @year_events = Event.group(year_grouping).count - # Used in sqlite - # .group('strftime("%Y", start_time)') - # .group('strftime("%m", start_time)') - @month_events = Event - .group('extract(year from start_time)') - .group('extract(month from start_time)') - .count + @month_events = Event.group(year_grouping, month_grouping).count + end + + private + + def year_grouping + if %w(Mysql2 MySQL PostgreSQL).include? Event.connection.adapter_name + 'extract(year from start_time)' + elsif Event.connection.adapter_name == 'SQLite' + 'strftime("%Y", start_time)' + end + end + + def month_grouping + if %w(Mysql2 MySQL PostgreSQL).include? Event.connection.adapter_name + 'extract(month from start_time)' + elsif Event.connection.adapter_name == 'SQLite' + 'strftime("%m", start_time)' + end end end diff --git a/app/views/regions/stats.html.haml b/app/views/regions/stats.html.haml index 1f29894d..a5d0a21b 100644 --- a/app/views/regions/stats.html.haml +++ b/app/views/regions/stats.html.haml @@ -25,8 +25,9 @@ %th.month= I18n.t('date.month_names')[m] - @year_events.each do |year| %td.quantity - - line = @month_events.find { |line| line[0][0] == year[0] && line[0][1] == m } - = number_with_delimiter line[1] if line + - line = @month_events.find { |line| line[0][0] == year[0] && line[0][1].try(:to_i) == m } + = link_to root_url(start_date: "#{year[0]}-#{m}-01") do + = number_with_delimiter line[1] if line %td.sparkline/ %tfoot diff --git a/config/database.yml b/config/database.yml index 23dbe813..e2623585 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,12 +1,8 @@ -development_old: +development: adapter: sqlite3 pool: 5 timeout: 5000 database: db/development.sqlite3 -development: - adapter: mysql2 - database: adl_fr - username: manu # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake".