From e903f5e394092ab1d770a054f217b5996405474a Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 1 Jan 2025 19:34:02 +0900 Subject: [PATCH 1/4] Update range end in Stats: 2023 -> 2024 --- app/controllers/stats_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 171f613d7..6956ffd7a 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -14,9 +14,9 @@ def show return end - # 2012年1月1日〜2023年12月31日までの集計結果 + # 2012年1月1日〜2024年12月31日までの集計結果 @period_start = 2012 - @period_end = 2023 + @period_end = 2024 period = Time.zone.local(@period_start).beginning_of_year..Time.zone.local(@period_end).end_of_year stats = Stat.new(period) From e6136d2ee3a6df0d4193e72fdf4f76e5788a6348 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 1 Jan 2025 19:34:49 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Add=20stats:=20=E7=A6=8F=E5=B3=B6=E3=81=A7?= =?UTF-8?q?=E3=81=8B=E3=83=89=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=BC=20in=202?= =?UTF-8?q?024=20as=20CoderDojo=20=E7=9F=A2=E5=90=B9=EF=BC=88=E5=85=B1?= =?UTF-8?q?=E5=82=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/static_event_histories.yaml | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/db/static_event_histories.yaml b/db/static_event_histories.yaml index 8df477cb6..dcd89b34a 100644 --- a/db/static_event_histories.yaml +++ b/db/static_event_histories.yaml @@ -69,6 +69,50 @@ evented_at: 2023-01-08 14:00 participants: 2 +# ID 268: CoderDojo 吉備 as DojoCon Japan 2024 +- dojo_id: 268 + event_url: https://dojocon-japan.doorkeeper.jp/events/176163 # 入場チケット + evented_at: 2024-09-15 10:00 + participants: 114 +- dojo_id: 268 + event_url: https://dojocon-japan.doorkeeper.jp/events/176169 # 同伴者１ + evented_at: 2024-09-15 10:00 + participants: 20 +- dojo_id: 268 + event_url: https://dojocon-japan.doorkeeper.jp/events/176171 # 同伴者２ + evented_at: 2024-09-15 10:00 + participants: 5 +- dojo_id: 268 + event_url: https://dojocon-japan.doorkeeper.jp/events/176202 # 同伴者３ + evented_at: 2024-09-15 10:00 + participants: 1 +- dojo_id: 268 + event_url: https://dojocon-japan.doorkeeper.jp/events/176203 # 同伴者４ + evented_at: 2024-09-15 10:00 + participants: 0 +- dojo_id: 268 + event_url: https://dojocon-japan.doorkeeper.jp/events/177221 # マイクラ + evented_at: 2024-09-15 10:00 + participants: 8 +- dojo_id: 268 + event_url: https://dojocon-japan.doorkeeper.jp/events/177223 # CoderDojo WS + evented_at: 2024-09-15 10:00 + participants: 2 +- dojo_id: 268 + event_url: https://dojocon-japan.doorkeeper.jp/events/177222 # M5Stack + evented_at: 2024-09-15 10:00 + participants: 6 + +# NOTE: 懇親会は Stats の利用シーンの性質と合わないかもなので一旦除外 +#- dojo_id: 268 +# event_url: https://dojocon-japan.doorkeeper.jp/events/177349 # 懇親会 +# evented_at: 2024-09-15 10:00 +# participants: 40 +#- dojo_id: 268 +# event_url: https://dojocon-japan.doorkeeper.jp/events/177350 # 懇親会 LT +# evented_at: 2024-09-15 10:00 +# participants: 7 + # ID 35: CoderDojo 奈良 as DojoCon Japan 2023 - dojo_id: 35 @@ -104,6 +148,12 @@ evented_at: 2023-08-27 15:00 participants: 10 +# ID 248: CoderDojo 矢吹 (共催） as やぶきプログラミングフェス with DecaDojo (2024) +# 開催レポート: https://coderdojoshirakawa.hateblo.jp/entry/2024/07/20/220134 +- dojo_id: 248 + event_url: https://coderdojoshirakawa.hateblo.jp/entry/2024/07/20/220134 + evented_at: 2024/06/15 13:00 + participants: 100 # ID 79: CoderDojo 会津 as 福島でかドージョー２０２３ - dojo_id: 79 From 51c595762137c33f99fdde54299b4a16b9d98b2f Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 1 Jan 2025 19:59:10 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Update=20data=20on=20CoderDojo=20=E4=B8=89?= =?UTF-8?q?=E6=AC=A1=20in=202024=20via=20/db/static=5Fevent=5Fhistories.ya?= =?UTF-8?q?ml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/static_event_histories.yaml | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/db/static_event_histories.yaml b/db/static_event_histories.yaml index dcd89b34a..3acfa35e9 100644 --- a/db/static_event_histories.yaml +++ b/db/static_event_histories.yaml @@ -19,7 +19,36 @@ # https://dojocon-japan.doorkeeper.jp/events/past # # ID 194: CoderDojo 三次 - https://www.facebook.com/dojo.miyoshi/past_hosted_events -# MEMO: データ追加のサンプルとして2023年のイベント情報を入れてみています。 +# MEMO: データ追加のサンプルとして2023〜2024年のイベント情報を入れてみています。 +# 「興味あり」はカウントせず、「参加者」のみをカウントしています。 +# +# 2024 +- dojo_id: 194 + event_url: https://www.facebook.com/events/436353945837073/ + evented_at: 2024-06-09 14:00 + participants: 1 +- dojo_id: 194 + event_url: https://www.facebook.com/events/1550750222136890/ + evented_at: 2024-05-12 14:00 + participants: 1 +- dojo_id: 194 + event_url: https://www.facebook.com/events/967674081399396/ + evented_at: 2024-04-14 14:00 + participants: 1 +- dojo_id: 194 + event_url: https://www.facebook.com/events/800050015495383/ + evented_at: 2024-03-10 14:00 + participants: 1 +- dojo_id: 194 + event_url: https://www.facebook.com/events/1581483302667332/ + evented_at: 2024-02-11 14:00 + participants: 1 +- dojo_id: 194 + event_url: https://www.facebook.com/events/1072946490568386/ + evented_at: 2024-01-14 14:00 + participants: 1 + +# 2023 - dojo_id: 194 event_url: https://www.facebook.com/events/359085903440917/ evented_at: 2023-12-10 14:00 From 811497c0c0cd72fb68d3a8b35e70f7e5adf43a07 Mon Sep 17 00:00:00 2001 From: Yohei Yasukawa Date: Wed, 1 Jan 2025 20:11:21 +0900 Subject: [PATCH 4/4] Fix cut-off yAxis of HighCharts in Stats page --- app/models/high_charts_builder.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/high_charts_builder.rb b/app/models/high_charts_builder.rb index f194f0ec6..75dffeddf 100644 --- a/app/models/high_charts_builder.rb +++ b/app/models/high_charts_builder.rb @@ -33,7 +33,7 @@ def build_annual_event_histories(source) f.series(type: 'line', name: '累積合計', yAxis: 1, data: data[:cumulative_sums]) f.yAxis [ { title: { text: '開催回数' }, tickInterval: 500, max: 2000 }, - { title: { text: '累積合計' }, tickInterval: 2500, max: 10000, opposite: true } + { title: { text: '累積合計' }, tickInterval: 3000, max: 12000, opposite: true } ] f.chart(width: 600, alignTicks: false) f.colors(["#F4C34F", "#BD2561"]) @@ -49,8 +49,8 @@ def build_annual_participants(source) f.series(type: 'column', name: '参加者数', yAxis: 0, data: data[:increase_nums]) f.series(type: 'line', name: '累積合計', yAxis: 1, data: data[:cumulative_sums]) f.yAxis [ - { title: { text: '参加者数' }, tickInterval: 2500, max: 12500 }, - { title: { text: '累積合計' }, tickInterval: 12000, max: 60000, opposite: true } + { title: { text: '参加者数' }, tickInterval: 2500, max: 12500 }, + { title: { text: '累積合計' }, tickInterval: 14000, max: 64000, opposite: true } ] f.chart(width: 600, alignTicks: false) f.colors(["#EF685E", "#35637D"])