diff --git a/app/controllers/regions_controller.rb b/app/controllers/regions_controller.rb index 587464ee..7dcda037 100644 --- a/app/controllers/regions_controller.rb +++ b/app/controllers/regions_controller.rb @@ -1,7 +1,8 @@ # Manage regions, mostly get stats out of them class RegionsController < InheritedResources::Base def stats - @region_events = Event.joins(:related_region).group(:name).count(:name) + @region_events = Event.joins(:related_region).group(:name) + .order('count(name) desc').count :name @city_events = Event.group(:city).having('count(city) > 3') .order('count(city) desc').count :city @@ -9,8 +10,7 @@ class RegionsController < InheritedResources::Base # Used in sqlite # .group('strftime("%Y", start_time)') @year_events = Event - .group('extract(year from start_time)') - .count + .group('extract(year from start_time)').count # Used in sqlite # .group('strftime("%Y", start_time)') diff --git a/app/models/region.rb b/app/models/region.rb index 153d3229..555351de 100644 --- a/app/models/region.rb +++ b/app/models/region.rb @@ -1,6 +1,7 @@ # This is mostly to group events around a region class Region < ActiveRecord::Base has_many :lugs, foreign_key: :region + has_many :events, foreign_key: :region default_scope { order :name } diff --git a/app/views/regions/stats.html.haml b/app/views/regions/stats.html.haml index 2448b3b3..1f29894d 100644 --- a/app/views/regions/stats.html.haml +++ b/app/views/regions/stats.html.haml @@ -4,10 +4,10 @@ %dl %dt=t '.all' - %dd.quantity= number_with_delimiter Event.count() + %dd.quantity= number_with_delimiter Event.count %dt=t '.allModeration' - %dd.quantity= number_with_delimiter Event.unscoped.where(moderated: 0).count() + %dd.quantity= number_with_delimiter Event.unscoped.where(moderated: 0).count %h3 %em.fa.fa-calendar @@ -45,7 +45,9 @@ %dl - @region_events.each do |region| - %dt.item= region[0] + %dt.item + = link_to root_url region: Region.find_by_name(region[0]).id do + = region[0] %dd.quantity= number_with_delimiter region[1] %h3=t '.city'