From 3c3bae4827f2ba509014b333344cb63297162354 Mon Sep 17 00:00:00 2001 From: nacchan Date: Mon, 9 Jun 2025 10:33:11 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=E3=82=B9=E3=83=9E=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E7=89=88=E3=81=AEDojo=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=82=92=E5=9C=B0=E6=96=B9=E3=81=94=E3=81=A8=E3=81=8B?= =?UTF-8?q?=E3=82=89=E9=83=BD=E9=81=93=E5=BA=9C=E7=9C=8C=E3=81=94=E3=81=A8?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/home_controller.rb | 1 + app/models/dojo.rb | 8 ++++++++ app/views/shared/_dojos.html+smartphone.erb | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 241154fa1..f236496c5 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -2,5 +2,6 @@ class HomeController < ApplicationController def show @dojo_count = Dojo.active_dojos_count @regions_and_dojos = Dojo.group_by_region_on_active + @prefectures_and_dojos = Dojo.group_by_prefecture_on_active end end diff --git a/app/models/dojo.rb b/app/models/dojo.rb index 80420f67a..8bb79b58a 100644 --- a/app/models/dojo.rb +++ b/app/models/dojo.rb @@ -47,6 +47,14 @@ def group_by_region_on_active active.group_by_region end + def group_by_prefecture + eager_load(:prefecture).default_order.group_by { |dojo| dojo.prefecture.name } + end + + def group_by_prefecture_on_active + active.group_by_prefecture + end + def aggregatable_annual_count(period) Hash[ joins(:dojo_event_services) diff --git a/app/views/shared/_dojos.html+smartphone.erb b/app/views/shared/_dojos.html+smartphone.erb index 71629ad7a..79edb36a3 100644 --- a/app/views/shared/_dojos.html+smartphone.erb +++ b/app/views/shared/_dojos.html+smartphone.erb @@ -1,12 +1,13 @@
- <% regions_and_dojos.each_with_index do |(region, dojos), index| %> + + <% @prefectures_and_dojos.each_with_index do |(prefecture, dojos), index| %>
\ No newline at end of file + \ No newline at end of file From a177db150fdb5ee14a776cc0bc7bc70aaee91dea Mon Sep 17 00:00:00 2001 From: nacchan Date: Mon, 9 Jun 2025 15:41:30 +0900 Subject: [PATCH 4/8] fix: add missing newline at end of file --- app/controllers/home_controller.rb | 2 +- app/views/shared/_dojos.html+smartphone.erb | 2 +- app/views/shared/_social_buttons_raw.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 5d43f7e6b..78efcc934 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -10,4 +10,4 @@ def show } end end -end \ No newline at end of file +end diff --git a/app/views/shared/_dojos.html+smartphone.erb b/app/views/shared/_dojos.html+smartphone.erb index 24f23d222..5dfdb9f36 100644 --- a/app/views/shared/_dojos.html+smartphone.erb +++ b/app/views/shared/_dojos.html+smartphone.erb @@ -39,4 +39,4 @@ .addClass("fa-chevron-right"); }); }); - \ No newline at end of file + diff --git a/app/views/shared/_social_buttons_raw.html.erb b/app/views/shared/_social_buttons_raw.html.erb index f15dcd440..1ae727cb0 100644 --- a/app/views/shared/_social_buttons_raw.html.erb +++ b/app/views/shared/_social_buttons_raw.html.erb @@ -18,4 +18,4 @@ <%# コメントアウトされたLINEのボタンは省略 %> - \ No newline at end of file + From d75a1be1c7f6a31bbecc1e8738f126995bad841a Mon Sep 17 00:00:00 2001 From: nacchan Date: Tue, 10 Jun 2025 09:06:47 +0900 Subject: [PATCH 5/8] =?UTF-8?q?home=5Fcontroller.rb=20=E3=81=AE=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=87=E3=83=B3=E3=83=88=E3=82=92=E7=B5=B1=E4=B8=80?= =?UTF-8?q?=EF=BC=88L5=E3=80=9CL11=E3=82=92=E4=B8=80=E6=AE=B5=E4=B8=8B?= =?UTF-8?q?=E3=81=92=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/home_controller.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 78efcc934..be99895e3 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,13 +1,13 @@ class HomeController < ApplicationController def show - @dojo_count = Dojo.active_dojos_count - @regions_and_dojos = Dojo.group_by_region_on_active - @prefectures_and_dojos = Dojo.group_by_prefecture_on_active.transform_values do |dojos| - count = dojos.pluck(:counter).sum - { - dojos: dojos, - label: "#{count} Dojo#{'s' if count != 1}" - } + @dojo_count = Dojo.active_dojos_count + @regions_and_dojos = Dojo.group_by_region_on_active + @prefectures_and_dojos = Dojo.group_by_prefecture_on_active.transform_values do |dojos| + count = dojos.pluck(:counter).sum + { + dojos: dojos, + label: "#{count} Dojo#{'s' if count != 1}" + } end end end From ab3ff2a8b39bef67d9b51ed7b5f210a72bf9063f Mon Sep 17 00:00:00 2001 From: nacchan Date: Tue, 10 Jun 2025 09:53:08 +0900 Subject: [PATCH 6/8] =?UTF-8?q?dojo=E6=95=B0=E3=81=AE=E9=9B=86=E8=A8=88?= =?UTF-8?q?=E3=81=A8=E3=83=A9=E3=83=99=E3=83=AB=E7=94=9F=E6=88=90=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E3=83=98=E3=83=AB=E3=83=91=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=81=97=E3=80=81=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=82=92=E3=82=B7=E3=83=B3=E3=83=97=E3=83=AB=E3=81=AB=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/home_controller.rb | 10 ++-------- app/helpers/dojo_helper.rb | 13 +++++++++++++ app/views/shared/_dojos.html+smartphone.erb | 7 ++++--- 3 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 app/helpers/dojo_helper.rb diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index be99895e3..e9d05b21c 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,13 +1,7 @@ class HomeController < ApplicationController def show - @dojo_count = Dojo.active_dojos_count + @dojo_count = Dojo.active_dojos_count @regions_and_dojos = Dojo.group_by_region_on_active - @prefectures_and_dojos = Dojo.group_by_prefecture_on_active.transform_values do |dojos| - count = dojos.pluck(:counter).sum - { - dojos: dojos, - label: "#{count} Dojo#{'s' if count != 1}" - } - end + @prefectures_and_dojos = Dojo.group_by_prefecture_on_active end end diff --git a/app/helpers/dojo_helper.rb b/app/helpers/dojo_helper.rb new file mode 100644 index 000000000..d728bbab1 --- /dev/null +++ b/app/helpers/dojo_helper.rb @@ -0,0 +1,13 @@ +module DojoHelper + def dojo_count_label(count) + if count == 1 + "#{count} Dojo" + else + "#{count} Dojos" + end + end + + def total_dojos_count(dojos) + dojos.sum(&:counter) + end +end \ No newline at end of file diff --git a/app/views/shared/_dojos.html+smartphone.erb b/app/views/shared/_dojos.html+smartphone.erb index 5dfdb9f36..aed0dd221 100644 --- a/app/views/shared/_dojos.html+smartphone.erb +++ b/app/views/shared/_dojos.html+smartphone.erb @@ -1,19 +1,20 @@
<% if @prefectures_and_dojos.present? %> - <% @prefectures_and_dojos.each_with_index do |(prefecture, data), index| %> + <% @prefectures_and_dojos.each_with_index do |(prefecture, dojos), index| %> + <% dojo_count = total_dojos_count(dojos) %>
- <%= render partial: 'shared/dojo', collection: data[:dojos] %> + <%= render partial: 'shared/dojo', collection: dojos %>
From 31b69f418a0af588e34078a1cc57a04a42f477f5 Mon Sep 17 00:00:00 2001 From: nacchan Date: Tue, 10 Jun 2025 10:32:53 +0900 Subject: [PATCH 7/8] =?UTF-8?q?dojo=5Fcount=E5=BE=8C=E3=81=A8=E9=96=89?= =?UTF-8?q?=E3=81=98div=E5=BE=8C=E3=81=AE=E7=A9=BA=E8=A1=8C=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=97=E3=81=A6=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB=E3=82=92=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shared/_dojos.html+smartphone.erb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/shared/_dojos.html+smartphone.erb b/app/views/shared/_dojos.html+smartphone.erb index aed0dd221..206a342ba 100644 --- a/app/views/shared/_dojos.html+smartphone.erb +++ b/app/views/shared/_dojos.html+smartphone.erb @@ -2,7 +2,6 @@ <% if @prefectures_and_dojos.present? %> <% @prefectures_and_dojos.each_with_index do |(prefecture, dojos), index| %> <% dojo_count = total_dojos_count(dojos) %> -
- <% end %> <% end %>
From cb71937379ea262cb48108736d981181cb93dcd7 Mon Sep 17 00:00:00 2001 From: nacchan Date: Wed, 11 Jun 2025 12:37:01 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E6=9C=AB=E5=B0=BE=E3=81=AB=E6=94=B9=E8=A1=8C=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/dojo_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/dojo_helper.rb b/app/helpers/dojo_helper.rb index d728bbab1..db1c1f07c 100644 --- a/app/helpers/dojo_helper.rb +++ b/app/helpers/dojo_helper.rb @@ -10,4 +10,4 @@ def dojo_count_label(count) def total_dojos_count(dojos) dojos.sum(&:counter) end -end \ No newline at end of file +end