From 7fc3c33bedf74986660542a72fbb544c5d4eaff2 Mon Sep 17 00:00:00 2001 From: "kin.rinzen" Date: Fri, 19 Sep 2025 18:42:59 +0900 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=9C=9F=E7=A8=AE=E5=88=A5=E3=83=9E?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E7=94=BB=E9=9D=A2=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/RegularTypeController.php | 30 +++- .../Controllers/Admin/StationController.php | 4 +- app/Http/Requests/RegularTypeRequest.php | 4 +- .../views/admin/regular_types/_form.blade.php | 160 ++++++++++-------- .../views/admin/regular_types/edit.blade.php | 2 +- .../views/admin/regular_types/list.blade.php | 8 +- resources/views/layouts/app.blade.php | 2 +- 7 files changed, 126 insertions(+), 84 deletions(-) diff --git a/app/Http/Controllers/Admin/RegularTypeController.php b/app/Http/Controllers/Admin/RegularTypeController.php index e4a6db4..0bbc423 100644 --- a/app/Http/Controllers/Admin/RegularTypeController.php +++ b/app/Http/Controllers/Admin/RegularTypeController.php @@ -61,7 +61,7 @@ class RegularTypeController extends Controller $new->save(); }); - $request->session()->flash('success', __('新しい成功を創造する。')); + $request->session()->flash('success', __('登録に成功しました。')); return redirect()->route('regular_types'); } @@ -75,7 +75,15 @@ class RegularTypeController extends Controller abort(404); } - $data = array_merge($regular_type->getAttributes(), $this->getDataDropList()); + $data = array_merge( + $regular_type->getAttributes(), + $this->getDataDropList(), + [ + 'regular_type' => $regular_type, + 'isEdit' => true, + ] + ); + if ($request->isMethod('POST')) { @@ -129,18 +137,26 @@ class RegularTypeController extends Controller public function delete(Request $request) { - $arr_pk = $request->get('pk'); + $arr_pk = $request->get('pk'); // 配列で受け取る + if ($arr_pk) { - if (RegularType::deleteByPk($arr_pk)) { - return redirect()->route('regular_types')->with('success', __("削除が完了しました。")); + $deleted = RegularType::destroy($arr_pk); + + if ($deleted > 0) { + return redirect()->route('regular_types') + ->with('success', __("削除が完了しました。")); } else { - return redirect()->route('regular_types')->with('error', __('削除に失敗しました。')); + return redirect()->route('regular_types') + ->with('error', __('削除に失敗しました。')); } } - return redirect()->route('regular_types')->with('error', __('削除するユーザーを選択してください。')); + + return redirect()->route('regular_types') + ->with('error', __('削除するデータを選択してください。')); } + public function export(Request $request) { diff --git a/app/Http/Controllers/Admin/StationController.php b/app/Http/Controllers/Admin/StationController.php index 6943f88..74901c9 100644 --- a/app/Http/Controllers/Admin/StationController.php +++ b/app/Http/Controllers/Admin/StationController.php @@ -38,8 +38,8 @@ class StationController extends Controller 'station_route_name', 'park_id', 'operator_id', - 'station_latitude', - 'station_longitude', + // 'station_latitude', 追加予定 + // 'station_longitude',　追加予定 ]) ->orderBy($sort, $sort_type) ->paginate(20); diff --git a/app/Http/Requests/RegularTypeRequest.php b/app/Http/Requests/RegularTypeRequest.php index de24ff7..d1f5e3b 100644 --- a/app/Http/Requests/RegularTypeRequest.php +++ b/app/Http/Requests/RegularTypeRequest.php @@ -14,14 +14,14 @@ class RegularTypeRequest extends FormRequest public function rules() { return [ - 'name' => 'required|string|max:255', + 'city_id' => 'required|string|max:255', ]; } public function messages() { return [ - 'name.required' => '市区名は必須です。', + 'city_id.required' => '市区名は必須です。', ]; } } diff --git a/resources/views/admin/regular_types/_form.blade.php b/resources/views/admin/regular_types/_form.blade.php index 15f67ac..2fd3315 100644 --- a/resources/views/admin/regular_types/_form.blade.php +++ b/resources/views/admin/regular_types/_form.blade.php @@ -19,172 +19,194 @@
- @if($isEdit || $isInfo) - -
- + + {{-- バリデーションエラー表示 --}} + @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+ @endif + + +
+
- +
- - @endIf
- +
- + @foreach($cities as $key => $val) - + @endforeach
- +
- + name="regular_class_1" + value="1" @if(isset($regular_class_1) && $regular_class_1 == 1) checked @endif> +
- + name="regular_class_1" + value="0" @if(isset($regular_class_1) && $regular_class_1 === 0) checked @endif> +
- +
- +
- + name="regular_class_2" + value="1" @if(isset($regular_class_2) && $regular_class_2 == 1) checked @endif> +
- + name="regular_class_2" + value="0" @if(isset($regular_class_2) && $regular_class_2 === 0) checked @endif> +
-
- +
- + name="regular_class_3" + value="1" @if(isset($regular_class_3) && $regular_class_3 == 1) checked @endif> +
- + name="regular_class_3" + value="0" @if(isset($regular_class_3) && $regular_class_3 === 0) checked @endif> +
-
- +
- + name="regular_class_6" + value="1" @if(isset($regular_class_6) && $regular_class_6 == 1) checked @endif> +
- + name="regular_class_6" + value="0" @if(isset($regular_class_6) && $regular_class_6 === 0) checked @endif> +
- +
- + name="regular_class_12" + value="1" @if(isset($regular_class_12) && $regular_class_12 == 1) checked @endif> +
- + name="regular_class_12" + value="0" @if(isset($regular_class_12) && $regular_class_12 === 0) checked @endif> +
- - + +
- +
- +
- @if(!$isEdit) - {{-- 新規登録画面の場合：「登録」ボタンを表示 --}} - - @else - {{-- 編集画面の場合：「更新」「戻る」ボタンを表示 --}} - - - - {{ __('戻る') }} - - @endif + {{-- 削除ボタン（編集画面のみ表示） --}} + @if(!empty($regular_type->regular_type_id)) + +
+ @csrf + + +
+ @endif +
+ diff --git a/resources/views/admin/regular_types/edit.blade.php b/resources/views/admin/regular_types/edit.blade.php index 30c7719..a5f1244 100644 --- a/resources/views/admin/regular_types/edit.blade.php +++ b/resources/views/admin/regular_types/edit.blade.php @@ -34,7 +34,7 @@ - @include('admin.regular_types._form',['isEdit'=>1,'isInfo'=>0]) + @include('admin.regular_types._form', ['isEdit' => true]) diff --git a/resources/views/admin/regular_types/list.blade.php b/resources/views/admin/regular_types/list.blade.php index f2b8a21..6a90a9c 100644 --- a/resources/views/admin/regular_types/list.blade.php +++ b/resources/views/admin/regular_types/list.blade.php @@ -32,7 +32,11 @@
- +
{{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }} @@ -61,7 +65,7 @@
@csrf - + {{-- チェック + 編集ボタン --}}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 21a3a04..b838911 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -450,7 +450,7 @@ 'stations', 'terms', 'contract_allowable_cities', - 'pplace', + 'pplaces', ]; $current = app('router')->currentRouteName(); @endphp