From 9a6abe680f0f10b48ffb9df446f28e9461a41f72 Mon Sep 17 00:00:00 2001 From: "kin.rinzen" Date: Wed, 8 Oct 2025 14:50:40 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AA=E3=83=9A=E3=83=AC=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=82=AD=E3=83=A5=E3=83=BC=E7=94=BB=E9=9D=A2=E3=81=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20-=20=E3=83=AB=E3=83=BC=E3=83=86=E3=82=A3=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/OperatorQueController.php | 36 ++-- .../views/admin/operator_ques/_form.blade.php | 169 ++++++++++++------ .../views/admin/operator_ques/add.blade.php | 19 +- .../views/admin/operator_ques/edit.blade.php | 24 ++- .../views/admin/operator_ques/info.blade.php | 53 ------ .../views/admin/operator_ques/list.blade.php | 63 ++----- resources/views/admin/opes/_form.blade.php | 4 +- resources/views/layouts/app.blade.php | 4 +- routes/web.php | 2 +- 9 files changed, 182 insertions(+), 192 deletions(-) delete mode 100644 resources/views/admin/operator_ques/info.blade.php diff --git a/app/Http/Controllers/Admin/OperatorQueController.php b/app/Http/Controllers/Admin/OperatorQueController.php index c192e4f..81250ff 100644 --- a/app/Http/Controllers/Admin/OperatorQueController.php +++ b/app/Http/Controllers/Admin/OperatorQueController.php @@ -22,7 +22,8 @@ class OperatorQueController extends Controller public function list(Request $request) { $sort = $request->input('sort', 'que_id'); - $sort_type = $request->input('sort_type', 'desc'); + $sort_type = $request->input('sort_type', 'asc'); + $que_status = $request->input('que_status'); // 許可されたカラム名のリスト（DB定義に合わせて） $allowedSorts = ['que_id', 'ope_id', 'que_status', 'created_at', 'updated_at']; @@ -38,34 +39,46 @@ class OperatorQueController extends Controller $query = OperatorQue::query(); // フィルタリング（絞り込み） - if ($request->filled('que_status')) { - $query->where('que_status', $request->input('que_status')); + if (!empty($que_status)) { + $query->where('que_status', $que_status); } $list = $query->orderBy($sort, $sort_type) ->paginate(\App\Utils::item_per_page ?? 20); - return view('admin.operator_ques.list', compact('list', 'sort', 'sort_type')); + // view に $que_status を渡す + return view('admin.operator_ques.list', compact('list', 'sort', 'sort_type', 'que_status')); } + /** * 新規登録（画面/処理） */ public function add(Request $request) { if ($request->isMethod('get')) { - // 新規時は空の値でフォーム描画 - return view('admin.operator_ques.add', $this->formPayload()); + // 新規時は空のレコードを用意してフォーム描画 + return view('admin.operator_ques.add', array_merge( + $this->formPayload(), + [ + 'isEdit' => false, + 'record' => new OperatorQue(), // ← ★ _form.blade.php で使う用 + 'que_id' => null, + ] + )); } + // POST時：バリデーション $data = $this->validateRequest($request); + // 登録処理 OperatorQue::create($data); return redirect()->route('operator_ques')->with('success', 'オペレーターキューを登録しました。'); } + /** * 編集（画面/処理） */ @@ -76,7 +89,10 @@ class OperatorQueController extends Controller if ($request->isMethod('get')) { return view('admin.operator_ques.edit', array_merge( $this->formPayload($que), - ['que_id' => $que->que_id] + [ + 'que_id' => $que->que_id, + 'record' => $que, + ] )); } @@ -84,7 +100,7 @@ class OperatorQueController extends Controller $que->fill($data)->save(); - return redirect()->route('operator_ques')->with('success', 'オペレーターキューを更新しました。'); + return redirect()->route('operator_ques')->with('success', 'オペレータキューを更新しました。'); } /** @@ -233,9 +249,9 @@ class OperatorQueController extends Controller private function validateRequest(Request $request, $queId = null): array { $rules = [ - 'user_id' => 'required|integer', + 'user_id' => 'nullable|integer', 'contract_id' => 'nullable|integer', - 'park_id' => 'required|integer', + 'park_id' => 'nullable|integer', 'que_class' => 'required|integer', 'que_comment' => 'nullable|string|max:2000', 'que_status' => 'required|integer', diff --git a/resources/views/admin/operator_ques/_form.blade.php b/resources/views/admin/operator_ques/_form.blade.php index c1c195e..afaad26 100644 --- a/resources/views/admin/operator_ques/_form.blade.php +++ b/resources/views/admin/operator_ques/_form.blade.php @@ -6,89 +6,128 @@ @elseif(Session::has('error'))
-

{{__('誤差')}}:

+

{{ __('入力内容に不備があります:') }}:

{!! Session::get('error') !!}
@elseif(isset($errorMsg))
-

{{__('誤差')}}:

+

{{ __('入力内容に不備があります:') }}:

{!! $errorMsg !!}
@endif
+ @if ($errors->any()) +
+

入力内容に不備があります:

+
    + @foreach ($errors->all() as $error) +
  1. {{ $error }}
    2. + @endforeach +
+
+ @endif +
- @if($isEdit || $isInfo) - + {{-- キューID（編集時のみ表示） --}} + @if($isEdit)
- +
- +
- @endif - + + {{-- 利用者名 --}}
- +
- + @foreach($users as $item) - + @endforeach
- - + {{-- 携帯電話番号 --}}
- +
- +
- + {{-- 自宅電話番号 --}}
- +
- +
- + {{-- 定期契約ID --}}
- +
- +
+
+ + {{-- 駐輪場 --}} +
+ +
+
+
- + {{-- キュー種別 --}}
- +
- @foreach(\App\Models\OperatorQue::QueClass as $key => $item)
- - + {{-- キューコメント --}}
- +
- +
- - + {{-- キューステータス --}}
- +
- @foreach(\App\Models\OperatorQue::QueStatus as $key => $item)
- + {{-- キューステータスコメント --}}
- +
- - +
+
- {{-- 下部ボタン --}} - @if($isEdit) - - - @else - - - @endif + {{-- ▼ 下部ボタン --}} +
+
+ {{-- 登録ボタン --}} + @if($isEdit) + + @else + + @endif + + {{-- 削除ボタン（編集時のみ表示） --}} + @if($isEdit) + + @endif + +
+
- diff --git a/resources/views/admin/operator_ques/add.blade.php b/resources/views/admin/operator_ques/add.blade.php index 23ee552..8759241 100644 --- a/resources/views/admin/operator_ques/add.blade.php +++ b/resources/views/admin/operator_ques/add.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] オペレータキュー') +@section('title', '新規') @section('content') @@ -8,13 +8,13 @@
-

