From 98ea395e804c08c0074609ce37f777cb0068671c Mon Sep 17 00:00:00 2001 From: "kin.rinzen" Date: Fri, 26 Sep 2025 20:58:11 +0900 Subject: [PATCH] =?UTF-8?q?SWA98,SWA95=E3=83=93=E3=83=A5=E3=83=BC=E3=82=92?= =?UTF-8?q?=E6=95=B4=E7=90=86=E3=83=BB=E7=B5=B1=E4=B8=80=E3=81=97=E3=80=81?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/ContractAllowableCityController.php | 142 +++++++------ .../Admin/JurisdictionParkingController.php | 69 +++++-- .../Controllers/Admin/PrintAreaController.php | 27 ++- resources/js/app.js | 4 +- resources/lang/ja/validation.php | 4 + .../contract_allowable_cities/_form.blade.php | 193 ++++++++++-------- .../contract_allowable_cities/add.blade.php | 82 +------- .../contract_allowable_cities/edit.blade.php | 82 ++------ .../contract_allowable_cities/info.blade.php | 36 ---- .../contract_allowable_cities/list.blade.php | 20 +- .../jurisdiction_parkings/_form.blade.php | 168 ++++++++------- .../admin/jurisdiction_parkings/add.blade.php | 46 +---- .../jurisdiction_parkings/edit.blade.php | 68 ++---- .../jurisdiction_parkings/info.blade.php | 41 ---- .../jurisdiction_parkings/list.blade.php | 8 +- .../views/admin/print_areas/_form.blade.php | 126 ++++++------ .../views/admin/print_areas/add.blade.php | 6 +- .../views/admin/print_areas/edit.blade.php | 28 +-- .../views/admin/print_areas/info.blade.php | 30 --- .../views/admin/print_areas/list.blade.php | 6 +- resources/views/admin/terms/_form.blade.php | 30 ++- resources/views/admin/terms/add.blade.php | 2 +- resources/views/admin/terms/edit.blade.php | 8 +- resources/views/admin/terms/info.blade.php | 36 ---- resources/views/admin/terms/list.blade.php | 6 +- resources/views/layouts/app.blade.php | 2 +- 26 files changed, 540 insertions(+), 730 deletions(-) delete mode 100644 resources/views/admin/contract_allowable_cities/info.blade.php delete mode 100644 resources/views/admin/jurisdiction_parkings/info.blade.php delete mode 100644 resources/views/admin/print_areas/info.blade.php delete mode 100644 resources/views/admin/terms/info.blade.php diff --git a/app/Http/Controllers/Admin/ContractAllowableCityController.php b/app/Http/Controllers/Admin/ContractAllowableCityController.php index eab1a7e..f203947 100644 --- a/app/Http/Controllers/Admin/ContractAllowableCityController.php +++ b/app/Http/Controllers/Admin/ContractAllowableCityController.php @@ -17,79 +17,84 @@ class ContractAllowableCityController extends Controller * 一覧表示 */ public function list(Request $request) -{ - $inputs = $request->all(); - $inputs['isMethodPost'] = $request->isMethod('post'); + { + $inputs = $request->all(); + $inputs['isMethodPost'] = $request->isMethod('post'); - // 解除処理 - if ($request->isMethod('post') && $request->input('action') === 'unlink') { - $query = ContractAllowableCity::query(); + // 解除処理 + if ($request->isMethod('post') && $request->input('action') === 'unlink') { + // バリデーション：解除条件が1つも入力されていない場合はエラー + if ( + !$request->filled('contract_allowable_city_id') + && !$request->filled('city_id') + && !$request->filled('contract_allowable_city_name') + && !$request->filled('park_id') + ) { + return back()->withErrors(['解除条件を1つ以上入力してください。']); + } - if ($request->filled('contract_allowable_city_id')) { - $query->where('contract_allowable_city_id', $request->contract_allowable_city_id); - } - if ($request->filled('city_id')) { - $query->where('city_id', $request->city_id); - } - if ($request->filled('contract_allowable_city_name')) { - $query->where('contract_allowable_city_name', 'like', '%' . $request->contract_allowable_city_name . '%'); - } - if ($request->filled('park_id')) { - $query->where('park_id', $request->park_id); + $query = ContractAllowableCity::query(); + + if ($request->filled('contract_allowable_city_id')) { + $query->where('contract_allowable_city_id', $request->contract_allowable_city_id); + } + if ($request->filled('city_id')) { + $query->where('city_id', $request->city_id); + } + if ($request->filled('contract_allowable_city_name')) { + $query->where('contract_allowable_city_name', 'like', '%' . $request->contract_allowable_city_name . '%'); + } + if ($request->filled('park_id')) { + $query->where('park_id', $request->park_id); + } + + // 推荐：直接批量删除 + $count = $query->delete(); + return redirect()->route('contract_allowable_cities')->with('success', '解除しました'); } - $records = $query->get(); - foreach ($records as $record) { - $record->delete(); - } + // 通常の絞り込み処理 + $list = ContractAllowableCity::search($inputs); - return redirect()->route('contract_allowable_cities')->with('success', '解除しました'); + return view('admin.contract_allowable_cities.list', [ + 'list' => $list, + 'inputs' => $inputs, + 'sort' => $inputs['sort'] ?? '', + 'sort_type' => $inputs['sort_type'] ?? '', + 'cityList' => City::getList(), + 'parkList' => Park::getList(), + ]); } - // 通常の絞り込み処理 - $list = ContractAllowableCity::search($inputs); - - return view('admin.contract_allowable_cities.list', [ - 'list' => $list, - 'inputs' => $inputs, - 'sort' => $inputs['sort'] ?? '', - 'sort_type' => $inputs['sort_type'] ?? '', - 'cityList' => City::getList(), - 'parkList' => Park::getList(), - ]); -} - - /** * 新規登録 */ public function add(Request $request) { if ($request->isMethod('post')) { - $request->validate([ + $validated = $request->validate([ 'city_id' => 'required|integer', 'contract_allowable_city_name' => 'required|string|max:20', 'park_id' => 'required|integer', 'same_district_flag' => 'required|integer', ]); - $data = $request->all(); - $data['operator_id'] = Auth::user()->ope_id; + $validated['operator_id'] = Auth::user()->ope_id; - ContractAllowableCity::create($data); + ContractAllowableCity::create($validated); - return redirect()->route('contract_allowable_cities')->with('success', '登録しました'); + return redirect()->route('contract_allowable_cities') + ->with('success', '登録しました。'); } - return view('admin.contract_allowable_cities.add', [ - 'record' => null, - 'cityList' => City::getList(), - 'parkList' => Park::getList(), - 'contractAllowableCityList' => ContractAllowableCity::getList(), - 'mode' => 'add' + return view('admin.contract_allowable_cities.add', [ + 'record' => null, + 'cityList' => City::getList(), + 'parkList' => Park::getList(), ]); } + /** * 編集 */ @@ -97,32 +102,34 @@ class ContractAllowableCityController extends Controller { $record = ContractAllowableCity::getByPk($id); if (!$record) { - return redirect()->route('contract_allowable_cities')->with('error', 'データが存在しません'); + return redirect()->route('contract_allowable_cities') + ->with('error', 'データが存在しません'); } if ($request->isMethod('post')) { - $request->validate([ + $validated = $request->validate([ 'city_id' => 'required|integer', 'contract_allowable_city_name' => 'required|string|max:20', 'park_id' => 'required|integer', 'same_district_flag' => 'required|integer', ]); - $record->fill($request->all()); + $record->fill($validated); $record->operator_id = Auth::user()->ope_id; $record->save(); - return redirect()->route('contract_allowable_cities')->with('success', '更新しました'); + return redirect()->route('contract_allowable_cities') + ->with('success', '更新しました。'); } return view('admin.contract_allowable_cities.edit', [ - 'record' => $record, - 'cities' => City::getList(), - 'parks' => Park::getList(), - 'mode' => 'edit' + 'record' => $record, + 'cityList' => City::getList(), + 'parkList' => Park::getList(), ]); } + /** * 詳細参照（表示のみ） */ @@ -142,16 +149,29 @@ class ContractAllowableCityController extends Controller } /** - * 一括削除 + * 一括削除（単一・複数対応） */ public function delete(Request $request) { - if ($request->has('id')) { - ContractAllowableCity::deleteByPk($request->id); - return redirect()->route('contract_allowable_cities')->with('success', '削除しました'); - } + // バリデーション：'id'は必須、配列の場合は各要素が整数 + $request->validate([ + 'id' => 'required', + 'id.*' => 'integer', + ]); - return redirect()->route('contract_allowable_cities')->with('error', '削除対象が見つかりません'); + // idを配列化（単一でも複数でも対応） + $ids = (array)$request->input('id'); + + // 削除処理 + // ContractAllowableCity::destroy($ids) が使える場合 + $deleted = ContractAllowableCity::destroy($ids); + + // 削除件数でメッセージ分岐 + if ($deleted > 0) { + return redirect()->route('contract_allowable_cities')->with('success', '削除しました。'); + } else { + return redirect()->route('contract_allowable_cities')->with('error', '削除に失敗しました。'); + } } /** diff --git a/app/Http/Controllers/Admin/JurisdictionParkingController.php b/app/Http/Controllers/Admin/JurisdictionParkingController.php index a2f24d9..2308e5d 100644 --- a/app/Http/Controllers/Admin/JurisdictionParkingController.php +++ b/app/Http/Controllers/Admin/JurisdictionParkingController.php @@ -26,19 +26,33 @@ class JurisdictionParkingController extends Controller { if ($request->isMethod('post')) { $validated = $request->validate([ - 'jurisdiction_parking_name' => 'required|string|max:255', - 'operator_id' => 'nullable|integer', - 'park_id' => 'nullable|integer', + 'jurisdiction_parking_name' => [ + 'required', + 'string', + 'max:20', + ], + 'ope_id' => [ + 'required', + ], + 'park_id' => [ + 'required', + ], + 'operator_id' => [ + 'nullable', + 'integer', + ], ]); JurisdictionParking::create($validated); - return redirect()->route('jurisdiction_parkings')->with('success', '登録しました'); + + return redirect()->route('jurisdiction_parkings') + ->with('success', '登録しました。'); } $parks = Park::pluck('park_name', 'park_id'); - $operators = Ope::pluck('ope_name', 'ope_id'); + $opes = Ope::pluck('ope_name', 'ope_id'); - return view('admin.jurisdiction_parkings.add', compact('parks', 'operators')); + return view('admin.jurisdiction_parkings.add', compact('parks', 'opes')); } @@ -48,14 +62,27 @@ class JurisdictionParkingController extends Controller if ($request->isMethod('post')) { $validated = $request->validate([ - 'jurisdiction_parking_name' => 'required|string|max:255', - 'ope_id' => 'nullable|integer', - 'park_id' => 'nullable|integer', - 'operator_id' => 'nullable|integer', + 'jurisdiction_parking_name' => [ + 'required', + 'string', + 'max:20', + ], + 'ope_id' => [ + 'required', + ], + 'park_id' => [ + 'required', + ], + 'operator_id' => [ + 'nullable', + 'integer', + ], ]); $record->update($validated); - return redirect()->route('jurisdiction_parkings')->with('success', '更新しました'); + + return redirect()->route('jurisdiction_parkings') + ->with('success', '更新しました。'); } $parks = Park::pluck('park_name', 'park_id'); @@ -67,12 +94,22 @@ class JurisdictionParkingController extends Controller public function delete(Request $request) { - if ($request->has('pk')) { - JurisdictionParking::destroy($request->input('pk')); - return redirect()->route('jurisdiction_parkings')->with('success', '削除しました'); - } + $request->validate([ + 'pk' => 'required', + 'pk.*' => 'integer', // 各要素が整数であることを確認 + ]); - return redirect()->route('jurisdiction_parkings')->with('error', '削除対象が見つかりません'); + $ids = (array) $request->input('pk'); // 配列として取得 + + $deleted = JurisdictionParking::destroy($ids); + + if ($deleted > 0) { + return redirect()->route('jurisdiction_parkings') + ->with('success', '削除しました。'); + } else { + return redirect()->route('jurisdiction_parkings') + ->with('error', '削除に失敗しました。'); + } } public function info(Request $request, $jurisdiction_parking_id) diff --git a/app/Http/Controllers/Admin/PrintAreaController.php b/app/Http/Controllers/Admin/PrintAreaController.php index 98a48ee..a086544 100644 --- a/app/Http/Controllers/Admin/PrintAreaController.php +++ b/app/Http/Controllers/Admin/PrintAreaController.php @@ -37,7 +37,7 @@ class PrintAreaController extends Controller $validated['operator_id'] = auth()->id(); // 現在のログインユーザーを記録 PrintArea::create($validated); - return redirect()->route('print_areas')->with('success', '登録しました'); + return redirect()->route('print_areas')->with('success', '登録しました。'); } $parks = Park::pluck('park_name', 'park_id'); @@ -58,7 +58,7 @@ class PrintAreaController extends Controller $validated['operator_id'] = auth()->id(); // 更新者を記録 $record->update($validated); - return redirect()->route('print_areas')->with('success', '更新しました'); + return redirect()->route('print_areas')->with('success', '更新しました。'); } $parks = Park::pluck('park_name', 'park_id'); @@ -72,15 +72,26 @@ class PrintAreaController extends Controller return view('admin.print_areas.info', compact('record')); } - // 削除（複数可） public function delete(Request $request) { - if ($request->has('pk')) { - PrintArea::destroy($request->input('pk')); - return redirect()->route('print_areas')->with('success', '削除しました'); - } + // バリデーション：'pk'は必須、配列の場合は各要素が整数 + $request->validate([ + 'pk' => 'required', + 'pk.*' => 'integer', + ]); - return redirect()->route('print_areas')->with('error', '削除対象が見つかりません'); + // pkを配列化（単一でも配列でも対応） + $ids = (array)$request->input('pk'); + + // 削除処理 + $deleted = PrintArea::destroy($ids); + + // 削除結果によってメッセージを分岐 + if ($deleted > 0) { + return redirect()->route('print_areas')->with('success', '削除しました。'); + } else { + return redirect()->route('print_areas')->with('error', '削除に失敗しました。'); + } } // CSVエクスポート diff --git a/resources/js/app.js b/resources/js/app.js index 0822146..d409034 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -185,8 +185,8 @@ $('#register_edit').on('click', function (e) { $('#delete_edit').on('click', function (e) { e.preventDefault(); $.confirm({ - title: '確認ダイアログ', - content: 'このレコードを削除してよろしいですか？', + title: '削除ダイアログ', + content: '！削除してよろしいですか？', buttons: { ok: { text: "はい", diff --git a/resources/lang/ja/validation.php b/resources/lang/ja/validation.php index efbef22..3fdbdb2 100644 --- a/resources/lang/ja/validation.php +++ b/resources/lang/ja/validation.php @@ -387,6 +387,10 @@ return [ 'use_flag' => '契約内容フラグ', 'terms_created_at' => '契約内容作成日', 'terms_updated_at' => '契約内容更新日', +//SWA-98 + 'contract_allowable_city_id' => '契約許容市区マスタID', + 'contract_allowable_city_name' => '許容市区名', + 'same_district_flag' => '隣接区フラグ', ], ]; diff --git a/resources/views/admin/contract_allowable_cities/_form.blade.php b/resources/views/admin/contract_allowable_cities/_form.blade.php index bf04c40..c13ae22 100644 --- a/resources/views/admin/contract_allowable_cities/_form.blade.php +++ b/resources/views/admin/contract_allowable_cities/_form.blade.php @@ -1,94 +1,111 @@ -@php - $isEdit = $mode === 'edit'; - $isInfo = $mode === 'info'; -@endphp +
+
+ + @if ($errors->any()) +
+
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+
+ @endif -@if($isEdit || $isInfo) - -
- -
-
- -
-@endif + @if($isEdit) +
+ +
+ +
+
+ +
+
+ @endif - -
- -
-
- -
+ +
+
+ +
+
+ +
+
- -
- -
-
- -
+ +
+
+ +
+
+ +
+
- -
- -
-
- -
+ +
+
+ +
+
+ +
+
- -
- + +
+
+ +
+
+ +
+
+ + {{-- ▼ 下部ボタン --}} +
+
+ {{-- 登録ボタン --}} + @if($isEdit) + + @else + + @endif + + {{-- 削除ボタン（編集時のみ表示） --}} + @if($isEdit && !empty($record->contract_allowable_city_id)) + + @endif +
+
-
- -
- -@if($isInfo) - -
- -
-
- -
- - -
- -
-
- -
- - -
- -
-
- -
-@endif diff --git a/resources/views/admin/contract_allowable_cities/add.blade.php b/resources/views/admin/contract_allowable_cities/add.blade.php index f2fe216..c844952 100644 --- a/resources/views/admin/contract_allowable_cities/add.blade.php +++ b/resources/views/admin/contract_allowable_cities/add.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '契約許容市区マスタ（新規）') +@section('title', '新規') @section('content')
@@ -21,76 +21,16 @@
-
- @csrf -
- - {{-- 契約許容市区マスタID --}} -
- -
- -
-
- - {{-- 市区ID --}} -
- -
- -
-
- - {{-- 許容市区名 --}} -
- -
- -
-
- - {{-- 駐輪場ID --}} -
- -
- -
-
- - {{-- 隣接区フラグ --}} -
- -
- -
-
- - {{-- 下部登録ボタン --}} -
- -
- -
+ {{-- 新規登録フォーム --}} + + @csrf + @include('admin.contract_allowable_cities._form', [ + 'isEdit' => false, + 'record' => null, + 'cityList' => $cityList ?? [], + 'parkList' => $parkList ?? [] + ])
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/contract_allowable_cities/edit.blade.php b/resources/views/admin/contract_allowable_cities/edit.blade.php index a7063ed..6a06c1e 100644 --- a/resources/views/admin/contract_allowable_cities/edit.blade.php +++ b/resources/views/admin/contract_allowable_cities/edit.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '契約許容市区マスタ - 編集') +@section('title', '編集') @section('content')
@@ -21,70 +21,24 @@
-
- @csrf -
- {{-- 契約許容市区マスタID --}} -
- -
- -
-
- - {{-- 市区ID --}} -
- -
- -
-
- - {{-- 許容市区名 --}} -
- -
- -
-
- - {{-- 駐輪場 --}} -
- -
- -
-
- - {{-- 隣接区フラグ --}} -
- -
- -
-
- - {{-- ボタンエリア --}} -
- - 戻る -
-
+ {{-- 編集フォーム --}} + + @csrf + @include('admin.contract_allowable_cities._form', [ + 'isEdit' => true, + 'record' => $record, + 'cityList' => $cityList, // 改为 $cityList + 'parkList' => $parkList // 改为 $parkList + ])
+ + {{-- 削除フォーム --}} + +
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/contract_allowable_cities/info.blade.php b/resources/views/admin/contract_allowable_cities/info.blade.php deleted file mode 100644 index 4224800..0000000 --- a/resources/views/admin/contract_allowable_cities/info.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] 契約許容市区マスタ（詳細）') - -@section('content') - -
-
-
-
-

[東京都|〇〇駐輪場] 契約許容市区マスタ（詳細）

-
-
-
    -
  1. ホーム
    2. -
  2. 契約許容市区マスタ
    3. -
  3. 詳細
    4. -
-
-
-
-
- - -
- @php - $isEdit = false; - $isInfo = true; - @endphp - @include('admin.contract_allowable_cities._form') -
- - -
- 戻る -
-@endsection diff --git a/resources/views/admin/contract_allowable_cities/list.blade.php b/resources/views/admin/contract_allowable_cities/list.blade.php index ea7593f..f777f8d 100644 --- a/resources/views/admin/contract_allowable_cities/list.blade.php +++ b/resources/views/admin/contract_allowable_cities/list.blade.php @@ -2,6 +2,22 @@ @section('title', '[東京都|〇〇駐輪場] 契約許容市区マスタ') @section('content') + +@if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+@endif +@if (session('success')) +
+ {{ session('success') }} +
+@endif +
@@ -91,9 +107,9 @@
@csrf - + - diff --git a/resources/views/admin/jurisdiction_parkings/_form.blade.php b/resources/views/admin/jurisdiction_parkings/_form.blade.php index 652aa31..c2905a4 100644 --- a/resources/views/admin/jurisdiction_parkings/_form.blade.php +++ b/resources/views/admin/jurisdiction_parkings/_form.blade.php @@ -1,79 +1,97 @@ -@if($isEdit || $isInfo) - -
- -
-
- -
-@endif +
+
+ + @if ($errors->any()) +
+
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+
+ @endif - -
- -
-
- -
+ @if($isEdit) +
+ +
+ +
+
+ +
+
+ @endif - -
- -
-
- -
+ +
+
+ +
+
+ +
+
- -
- + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + {{-- ▼ 下部ボタン --}} +
+
+ {{-- 登録ボタン --}} + @if($isEdit) + + @else + + @endif + + {{-- 削除ボタン（編集時のみ表示） --}} + @if($isEdit && !empty($record->jurisdiction_parking_id)) + + @endif +
+
-
- -
- - -@if($isInfo) -
- -
-
- -
-@endif - - -@if($isInfo) -
- -
-
- -
- - -
- -
-
- -
-@endif \ No newline at end of file diff --git a/resources/views/admin/jurisdiction_parkings/add.blade.php b/resources/views/admin/jurisdiction_parkings/add.blade.php index 1c98616..b257da0 100644 --- a/resources/views/admin/jurisdiction_parkings/add.blade.php +++ b/resources/views/admin/jurisdiction_parkings/add.blade.php @@ -21,47 +21,11 @@
- - @csrf -
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- - {{-- 下部登録ボタン --}} -
- -
- -
+ {{-- 新規登録フォーム --}} + + @csrf + @include('admin.jurisdiction_parkings._form', ['isEdit' => false, 'record' => null])
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/jurisdiction_parkings/edit.blade.php b/resources/views/admin/jurisdiction_parkings/edit.blade.php index 2c9a002..1475c8e 100644 --- a/resources/views/admin/jurisdiction_parkings/edit.blade.php +++ b/resources/views/admin/jurisdiction_parkings/edit.blade.php @@ -11,7 +11,7 @@
  1. ホーム
    2. -
  2. 管轄駐輪場マスタ
    3. +
  3. 管轄駐輪場
  4. 編集
@@ -21,59 +21,21 @@
-
- @csrf -
- {{-- 管轄駐輪場ID（表示のみ） --}} -
- -
- -
-
+ {{-- 編集フォーム --}} + + @csrf + @include('admin.jurisdiction_parkings._form', [ + 'isEdit' => true, + 'record' => $record, + 'opes' => $opes, + 'parks' => $parks + ]) + - {{-- 管轄名 --}} -
- -
- -
-
- - {{-- オペレータ --}} -
- -
- -
-
- - {{-- 駐輪場 --}} -
- -
- -
-
- - {{-- ボタンエリア --}} -
- {{-- 下部登録ボタン --}} - - 戻る -
-
+ + @csrf +
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/jurisdiction_parkings/info.blade.php b/resources/views/admin/jurisdiction_parkings/info.blade.php deleted file mode 100644 index 4f0d60c..0000000 --- a/resources/views/admin/jurisdiction_parkings/info.blade.php +++ /dev/null @@ -1,41 +0,0 @@ -@extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] 管轄駐輪場') - -@section('content') -
-
-
-
-

