From 7913f58d195adb037a782baffbdf76615b1f62ac Mon Sep 17 00:00:00 2001 From: "kin.rinzen" Date: Fri, 5 Sep 2025 17:49:01 +0900 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E8=A1=A8=E7=A4=BA=E3=81=A8?= =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/RegularTypeController.php | 190 ++++++++++-------- app/Http/Controllers/Admin/ZoneController.php | 10 +- app/Http/Requests/RegularTypeRequest.php | 27 +++ app/Models/RegularType.php | 9 +- .../contract_allowable_cities/add.blade.php | 11 +- .../contract_allowable_cities/list.blade.php | 20 +- resources/views/admin/devices/list.blade.php | 4 +- .../admin/jurisdiction_parkings/add.blade.php | 13 +- .../jurisdiction_parkings/list.blade.php | 35 ++-- .../views/admin/managers/_form.blade.php | 17 -- resources/views/admin/managers/add.blade.php | 6 +- resources/views/admin/managers/edit.blade.php | 4 +- resources/views/admin/managers/list.blade.php | 16 +- .../views/admin/print_areas/_form.blade.php | 25 --- .../views/admin/print_areas/add.blade.php | 2 +- .../views/admin/print_areas/edit.blade.php | 2 +- .../views/admin/print_areas/list.blade.php | 22 +- .../views/admin/regular_types/_form.blade.php | 56 +++--- .../views/admin/regular_types/add.blade.php | 16 +- .../views/admin/regular_types/edit.blade.php | 17 +- .../views/admin/regular_types/list.blade.php | 20 +- .../views/admin/stations/_form.blade.php | 178 +++++++++++----- resources/views/admin/stations/add.blade.php | 135 ++----------- resources/views/admin/stations/edit.blade.php | 31 ++- .../views/admin/stations/import.blade.php | 16 -- resources/views/admin/stations/list.blade.php | 22 +- resources/views/admin/terms/_form.blade.php | 190 +++++++++--------- resources/views/admin/terms/add.blade.php | 2 +- resources/views/admin/terms/edit.blade.php | 2 +- resources/views/admin/terms/list.blade.php | 24 +-- resources/views/admin/zones/add.blade.php | 4 +- resources/views/admin/zones/edit.blade.php | 2 +- resources/views/admin/zones/info.blade.php | 2 +- resources/views/admin/zones/list.blade.php | 47 +++-- 34 files changed, 581 insertions(+), 596 deletions(-) create mode 100644 app/Http/Requests/RegularTypeRequest.php delete mode 100644 resources/views/admin/stations/import.blade.php diff --git a/app/Http/Controllers/Admin/RegularTypeController.php b/app/Http/Controllers/Admin/RegularTypeController.php index c610a15..e4a6db4 100644 --- a/app/Http/Controllers/Admin/RegularTypeController.php +++ b/app/Http/Controllers/Admin/RegularTypeController.php @@ -15,106 +15,118 @@ use Response; class RegularTypeController extends Controller { - public function list(Request $request) - { - $inputs = [ - 'isMethodPost' => 0, - 'isExport' => 0, - 'sort' => $request->input('sort', ''), - 'sort_type' => $request->input('sort_type', ''), - 'page' => $request->get('page', 1), - - ]; - $inputs['isMethodPost'] = $request->isMethod('post'); - $inputs['list'] = RegularType::search($inputs); - if ($inputs['list']->total() > 0 && $inputs['page'] > $inputs['list']->lastPage()) { - return redirect()->route('regular_types'); - } - return view('admin.regular_types.list', $inputs); - } - + public function add(Request $request) { - $inputs = [ - 'regular_type_id' => $request->input('regular_type_id'), // 定期種別ID - 'city_id' => $request->input('city_name', ''), // 市区名 - 'regular_class_1' => $request->input('regular_class_1'), // 定期種別1 - 'regular_class_2' => $request->input('regular_class_2'), // 定期種別2 - 'regular_class_3' => $request->input('regular_class_3'), // 定期種別3 - 'regular_class_6' => $request->input('regular_class_6'), // 定期種別6 - 'regular_class_12' => $request->input('regular_class_12'), // 定期種別12 - 'memo' => $request->input('memo'), // 備考 - ]; + // 画面用データ $dataList = $this->getDataDropList(); - $inputs = array_merge($inputs, $dataList); - if ($request->isMethod('POST')) { - $type = false; - $validation = new RegularTypeRequest(); - $rules = $validation->rules(); - $validator = Validator::make($request->all(), $rules, $validation->messages()); - if (!$validator->fails()) { - \DB::transaction(function () use ($inputs, &$type) { - $new = new RegularType(); - $new->fill($inputs); - if ($new->save()) { - $type = true; - } - }); - if ($type) { - $request->session()->flash('success', __('新しい成功を創造する。')); - return redirect()->route('regular_types'); - } else { - $request->session()->flash('error', __('新しい作成に失敗しました')); - } - } else { - $inputs['errorMsg'] = $this->__buildErrorMessasges($validator); + // フォーム入力（画面初期表示用） + $inputs = [ + 'city_id' => $request->input('city_id'), + 'regular_class_1' => $request->input('regular_class_1'), + 'regular_class_2' => $request->input('regular_class_2'), + 'regular_class_3' => $request->input('regular_class_3'), + 'regular_class_6' => $request->input('regular_class_6'), + 'regular_class_12' => $request->input('regular_class_12'), + 'memo' => $request->input('memo'), + ]; + $viewData = array_merge($inputs, $dataList); + + if ($request->isMethod('POST')) { + $validation = new RegularTypeRequest(); + $rules = $validation->rules(); + $validator = Validator::make($request->all(), $rules, $validation->messages()); + + if ($validator->fails()) { + $viewData['errorMsg'] = $this->buildErrorMessages($validator); + return view('admin.regular_types.add', array_merge($viewData, $request->all())); } + + // 仅允许写入的字段（白名单） + $payload = array_intersect_key($request->all(), array_flip([ + 'city_id', + 'regular_class_1', + 'regular_class_2', + 'regular_class_3', + 'regular_class_6', + 'regular_class_12', + 'memo', + ])); + + DB::transaction(function () use ($payload) { + $new = new RegularType(); + $new->fill($payload); + $new->operator_id = \Auth::user()->ope_id; + $new->save(); + }); + + $request->session()->flash('success', __('新しい成功を創造する。')); + return redirect()->route('regular_types'); } - return view('admin.regular_types.add', $inputs); + return view('admin.regular_types.add', $viewData); } - public function edit(Request $request, $pk, $view = '') + public function edit(Request $request, $id, $view = '') { - $regular_type = RegularType::getByPk($pk); - if (empty($pk) || empty($regular_type)) { - abort('404'); + $regular_type = RegularType::getById($id); + if (empty($id) || empty($regular_type)) { + abort(404); } - $data = $regular_type->getAttributes(); - $dataList = $this->getDataDropList(); - $data = array_merge($data, $dataList); - if ($request->isMethod('POST')) { - $type = false; - $validation = new RegularTypeRequest(); - $rules = $validation->rules(); - $validator = Validator::make($request->all(), $rules, $validation->messages()); - $requestAll = $request->all(); - $requestAll['city_id'] = $request->input('city_name'); - $data = array_merge($data, $requestAll); - if (!$validator->fails()) { - \DB::transaction(function () use ($data, &$type, $regular_type) { - $regular_type->fill($data); - $regular_type->save(); - $type = true; - }); - if ($type) { - $request->session()->flash('success', __('更新に成功しました')); - return redirect()->route('regular_types'); - } else { - $request->session()->flash('error', __('更新に失敗しました')); - } - } else { - $data['errorMsg'] = $this->__buildErrorMessasges($validator); + $data = array_merge($regular_type->getAttributes(), $this->getDataDropList()); + + if ($request->isMethod('POST')) { + + $validation = new RegularTypeRequest(); + $rules = $validation->rules(); + $validator = Validator::make($request->all(), $rules, $validation->messages()); + + $requestAll = $request->all(); + if (isset($requestAll['city_name']) && !isset($requestAll['city_id'])) { + $requestAll['city_id'] = $requestAll['city_name']; } + + $payload = array_intersect_key($requestAll, array_flip([ + 'city_id', + 'regular_class_1', + 'regular_class_2', + 'regular_class_3', + 'regular_class_6', + 'regular_class_12', + 'memo', + ])); + + if ($validator->fails()) { + $data['errorMsg'] = $this->buildErrorMessages($validator); + + $data = array_merge($data, $payload); + if ($view !== '') return view($view, $data); + return view('admin.regular_types.edit', $data); + } + + DB::transaction(function () use (&$regular_type, $payload) { + $regular_type->fill($payload); + $regular_type->save(); + }); + + $request->session()->flash('success', __('更新に成功しました')); + return redirect()->route('regular_types'); } - if ($view != '') { + + if ($view !== '') { return view($view, $data); } return view('admin.regular_types.edit', $data); } + /** バリデーションエラーをまとめる */ + protected function buildErrorMessages(\Illuminate\Contracts\Validation\Validator $validator): string + { + return implode("\n", $validator->errors()->all()); + } + public function delete(Request $request) { $arr_pk = $request->get('pk'); @@ -128,6 +140,7 @@ class RegularTypeController extends Controller return redirect()->route('regular_types')->with('error', __('削除するユーザーを選択してください。')); } + public function export(Request $request) { @@ -168,5 +181,20 @@ class RegularTypeController extends Controller $data['cities'] = City::getList(); return $data; } + public function list(Request $request) + { + $sort = $request->input('sort', 'regular_type_id'); + $sort_type = $request->input('sort_type', 'asc'); + + $list = \App\Models\RegularType::orderBy($sort, $sort_type)->paginate(20); + + return view('admin.regular_types.list', [ + 'list' => $list, + 'sort' => $sort, + 'sort_type' => $sort_type, + ]); + } + + } \ No newline at end of file diff --git a/app/Http/Controllers/Admin/ZoneController.php b/app/Http/Controllers/Admin/ZoneController.php index 1834da8..7228767 100644 --- a/app/Http/Controllers/Admin/ZoneController.php +++ b/app/Http/Controllers/Admin/ZoneController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use App\Models\Zone; +use Illuminate\Support\Facades\DB; class ZoneController extends Controller { @@ -47,11 +48,18 @@ class ZoneController extends Controller // ページネーション $zones = $query->orderBy($sort, $sort_type)->paginate(20); + // === 下拉选单用の一覧データ === + $parkList = DB::table('park')->pluck('park_name', 'park_id'); + $ptypeList = DB::table('ptype')->pluck('ptype_id', 'ptype_id'); // 暂时显示 ID + $psectionList = DB::table('psection')->pluck('psection_id', 'psection_id'); // 暂时显示 ID + return view('admin.zones.list', compact( - 'zones', 'sort', 'sort_type' + 'zones', 'sort', 'sort_type', + 'parkList', 'ptypeList', 'psectionList' )); } + /** * 新規登録 */ diff --git a/app/Http/Requests/RegularTypeRequest.php b/app/Http/Requests/RegularTypeRequest.php new file mode 100644 index 0000000..de24ff7 --- /dev/null +++ b/app/Http/Requests/RegularTypeRequest.php @@ -0,0 +1,27 @@ + 'required|string|max:255', + ]; + } + + public function messages() + { + return [ + 'name.required' => '市区名は必須です。', + ]; + } +} diff --git a/app/Models/RegularType.php b/app/Models/RegularType.php index d8fd0d6..ae7de57 100644 --- a/app/Models/RegularType.php +++ b/app/Models/RegularType.php @@ -29,6 +29,7 @@ class RegularType extends Model 'regular_class_6', 'regular_class_12', 'memo', + 'operator_id', ]; public static function boot() @@ -60,14 +61,14 @@ class RegularType extends Model return $list; } - public static function getByPk($pk) + public static function getById($id) { - return self::find($pk); + return self::find($id); } - public static function deleteByPk($arr) + public static function deleteById($id) { - return self::whereIn('regular_type_id', $arr)->delete(); + return self::where('regular_type_id', $id)->delete(); } public function getCity() diff --git a/resources/views/admin/contract_allowable_cities/add.blade.php b/resources/views/admin/contract_allowable_cities/add.blade.php index a42a3e4..f2fe216 100644 --- a/resources/views/admin/contract_allowable_cities/add.blade.php +++ b/resources/views/admin/contract_allowable_cities/add.blade.php @@ -6,13 +6,13 @@
-

新規

+

新規登録

  1. ホーム
  2. 契約許容市区マスタ
    3. -
  3. 新規
    4. +
  4. 新規登録
@@ -25,13 +25,6 @@ @csrf
- {{-- 上部登録ボタン --}} -
- -
- -
- {{-- 契約許容市区マスタID --}}
diff --git a/resources/views/admin/contract_allowable_cities/list.blade.php b/resources/views/admin/contract_allowable_cities/list.blade.php index 78796b0..ea7593f 100644 --- a/resources/views/admin/contract_allowable_cities/list.blade.php +++ b/resources/views/admin/contract_allowable_cities/list.blade.php @@ -12,7 +12,7 @@
  1. ホーム
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. 契約許容市区マスタ
@@ -23,7 +23,7 @@
- +

絞り込み

@@ -90,11 +90,11 @@
@csrf - +
- @@ -103,15 +103,13 @@ - + @foreach($list as $item) - diff --git a/resources/views/admin/devices/list.blade.php b/resources/views/admin/devices/list.blade.php index 1451fc7..2275378 100644 --- a/resources/views/admin/devices/list.blade.php +++ b/resources/views/admin/devices/list.blade.php @@ -8,8 +8,8 @@

{{ __('デバイス管理マスタ') }}

    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
    4. +
  4. {{ __('デバイス管理マスタ') }}
diff --git a/resources/views/admin/jurisdiction_parkings/add.blade.php b/resources/views/admin/jurisdiction_parkings/add.blade.php index 309767e..1c98616 100644 --- a/resources/views/admin/jurisdiction_parkings/add.blade.php +++ b/resources/views/admin/jurisdiction_parkings/add.blade.php @@ -6,13 +6,13 @@
-

新規

+

新規登録

  1. ホーム
  2. 管轄駐輪場
    3. -
  3. 新規
    4. +
  4. 新規登録
@@ -24,13 +24,6 @@ @csrf
- {{-- 上部登録ボタン --}} -
- -
- -
-
@@ -64,7 +57,7 @@ {{-- 下部登録ボタン --}}
- +
diff --git a/resources/views/admin/jurisdiction_parkings/list.blade.php b/resources/views/admin/jurisdiction_parkings/list.blade.php index f67cae9..77d3fbb 100644 --- a/resources/views/admin/jurisdiction_parkings/list.blade.php +++ b/resources/views/admin/jurisdiction_parkings/list.blade.php @@ -11,8 +11,8 @@
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
    4. +
  4. 管轄駐輪場マスタ
@@ -30,13 +30,25 @@ -
+
+ +
+ @csrf + + +
-
+
{{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }}
@@ -55,12 +67,12 @@
@csrf -
- + + 契約許容市区ID 市区ID隣接区フラグ
+
- - {{ __('編集') }} + + 編集
{{ $item->contract_allowable_city_id }}
+
{{-- ★ チェック + 編集 用の1列 --}} - @@ -68,15 +80,14 @@ - + @foreach($list as $item) {{-- ★ チェック + 編集ボタン --}} - diff --git a/resources/views/admin/managers/_form.blade.php b/resources/views/admin/managers/_form.blade.php index 47ee948..eeea66c 100644 --- a/resources/views/admin/managers/_form.blade.php +++ b/resources/views/admin/managers/_form.blade.php @@ -21,23 +21,6 @@ $isAddPage = request()->routeIs('managers_add'); // 新規ページなら true @endphp -{{-- 上部ボタン --}} - -
-
- @if($isInfo) - {{ __('登録') }} - {{ __('編集') }} - @else - - {{ __('戻る') }} - @endif -
-
- -
diff --git a/resources/views/admin/managers/add.blade.php b/resources/views/admin/managers/add.blade.php index cb83531..20c4ae4 100644 --- a/resources/views/admin/managers/add.blade.php +++ b/resources/views/admin/managers/add.blade.php @@ -6,12 +6,12 @@
-

新規

+

新規登録

    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
    4. +
  4. 駐輪場管理者マスタ
  5. 新規登録
diff --git a/resources/views/admin/managers/edit.blade.php b/resources/views/admin/managers/edit.blade.php index 13f501d..bbd8fd6 100644 --- a/resources/views/admin/managers/edit.blade.php +++ b/resources/views/admin/managers/edit.blade.php @@ -14,8 +14,8 @@
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
    4. +
  4. 駐輪場管理者マスタ
  5. 編集
diff --git a/resources/views/admin/managers/list.blade.php b/resources/views/admin/managers/list.blade.php index 462ed1d..d662fc8 100644 --- a/resources/views/admin/managers/list.blade.php +++ b/resources/views/admin/managers/list.blade.php @@ -61,12 +61,12 @@
@csrf -
- + + 管轄駐輪場ID 管轄名駐車場
+
- - {{ __('編集') }} + + 編集
+
{{-- ★ チェック + 編集ボタン列 --}} - @@ -82,17 +82,17 @@ - + @foreach($list as $item) {{-- チェック＋編集ボタン --}} - + diff --git a/resources/views/admin/print_areas/_form.blade.php b/resources/views/admin/print_areas/_form.blade.php index 42a887c..552c427 100644 --- a/resources/views/admin/print_areas/_form.blade.php +++ b/resources/views/admin/print_areas/_form.blade.php @@ -19,31 +19,6 @@
- {{-- 上部登録ボタン --}} -
- @if($isInfo) - {{-- 詳細モード（info）では、編集ボタンを表示 --}} - {{ __('登録') }} - {{ __('編集') }} - @else - {{-- 登録 or 更新 --}} - - - {{-- 削除ボタン--}} - @if($isEdit) - - 削除 - - @endif - @endif -
- -
-
@if($isInfo || $isEdit) diff --git a/resources/views/admin/print_areas/add.blade.php b/resources/views/admin/print_areas/add.blade.php index 925cca8..4cc1705 100644 --- a/resources/views/admin/print_areas/add.blade.php +++ b/resources/views/admin/print_areas/add.blade.php @@ -6,7 +6,7 @@
-

新規

+

新規登録

    diff --git a/resources/views/admin/print_areas/edit.blade.php b/resources/views/admin/print_areas/edit.blade.php index 8a15a79..476b7ce 100644 --- a/resources/views/admin/print_areas/edit.blade.php +++ b/resources/views/admin/print_areas/edit.blade.php @@ -11,7 +11,7 @@
    -
  1. XX様info(ホーム)
    2. +
  2. ホーム
  3. シール印刷範囲マスタ
  4. 編集
diff --git a/resources/views/admin/print_areas/list.blade.php b/resources/views/admin/print_areas/list.blade.php index 09c9c01..cede7da 100644 --- a/resources/views/admin/print_areas/list.blade.php +++ b/resources/views/admin/print_areas/list.blade.php @@ -11,8 +11,8 @@
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
    4. +
  4. シール印刷範囲マスタ
@@ -36,11 +36,13 @@ +
{{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }}
+
@if(session('success')) @@ -55,26 +57,26 @@
@csrf -
- + + 駐輪場管理者ID 駐輪場管理者名退職日
+
- - {{ __('編集') }} + + 編集
{{ $item->manager_id }} {{ $item->manager_name }} {{ $item->manager_type }}
+
{{-- チェック + 編集ボタン --}} - - + + {{-- データ表示 --}} @foreach($list as $item) - diff --git a/resources/views/admin/regular_types/_form.blade.php b/resources/views/admin/regular_types/_form.blade.php index 46b3946..15f67ac 100644 --- a/resources/views/admin/regular_types/_form.blade.php +++ b/resources/views/admin/regular_types/_form.blade.php @@ -16,20 +16,13 @@ {!! $errorMsg !!} @endif -
- @if($isInfo) - {{__('登録')}} - {{__('編集')}} - @else - - @endIf -
+
@if($isEdit || $isInfo)
- +
@@ -43,19 +36,20 @@
- +
- + @foreach($cities as $key => $val) @endforeach
+
- +
@@ -77,7 +71,7 @@
- +
@@ -99,7 +93,7 @@
- +
@@ -121,7 +115,7 @@
- +
@@ -142,7 +136,7 @@
- +
@@ -160,8 +154,11 @@
+ + +
- +
@@ -169,12 +166,25 @@ name="memo" @if($isInfo) readonly @endif>{{$memo}}
+
- @if($isInfo) - {{__('登録')}} - {{__('編集')}} + + @if(!$isEdit) + {{-- 新規登録画面の場合：「登録」ボタンを表示 --}} + + @else - - @endIf + {{-- 編集画面の場合：「更新」「戻る」ボタンを表示 --}} + + + + {{ __('戻る') }} + + @endif +
diff --git a/resources/views/admin/regular_types/add.blade.php b/resources/views/admin/regular_types/add.blade.php index ec66dee..97065c2 100644 --- a/resources/views/admin/regular_types/add.blade.php +++ b/resources/views/admin/regular_types/add.blade.php @@ -8,14 +8,13 @@
-

[東京都|〇〇駐輪場] 定期種別マスタ

+

新規登録

    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. 定期種別マスタ
    4. -
  4. [東京都|〇〇駐輪場] 定期種別マスタ
    5. +
  5. ホーム
    6. +
  6. 定期種別マスタ
    7. +
  7. 新規登録
@@ -40,12 +39,7 @@
- -
- - - -
+
diff --git a/resources/views/admin/regular_types/edit.blade.php b/resources/views/admin/regular_types/edit.blade.php index 40da7c2..30c7719 100644 --- a/resources/views/admin/regular_types/edit.blade.php +++ b/resources/views/admin/regular_types/edit.blade.php @@ -8,14 +8,13 @@
-

[東京都|〇〇駐輪場] 定期種別マスタ

+

編集

    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. 定期種別マスタ
    4. -
  4. 利用者マスタ
    5. +
  5. ホーム
    6. +
  6. 定期種別マスタ
    7. +
  7. 編集
@@ -40,12 +39,8 @@
- -
- - - -
+ +
diff --git a/resources/views/admin/regular_types/list.blade.php b/resources/views/admin/regular_types/list.blade.php index a439d21..f2b8a21 100644 --- a/resources/views/admin/regular_types/list.blade.php +++ b/resources/views/admin/regular_types/list.blade.php @@ -11,8 +11,7 @@
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
  4. 定期種別マスタ
@@ -34,7 +33,7 @@
- +
{{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }}
@@ -61,13 +60,14 @@
@csrf -
- + + 印刷範囲ID 印刷範囲名 駐輪場名
+
- - {{ __('編集') }} + + 編集
{{ $item->print_area_id }}
+
{{-- チェック + 編集ボタン --}} + {{-- ソート --}} @@ -78,19 +78,19 @@ - + @php $rc = \App\Models\RegularType::RegularClass; @endphp @foreach($list as $item) - + diff --git a/resources/views/admin/stations/_form.blade.php b/resources/views/admin/stations/_form.blade.php index 4397bbc..8f752b5 100644 --- a/resources/views/admin/stations/_form.blade.php +++ b/resources/views/admin/stations/_form.blade.php @@ -11,64 +11,140 @@ @endif -
- 戻る -
+@php + // $isEdit = 1 or 0 +@endphp
-
- {{-- 近傍駅名 --}} -
- -
-
- -
+
- + 定期種別ID 市区名 定期種別1備考
+
- - {{ __('編集') }} + + 編集
{{ $item->regular_type_id }} {{ $item->getCity()?->city_name ?? '-' }} {{ __($rc[$item->regular_class_1] ?? '-') }}
+ {{-- 近傍駅ID（自動採番） --}} + + + + - {{-- フリガナ --}} -
- -
-
- -
+ {{-- 駐輪場ID --}} + + + + + + {{-- 近傍駅 --}} + + + + + + {{-- 近傍駅ふりがな --}} + + + + {{-- 路線名 --}} -
- -
-
- -
+ + + + - {{-- park_id --}} -
- -
-
- -
+ {{-- 緯度 --}} + + + + - {{-- operator_id --}} -
- -
-
- -
- + {{-- 経度 --}} + + + + +
{{ __('近傍駅ID') }} + +
{{ __('駐車場ID') }} + +
{{ __('近傍駅') }} ※ + + @error('station_neighbor_station') +
{{ $message }}
+ @enderror +
{{ __('近傍駅ふりがな') }} ※ + + @error('station_name_ruby') +
{{ $message }}
+ @enderror +
{{ __('路線名') }} ※ + + @error('station_route_name') +
{{ $message }}
+ @enderror +
{{ __('近傍駅座標（緯度）') }} ※ + + @error('latitude') +
{{ $message }}
+ @enderror +
{{ __('近傍駅座標（経度）') }} ※ + + @error('longitude') +
{{ $message }}
+ @enderror +
-
- + {{-- 登録・削除 ボタン --}} +
+ @if($isInfo) + {{-- 詳細画面：編集に遷移 --}} + + + 編集 + + @else + {{-- 新規／編集 共通フォーム --}} + + + {{-- 編集時のみ削除可能 --}} + @if($isEdit && isset($station->id)) + + @csrf + + + + @endif + @endif
+ +@section('scripts') + +@endsection diff --git a/resources/views/admin/stations/add.blade.php b/resources/views/admin/stations/add.blade.php index 923d74e..68b68f5 100644 --- a/resources/views/admin/stations/add.blade.php +++ b/resources/views/admin/stations/add.blade.php @@ -6,13 +6,13 @@
-

[東京都|〇〇駐輪場] 近傍駅マスタ

+

新規登録

    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. [東京都|〇〇駐輪場] 近傍駅マスタ
    4. +
  4. ホーム
    5. +
  5. 近傍駅マスタ
    6. +
  6. 新規登録
@@ -21,125 +21,16 @@
-
-
-
- @csrf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
近傍駅ID - -
駐車場ID - -
近傍駅 ※ - -
近傍駅ふりがな ※ - -
路線名 ※ - -
近傍駅座標（緯度） ※ - -
近傍駅座標（経度） ※ - -
- -
- - - - - - @csrf - - -
- - - -
+
+
+ @csrf + @include('admin.stations._form', [ + 'isEdit' => 0, + 'isInfo' => 0, + 'station' => $station ?? null + ]) +
@endsection - -@section('scripts') - -@endsection - - diff --git a/resources/views/admin/stations/edit.blade.php b/resources/views/admin/stations/edit.blade.php index 280f238..44622ab 100644 --- a/resources/views/admin/stations/edit.blade.php +++ b/resources/views/admin/stations/edit.blade.php @@ -2,18 +2,17 @@ @section('title', '[東京都|〇〇駐輪場] 近傍駅マスタ') @section('content') - +
-

[東京都|〇〇駐輪場] 近傍駅マスタ

+

編集

    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. 近傍駅マスタ
    4. +
  4. ホーム
    5. +
  5. 近傍駅マスタ
  6. 編集
@@ -21,19 +20,19 @@
- +{{-- フォーム --}}
-
-
-
-
- @csrf - @include('admin.stations._form', ['isEdit' => 1, 'isInfo' => 0, 'station' => $station]) -
-
-
+
+
+ @csrf + @include('admin.stations._form', [ + 'isEdit' => 1, + 'isInfo' => 0, + 'station' => $station + ]) +
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/admin/stations/import.blade.php b/resources/views/admin/stations/import.blade.php deleted file mode 100644 index 4ce8c45..0000000 --- a/resources/views/admin/stations/import.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -@extends('layouts.admin') - -@section('content') -

近傍駅 インポート

- -
- @csrf -
- - -
- -
- -戻る -@endsection diff --git a/resources/views/admin/stations/list.blade.php b/resources/views/admin/stations/list.blade.php index 929887c..b96a32d 100644 --- a/resources/views/admin/stations/list.blade.php +++ b/resources/views/admin/stations/list.blade.php @@ -11,8 +11,8 @@
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
    4. +
  4. 近傍駅マスタ
@@ -67,13 +67,14 @@
@csrf - +
{{-- ★ チェック + 編集 用の1列 --}} - + {{-- ソート --}} @@ -83,18 +84,17 @@ - + @foreach($stations as $station) {{-- ★ 同じセル内に チェック + 編集ボタン） --}} - - + diff --git a/resources/views/admin/terms/_form.blade.php b/resources/views/admin/terms/_form.blade.php index c5d37af..004d026 100644 --- a/resources/views/admin/terms/_form.blade.php +++ b/resources/views/admin/terms/_form.blade.php @@ -4,109 +4,109 @@
{{ Session::get('error') }}
@endif -
- - {{-- 登録・削除 ボタン --}} -
- @if($isInfo) - 編集 - @else - - @if($isEdit) - 削除 - @endif +
+
+
+
+ {{-- 利用契約ID --}} + @if($isEdit || $isInfo) +
+ +
+ +
+
@endif -
-
- {{-- 利用契約ID --}} - @if($isEdit || $isInfo) -
- -
- -
-
- @endif + {{-- 市区ID --}} +
+ +
+ +
+
- {{-- 市区ID --}} -
- -
- -
-
+ {{-- 使用中 --}} +
+ +
+
+ use_flag ?? '') == 1) checked @endif @if($isInfo) disabled @endif> + +
+
+ use_flag ?? '') == 0) checked @endif @if($isInfo) disabled @endif> + +
+
+
- {{-- 使用中 --}} -
- -
-
- use_flag ?? '') == 1) checked @endif @if($isInfo) disabled @endif> - -
-
- use_flag ?? '') == 0) checked @endif @if($isInfo) disabled @endif> - -
-
-
+ {{-- リビジョン --}} +
+ +
+ +
+
- {{-- リビジョン --}} -
- -
- -
-
+ {{-- 契約内容 --}} +
+ +
+ +
+
- {{-- 契約内容 --}} -
- -
- -
-
+ {{-- 備考 --}} +
+ +
+ +
+
- {{-- 備考 --}} -
- -
- -
-
+ {{-- 使用開始日 --}} +
+ +
+ +
+
- {{-- 使用開始日 --}} -
- -
- -
-
+ {{-- 登録・削除 ボタン --}} +
+ @if($isInfo) + {{-- 詳細画面：編集に遷移 --}} + + 編集 + + @else + {{-- 新規／編集 共通フォーム --}} + - {{-- 登録・削除 ボタン --}} -
- @if($isInfo) - 編集 - @else - - @if($isEdit) - 削除 + {{-- 編集時のみ削除可能 --}} + @if($isEdit && isset($term->terms_id)) + + @csrf + @method('DELETE') + + + @endif @endif - @endif +
+
- -
\ No newline at end of file +
+ diff --git a/resources/views/admin/terms/add.blade.php b/resources/views/admin/terms/add.blade.php index 982dd7b..2ad9201 100644 --- a/resources/views/admin/terms/add.blade.php +++ b/resources/views/admin/terms/add.blade.php @@ -12,7 +12,7 @@
  1. ホーム
  2. 利用契約マスタ
    3. -
  3. 新規
    4. +
  4. 新規登録