新規登録

+

新規

  1. ホーム
  2. オペレータキュー
    3. -
  3. 新規登録
    4. +
  4. 新規
@@ -30,12 +30,15 @@
-
- - - - @include('admin.operator_ques._form',['isEdit'=>0,'isInfo'=>0]) + {{-- 新規登録フォーム --}} + + @csrf + @include('admin.operator_ques._form', ['isEdit' => false])
+
diff --git a/resources/views/admin/operator_ques/edit.blade.php b/resources/views/admin/operator_ques/edit.blade.php index a6e7089..a3d7160 100644 --- a/resources/views/admin/operator_ques/edit.blade.php +++ b/resources/views/admin/operator_ques/edit.blade.php @@ -1,6 +1,6 @@ @extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] オペレータキュー') +@section('title', '編集') @section('content') @@ -30,12 +30,24 @@
-
- - - - @include('admin.operator_ques._form',['isEdit'=>1,'isInfo'=>0]) + + {{-- Edit Form --}} + + @csrf + @include('admin.operator_ques._form', ['isEdit' => true])
+ + {{-- Delete Form --}} + +
diff --git a/resources/views/admin/operator_ques/info.blade.php b/resources/views/admin/operator_ques/info.blade.php deleted file mode 100644 index d6fe63e..0000000 --- a/resources/views/admin/operator_ques/info.blade.php +++ /dev/null @@ -1,53 +0,0 @@ - -@extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] オペレータキュー') - -@section('content') - -
-
-
-
-

