diff --git a/resources/views/admin/parks/edit.blade.php b/resources/views/admin/parks/edit.blade.php index 33efd9a..b84367d 100644 --- a/resources/views/admin/parks/edit.blade.php +++ b/resources/views/admin/parks/edit.blade.php @@ -31,7 +31,7 @@ {{-- ▼ ボタンエリア(上部) --}}
- + 減免確認編集 駐輪状況編集 diff --git a/resources/views/admin/reduction_confirm/_form.blade.php b/resources/views/admin/reduction_confirm/_form.blade.php index c23dd7a..c5b807b 100644 --- a/resources/views/admin/reduction_confirm/_form.blade.php +++ b/resources/views/admin/reduction_confirm/_form.blade.php @@ -3,10 +3,12 @@ // reduction_confirm テーブルから取得したレコード $userCategoryId = $row->user_categoryid; $checkType = $row->reduction_confirm_type; - $oldCheckType = old("reduction_confirm_type.$userCategoryId", $checkType); + // use numeric index passed from parent to avoid name collisions when duplicate user_categoryid exist + $idx = $index ?? ($userCategoryId); + $oldCheckType = old("reduction_confirm_type.$idx", $checkType); // 学生分類かどうかを判定 - $isStudent = $row->usertype_subject1 === '学生'; + $isStudent = ($row->usertype_subject1 ?? '') === '学生'; $rowClass = $isStudent ? 'table-secondary' : ''; $isDisabled = $isStudent; @endphp @@ -17,45 +19,47 @@ {{ $row->usertype_subject2 ?? '-' }} {{ $row->usertype_subject3 ?? '-' }} + {{-- hidden mapping to know which user_categoryid this input row targets --}} +
{{-- 確認しない(0) --}}
- -
{{-- 年1回(1) --}}
- -
{{-- 毎更新時(2) --}}
- -
diff --git a/resources/views/admin/reduction_confirm/index.blade.php b/resources/views/admin/reduction_confirm/list.blade.php similarity index 63% rename from resources/views/admin/reduction_confirm/index.blade.php rename to resources/views/admin/reduction_confirm/list.blade.php index 7e03548..d13dc0c 100644 --- a/resources/views/admin/reduction_confirm/index.blade.php +++ b/resources/views/admin/reduction_confirm/list.blade.php @@ -69,56 +69,54 @@
-{{-- -
- 全 {{ $list->total() }} 件中 {{ $list->firstItem() }}〜{{ $list->lastItem() }} 件を表示 -
-
- {{ $list->appends(keepUserListQuery())->links('pagination') }} -
---}} -
-
- {{-- 登録ボタン --}} -
- -
+
+ {{-- 左側:登録ボタン --}} + - @csrf - - - -
- - - - - - - - - - - - @forelse ($reductionData as $row) - @include('admin.reduction_confirm._form', ['row' => $row]) - @empty - - - - @endforelse - -
利用者分類分類名1分類名2分類名3減免確認種別
- 利用者分類がありません。 -
+ {{-- 右側:件数 + ページネーション --}} +
+
+ 全 {{ $reductionData->total() }} 件中 + {{ $reductionData->firstItem() }}〜{{ $reductionData->lastItem() }} 件を表示 +
+
+ {{ $reductionData->appends(keepUserListQuery())->links('pagination') }} +
+
-
- + @csrf + +
+ + + + + + + + + + + + @forelse ($reductionData as $row) + @include('admin.reduction_confirm._form', ['row' => $row, 'index' => $loop->index]) + @empty + + + + @endforelse + +
利用者分類分類名1分類名2分類名3減免確認種別
+ 利用者分類がありません。 +
+
+ +
@endsection