From 163f3a04b4647634831fe89157d32745ea8caa44 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Mon, 8 Jan 2018 10:41:53 +0900 Subject: [PATCH 1/5] Ignore static dojos from stats --- app/controllers/static_pages_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb index 986ac5342..440c6fa2e 100644 --- a/app/controllers/static_pages_controller.rb +++ b/app/controllers/static_pages_controller.rb @@ -10,13 +10,13 @@ def stats @regions_and_dojos = Dojo.eager_load(:prefecture).default_order.group_by { |dojo| dojo.prefecture.region } # TODO: 次の静的なDojoの開催数もデータベース上で集計できるようにする - @sum_of_events = EventHistory.count + # 以下は2017年11月3日時点で個別に確認した数字 - 29 + # 柏の葉 - 3 + # 南柏 - 4 + # 柏湘南 - 63 # 小平 - @sum_of_dojos = DojoEventService.count('DISTINCT dojo_id') + - 4 # TODO: 同上。上記の道場数を静的に足しています + @sum_of_events = EventHistory.count #+ # 以下は2017年11月3日時点で個別に確認した数字 + #29 + # 柏の葉 + #3 + # 南柏 + #4 + # 柏湘南 + #63 # 小平 + @sum_of_dojos = DojoEventService.count('DISTINCT dojo_id') #+ + #4 # TODO: 同上。上記の道場数を静的に足しています @sum_of_participants = EventHistory.sum(:participants) # 2012年1月1日〜2017年12月31日までの集計結果 From 9ef98a8317c99629ea08dee255057e446fb709fa Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Mon, 8 Jan 2018 11:42:54 +0900 Subject: [PATCH 2/5] Put reference to TODO issue in Stats action --- app/controllers/static_pages_controller.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb index 440c6fa2e..6295b8acb 100644 --- a/app/controllers/static_pages_controller.rb +++ b/app/controllers/static_pages_controller.rb @@ -10,13 +10,9 @@ def stats @regions_and_dojos = Dojo.eager_load(:prefecture).default_order.group_by { |dojo| dojo.prefecture.region } # TODO: 次の静的なDojoの開催数もデータベース上で集計できるようにする - @sum_of_events = EventHistory.count #+ # 以下は2017年11月3日時点で個別に確認した数字 - #29 + # 柏の葉 - #3 + # 南柏 - #4 + # 柏湘南 - #63 # 小平 - @sum_of_dojos = DojoEventService.count('DISTINCT dojo_id') #+ - #4 # TODO: 同上。上記の道場数を静的に足しています + # https://github.com/coderdojo-japan/coderdojo.jp/issues/190 + @sum_of_events = EventHistory.count + @sum_of_dojos = DojoEventService.count('DISTINCT dojo_id') @sum_of_participants = EventHistory.sum(:participants) # 2012年1月1日〜2017年12月31日までの集計結果 From 944cff23dff874816cd8ceaaaf53371183eda592 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Mon, 8 Jan 2018 11:44:00 +0900 Subject: [PATCH 3/5] Get only measurable dojos in Stats --- app/controllers/static_pages_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb index 6295b8acb..542b584e2 100644 --- a/app/controllers/static_pages_controller.rb +++ b/app/controllers/static_pages_controller.rb @@ -20,8 +20,8 @@ def stats @range = 2012..2017 @range.each do |year| @dojos[year] = - Dojo.where(created_at: - Time.zone.local(2012).beginning_of_year..Time.zone.local(year).end_of_year).count + Dojo.where(created_at: Time.zone.local(2012).beginning_of_year..Time.zone.local(year) + .end_of_year).select{|d| d.dojo_event_services.any?}.count @events[year] = EventHistory.where(evented_at: Time.zone.local(year).beginning_of_year..Time.zone.local(year).end_of_year).count From 89f0e57b1b4a69ba39b8b2c91813a3d22c401749 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Mon, 8 Jan 2018 11:44:32 +0900 Subject: [PATCH 4/5] =?UTF-8?q?Tweak=20=E6=96=87=E8=A8=80=20of=20=E5=8F=82?= =?UTF-8?q?=E5=8A=A0=E8=80=85=E6=95=B0=20in=20Stats?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/static_pages/stats.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/static_pages/stats.html.haml b/app/views/static_pages/stats.html.haml index cfa8bb3b3..67dd23498 100644 --- a/app/views/static_pages/stats.html.haml +++ b/app/views/static_pages/stats.html.haml @@ -22,8 +22,9 @@ %h3 開催回数 = @sum_of_events 回 - %h3 参加者数 (延べ) - = @sum_of_participants = EventHistory.sum(:participants) + %h3 参加者数 + 延べ + = @sum_of_participants 人 %h3 計測対象 = @sum_of_dojos From 1387c6dab5701d4db29d2e74210c31802333852b Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Mon, 8 Jan 2018 11:51:35 +0900 Subject: [PATCH 5/5] Update numbers of Stats table --- app/views/static_pages/stats.html.haml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/static_pages/stats.html.haml b/app/views/static_pages/stats.html.haml index 67dd23498..44cc60bfe 100644 --- a/app/views/static_pages/stats.html.haml +++ b/app/views/static_pages/stats.html.haml @@ -34,25 +34,29 @@ %h3 各統計の推移 %div{align: 'center'} + (計測対象のみ) %table %thead %tr %th - @range.each do |year| %td{style: 'padding: 0 5px; font-weight: bold;'} #{year}年 + %td{style: 'padding: 0 5px; font-weight: bold;'} 合計 %tbody{align: 'center'} %tr %td 道場数 - @range.each do |year| - %td #{@dojos[year]} + %td= @dojos[year] %tr %td 開催回数 - @range.each do |year| - %td #{@events[year]} + %td= @events[year] + %td= @events.values.inject(:+) %tr %td 参加者数 - @range.each do |year| - %td #{@participants[year]} + %td= @participants[year] + %td= @participants.values.inject(:+) %h3 関連リンク %ul{:style => "list-style: none; margin-left: -40px;"}