[東京都|〇〇駐輪場] 管轄駐輪場

-
-
-
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. 管轄駐輪場 詳細
    4. -
-
-
-
-
- -
-
-
-
-
- @include('admin.jurisdiction_parkings._form', [ - 'record' => $record, - 'isEdit' => 0, - 'isInfo' => 1 - ]) -
-
-
- -
- {{ __('戻る') }} -
-
-
-@endsection \ No newline at end of file diff --git a/resources/views/admin/jurisdiction_parkings/list.blade.php b/resources/views/admin/jurisdiction_parkings/list.blade.php index 77d3fbb..34ea75c 100644 --- a/resources/views/admin/jurisdiction_parkings/list.blade.php +++ b/resources/views/admin/jurisdiction_parkings/list.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] 管轄駐輪場マスタ') +@section('title', '管轄駐輪場') @section('content') @@ -7,13 +7,13 @@
-

管轄駐輪場マスタ

+

管轄駐輪場

  1. ホーム
    2. -
  2. 管轄駐輪場マスタ
    3. +
  3. 管轄駐輪場
@@ -68,7 +68,7 @@
@csrf
+ 契約許容市区ID
- + {{-- ★ チェック + 編集 用の1列 --}}
diff --git a/resources/views/admin/print_areas/_form.blade.php b/resources/views/admin/print_areas/_form.blade.php index 552c427..89704cd 100644 --- a/resources/views/admin/print_areas/_form.blade.php +++ b/resources/views/admin/print_areas/_form.blade.php @@ -17,66 +17,78 @@ @endif -
- -
- @if($isInfo || $isEdit) - -
- -
+
+
+ {{-- バリデーションエラー表示 --}} + @if ($errors->any()) +
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
@endif -
-
- -
- -
-
- -
- -
- -
-
- - {{-- 下部登録ボタン --}} -
- @if($isInfo) - {{-- 詳細モード（info）では、編集ボタンを表示 --}} - {{ __('登録') }} - {{ __('編集') }} - @else - {{-- 登録 or 更新 --}} - - - {{-- 削除ボタン --}} + {{-- 管轄印刷エリアID（編集時のみ表示） --}} +
@if($isEdit) - - 削除 - + +
+ +
@endif - @endif -
+
+ {{-- 管轄印刷エリア名 --}} +
+ +
+ +
+
+ + {{-- 駐輪場 --}} +
+ +
+ +
+
+ + {{-- ▼ 下部ボタン --}} +
+
+ {{-- 登録ボタン --}} + @if($isEdit) + + @else + + @endif + + {{-- 削除ボタン（編集時のみ表示） --}} + @if($isEdit && !empty($record->print_area_id)) + + @endif +
+
diff --git a/resources/views/admin/print_areas/add.blade.php b/resources/views/admin/print_areas/add.blade.php index 4cc1705..53531e2 100644 --- a/resources/views/admin/print_areas/add.blade.php +++ b/resources/views/admin/print_areas/add.blade.php @@ -24,10 +24,8 @@ @csrf - @include('admin.print_areas._form', ['isEdit' => 0, 'isInfo' => 0]) - - - + @include('admin.print_areas._form', ['isEdit' => false]) +
diff --git a/resources/views/admin/print_areas/edit.blade.php b/resources/views/admin/print_areas/edit.blade.php index 476b7ce..577d0c6 100644 --- a/resources/views/admin/print_areas/edit.blade.php +++ b/resources/views/admin/print_areas/edit.blade.php @@ -1,15 +1,14 @@ @extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] シール印刷範囲 編集') +@section('title', '編集') @section('content') -
-
+

