Merge pull request #2424 from cloudnativedaysjp/cndw2024-form

タイムテーブルの修正
cloudnativedaysjp · Oct 21, 2024 · 4a28e15 · 4a28e15
2 parents cf09232 + 0cc3b50
commit 4a28e15
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/views/attendee_dashboards/show.html.erb b/app/views/attendee_dashboards/show.html.erb
@@ -75,9 +75,11 @@
               <div class="card-text">参加方法の変更は <%= link_to 'こちら', edit_profile_path(id: @profile.id) %> から</div>
               </br>
               <% if @profile.attend_offline? %>
+                <!-- TODO: CNDW2024参加証できたら有効化 
                 <div class="card-text">当日の参加受付には参加証の印刷が必要となっております</div>
                 <div class="card-text">参加証は <%= link_to 'こちら', profiles_entry_sheet_path %> から印刷してお持ちください</div>
                 <div class="card-text">スマートフォンで受け付け用の二次元バーコードを表示する場合は <%= link_to 'こちら', profiles_view_qr_path %></div>
+                -->
               <% end %>
               </br>
               <div class="card-text">

diff --git a/db/fixtures/development/00_seeds.rb b/db/fixtures/development/00_seeds.rb
@@ -415,7 +415,7 @@
   { id: 51, number: 1, name: "A", conference_id: 12, room_id: 24},
   { id: 52, number: 2, name: "B", conference_id: 12, room_id: 25},
   { id: 53, number: 3, name: "C", conference_id: 12, room_id: 26},
-  { id: 54, number: 3, name: "D", conference_id: 12, room_id: 27},
+  { id: 54, number: 4, name: "D", conference_id: 12, room_id: 27},
 )
 
 

diff --git a/db/fixtures/production/00_seeds.rb b/db/fixtures/production/00_seeds.rb
@@ -385,7 +385,7 @@
   { id: 51, number: 1, name: "A", conference_id: 12, room_id: 24},
   { id: 52, number: 2, name: "B", conference_id: 12, room_id: 25},
   { id: 53, number: 3, name: "C", conference_id: 12, room_id: 26},
-  { id: 54, number: 3, name: "D", conference_id: 12, room_id: 27},
+  { id: 54, number: 4, name: "D", conference_id: 12, room_id: 27},
 )
 
 Room.seed(