diff --git a/resources/views/admin/terms/edit.blade.php b/resources/views/admin/terms/edit.blade.php index c641e30..4a5f9b6 100644 --- a/resources/views/admin/terms/edit.blade.php +++ b/resources/views/admin/terms/edit.blade.php @@ -6,7 +6,7 @@
-

利用契約 編集

+

編集

    diff --git a/resources/views/admin/terms/list.blade.php b/resources/views/admin/terms/list.blade.php index be335ee..c38bced 100644 --- a/resources/views/admin/terms/list.blade.php +++ b/resources/views/admin/terms/list.blade.php @@ -11,8 +11,8 @@
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. +
  3. ホーム
    4. +
  4. 利用契約マスタ
@@ -31,13 +31,12 @@ -
+
-
-
+
{{ $terms->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }}
@@ -62,12 +61,12 @@
@csrf -
- + + 近傍駅ID 駐車場ID 近傍駅近傍駅座標（経度）
+
- - {{ __('編集') }} + + 編集
{{ $station->station_id }} {{ $station->park_id }} {{ $station->station_neighbor_station }}
+
{{-- ★ チェック + 編集 用の1列 --}} - - + @foreach($terms as $term) {{-- ★ チェックボックス + 編集ボタン --}} - diff --git a/resources/views/admin/zones/add.blade.php b/resources/views/admin/zones/add.blade.php index 6492f99..5af71e2 100644 --- a/resources/views/admin/zones/add.blade.php +++ b/resources/views/admin/zones/add.blade.php @@ -7,11 +7,11 @@
-