編集

-
+
  1. ホーム
  2. シール印刷範囲マスタ
    3. @@ -22,15 +21,20 @@
    -
    - @csrf + {{-- 編集フォーム --}} + + @csrf + @include('admin.print_areas._form', [ + 'record' => $record, + 'parks' => $parks, + 'isEdit' => true + ]) +
    - @include('admin.print_areas._form', [ - 'record' => $record, - 'parks' => $parks, - 'isEdit' => 1, - 'isInfo' => 0 - ]) + {{-- 削除フォーム --}} +
    diff --git a/resources/views/admin/print_areas/info.blade.php b/resources/views/admin/print_areas/info.blade.php deleted file mode 100644 index d2d3f7c..0000000 --- a/resources/views/admin/print_areas/info.blade.php +++ /dev/null @@ -1,30 +0,0 @@ -@extends('layouts.app') -@section('title', '詳細表示') - -@section('content') -
    -
    -
    -
    -

    シール印刷範囲マスタ - 詳細表示

    -
    -
    -
      -
    1. ホーム
      2. -
    2. シール印刷範囲マスタ
      3. -
    3. 詳細表示
      4. -
    -
    -
    -
    -
    - -
    -
    -
    - @csrf - @include('admin.print_areas._form', ['isEdit' => 0, 'isInfo' => 1]) -
    -
    -
    -@endsection diff --git a/resources/views/admin/print_areas/list.blade.php b/resources/views/admin/print_areas/list.blade.php index cede7da..d733b3a 100644 --- a/resources/views/admin/print_areas/list.blade.php +++ b/resources/views/admin/print_areas/list.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] シール印刷範囲マスタ') +@section('title', 'シール印刷範囲マスタ') @section('content') @@ -58,10 +58,10 @@
    @csrf - + {{-- チェック + 編集ボタン --}} - diff --git a/resources/views/admin/terms/_form.blade.php b/resources/views/admin/terms/_form.blade.php index 62c9467..146c8ab 100644 --- a/resources/views/admin/terms/_form.blade.php +++ b/resources/views/admin/terms/_form.blade.php @@ -42,7 +42,7 @@ use_flag ?? '') == 1 ? 'checked' : '' }}> - - -
    - use_flag ?? '') == 0 ? 'checked' : '' }}> - +
    +
    + use_flag ?? '') == 1 ? 'checked' : '' }}> + +
    +
    + use_flag ?? '') == 0 ? 'checked' : '' }}> + +
    @@ -115,16 +117,14 @@ {{-- ▼ 下部ボタン --}} -
    - +
    +
    {{-- 登録ボタン --}} @if($isEdit) - {{-- 編集画面用 --}} @else - {{-- 新規画面用 --}} @@ -137,8 +137,6 @@ @endif
    - -
    diff --git a/resources/views/admin/terms/add.blade.php b/resources/views/admin/terms/add.blade.php index 6ce00f9..67a7888 100644 --- a/resources/views/admin/terms/add.blade.php +++ b/resources/views/admin/terms/add.blade.php @@ -11,7 +11,7 @@
    1. ホーム
      2. -
    2. 利用契約マスタ
      3. +
    3. 利用規約マスタ
    4. 新規登録
    diff --git a/resources/views/admin/terms/edit.blade.php b/resources/views/admin/terms/edit.blade.php index c2e16e6..10123d1 100644 --- a/resources/views/admin/terms/edit.blade.php +++ b/resources/views/admin/terms/edit.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '利用契約 編集') +@section('title', '編集') @section('content')
    @@ -11,7 +11,7 @@
    1. ホーム
      2. -
    2. 利用契約マスタ
      3. +
    3. 利用規約マスタ
    4. 編集
    @@ -31,9 +31,7 @@ @csrf - - - +
    diff --git a/resources/views/admin/terms/info.blade.php b/resources/views/admin/terms/info.blade.php deleted file mode 100644 index 7c8d482..0000000 --- a/resources/views/admin/terms/info.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] 利用契約マスタ - 詳細') - -@section('content') - -
    -
    -
    -
    -

    [東京都|〇〇駐輪場] 利用契約マスタ - 詳細

    -
    -
    -
      -
    1. XX様info(ホーム)
      2. -
    2. [東京都|〇〇駐輪場]
      3. -
    3. 利用契約マスタ
      4. -
    4. 詳細
      5. -
    -
    -
    -
    -
    - -
    -
    -
    - @include('admin.terms._form', [ - 'term' => $term, - 'cities' => $cities, - 'isEdit' => false, - 'isInfo' => true - ]) - -
    -
    -@endsection \ No newline at end of file diff --git a/resources/views/admin/terms/list.blade.php b/resources/views/admin/terms/list.blade.php index e5435ab..f80dcc4 100644 --- a/resources/views/admin/terms/list.blade.php +++ b/resources/views/admin/terms/list.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '利用契約マスタ') +@section('title', '利用規約マスタ') @section('content') @@ -7,13 +7,13 @@
    -

    利用契約マスタ

    +

    利用規約マスタ

    1. ホーム
      2. -
    2. 利用契約マスタ
      3. +
    3. 利用規約マスタ
    diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index b838911..9425398 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -507,7 +507,7 @@
  3. -

    {{ __("利用契約マスタ") }}

     +

    {{ __("利用規約マスタ") }}

    5. + 印刷範囲ID