Skip to content

スマートフォン版のDojo表示を地方ごとから都道府県ごとに変更 #1701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 12, 2025
Merged

スマートフォン版のDojo表示を地方ごとから都道府県ごとに変更 #1701

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c3bae4
スマートフォン版のDojo表示を地方ごとから都道府県ごとに変更
nacchan99 Jun 9, 2025
05d8e9d
Fix nil error for @prefectures_and_dojos in stats view
nacchan99 Jun 9, 2025
4bc62ff
dojosリストの見た目を整理＆dojo数1件時は単数形で表示
nacchan99 Jun 9, 2025
a177db1
fix: add missing newline at end of file
nacchan99 Jun 9, 2025
d75a1be
home_controller.rb のインデントを統一（L5〜L11を一段下げ）
nacchan99 Jun 10, 2025
ab3ff2a
dojo数の集計とラベル生成処理をヘルパーに移動し、ビューをシンプルに整理
nacchan99 Jun 10, 2025
31b69f4
dojo_count後と閉じdiv後の空行を削除してコードスタイルを統一
nacchan99 Jun 10, 2025
cb71937
ファイル末尾に改行を追加
nacchan99 Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/controllers/home_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions app/models/dojo.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 6 additions & 2 deletions app/views/shared/_dojos.html+smartphone.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<div id="accordion" class="panel-group" aria-multiselectable="true" role="tablist">
<% regions_and_dojos.each_with_index do |(region, dojos), index| %>
<% if @prefectures_and_dojos.present? %>

<% @prefectures_and_dojos.each_with_index do |(prefecture, dojos), index| %>
<div class="panel panel-default">
<div class="panel-heading" id="heading<%= index %>" role="tab">
<h4 class="panel-title">
<a data-toggle="collapse"
href="#collapse<%= index %>" role="button">
<i class="fa fa-chevron-right" aria-hidden="true"></i>
<%= region %>
<%= prefecture %>
- <%= dojos.pluck(:counter).sum %> Dojos
</a>
</h4>
Expand All @@ -18,6 +20,8 @@
</div>
</div>
<% end %>

<% end %>
</div>

<script>
Expand Down