[東京都|〇〇駐輪場] オペレータキュー

-
-
-
    -
  1. XX様info(ホーム)
    2. -
  2. [東京都|〇〇駐輪場]
    3. -
  3. オペレータキュー
    4. -
  4. 利用者マスタ
    5. -
-
-
-
-
- - - -
-
- - -
-
-
-
- - - - @include('admin.operator_ques._form',['isEdit'=>0,'isInfo'=>1]) -
-
-
-
- -
- - - -
-
-
- - -@endsection diff --git a/resources/views/admin/operator_ques/list.blade.php b/resources/views/admin/operator_ques/list.blade.php index 8dc88a9..5191983 100644 --- a/resources/views/admin/operator_ques/list.blade.php +++ b/resources/views/admin/operator_ques/list.blade.php @@ -1,5 +1,5 @@ @extends('layouts.app') -@section('title', '[東京都|〇〇駐輪場] オペレータキュー') +@section('title', 'オペレータキュー') @section('content')
@@ -41,11 +41,11 @@ @endforeach
-
- -
- - + +
+ + 解除 +
@@ -56,9 +56,9 @@
+ - - +
{{ $list->appends(['sort' => $sort ?? '', 'sort_type' => $sort_type ?? ''])->links('pagination') }}
@@ -75,13 +75,13 @@ @elseif(Session::has('error'))
-

{{ __('誤差') }}:

+

{{ __('入力内容に不備があります') }}:

{!! Session::get('error') !!}
@elseif(isset($errorMsg))
-

{{ __('誤差') }}:

+

{{ __('入力内容に不備があります') }}:

{!! $errorMsg !!}
@endif @@ -94,9 +94,9 @@
@csrf - + - @@ -141,43 +141,4 @@ - - -@push('scripts') - -@endpush @endsection diff --git a/resources/views/admin/opes/_form.blade.php b/resources/views/admin/opes/_form.blade.php index 5d073d3..9ee9e30 100644 --- a/resources/views/admin/opes/_form.blade.php +++ b/resources/views/admin/opes/_form.blade.php @@ -282,7 +282,7 @@ {{-- ▼ 下部ボタン --}}
-
+
{{-- 登録ボタン --}} @if($isEdit) @@ -302,7 +302,7 @@ @endif -
+
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index dc7b0ac..bb81b8a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -605,7 +605,7 @@
  • - {{ __("オペレーターマスタ") }} + {{ __("オペレータマスタ") }}
  • @@ -616,7 +616,7 @@
  • - {{ __("オペレーターキュー") }} + {{ __("オペレータキュー") }}
  • diff --git a/routes/web.php b/routes/web.php index 5587827..7aa4bb4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -438,7 +438,7 @@ Route::middleware('auth')->group(function () { Route::match(['get', 'post'], '/devices/delete', [DeviceController::class, 'delete'])->name('devices_delete'); Route::post('/devices/import', [DeviceController::class, 'import'])->name('devices_import'); - // [東京都|〇〇駐輪場] オペレーターキュー + // [東京都|〇〇駐輪場] オペレータキュー Route::match(['get', 'post'], '/operator_ques', [OperatorQueController::class, 'list'])->name('operator_ques'); Route::match(['get', 'post'], '/operator_ques/add', [OperatorQueController::class, 'add'])->name('operator_ques_add'); Route::match(['get', 'post'], '/operator_ques/edit/{id}', [OperatorQueController::class, 'edit'])
+ キューID