新規

+

新規登録

    -
  1. XX様info(ホーム)
    2. +
  2. ホーム
  3. ゾーンマスタ
  4. 新規登録
diff --git a/resources/views/admin/zones/edit.blade.php b/resources/views/admin/zones/edit.blade.php index b07c211..4ae6e96 100644 --- a/resources/views/admin/zones/edit.blade.php +++ b/resources/views/admin/zones/edit.blade.php @@ -11,7 +11,7 @@
    -
  1. XX様info(ホーム)
    2. +
  2. ホーム
  3. ゾーンマスタ
  4. 編集
diff --git a/resources/views/admin/zones/info.blade.php b/resources/views/admin/zones/info.blade.php index 0227c52..4bdbcc6 100644 --- a/resources/views/admin/zones/info.blade.php +++ b/resources/views/admin/zones/info.blade.php @@ -11,7 +11,7 @@
    -
  1. XX様info(ホーム)
    2. +
  2. ホーム
  3. ゾーンマスタ
  4. 詳細
diff --git a/resources/views/admin/zones/list.blade.php b/resources/views/admin/zones/list.blade.php index cd162df..b3b5248 100644 --- a/resources/views/admin/zones/list.blade.php +++ b/resources/views/admin/zones/list.blade.php @@ -11,7 +11,7 @@
    -
  1. XX様info(ホーム)
    2. +
  2. ホーム
  3. ゾーンマスタ
@@ -35,27 +35,46 @@
- + + 利用契約ID @@ -84,15 +83,14 @@
+
- - {{ __('編集') }} + + 編集
{{ $term->terms_id }}
- + - + - +
駐輪場ID駐輪場ID - + 駐輪分類ID駐輪分類ID - +
車種区分ID車種区分ID - +
+
@@ -82,7 +101,7 @@
@csrf - +
@@ -139,11 +158,11 @@ @foreach($zones as $item) - - +
+
- 編集 + 編集