From 679d3f77d215f3e8b85e3ea135929962ed20fa82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=A0=E7=9A=84=E5=90=8D=E5=AD=97?= <你的邮箱>
Date: Fri, 12 Sep 2025 19:51:01 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E6=8F=90=E7=A4=BA=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Auth/LoginController.php | 19 +++++++++++++++----
 resources/lang/ja/auth.php                    |  2 +-
 resources/views/auth/login.blade.php          | 14 +++++++-------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 4a3c358..0727ba7 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -77,9 +77,13 @@ class LoginController extends Controller
      */
     protected function validateLogin(Request $request)
     {
+        // 個別未入力メッセージ（仕様1,2）
         $request->validate([
-            'ope_id' => 'required|string',     // オペレータID（旧システムと同じ）
-            'ope_pass' => 'required|string',   // オペレータパスワード（旧システムと同じ）
+            'ope_id' => 'required|string',
+            'ope_pass' => 'required|string',
+        ], [
+            'ope_id.required' => 'ログインIDが未入力です。',
+            'ope_pass.required' => 'パスワードが未入力です。',
         ]);
     }
 
@@ -91,6 +95,13 @@ class LoginController extends Controller
      */
     protected function attemptLogin(Request $request)
     {
+        // 先にIDのみでオペレータ取得して退職フラグを確認（仕様5-1）
+        $opeId = $request->input('ope_id');
+        $operator = \App\Models\Ope::where('ope_id', $opeId)->first();
+        if ($operator && (int)($operator->ope_quit_flag) === 1) {
+            // 退職扱いは認証失敗と同じメッセージ（仕様5-1 と 3/4 統一表示）
+            return false;
+        }
         return Auth::attempt($this->credentials($request), false);
     }
 
@@ -118,9 +129,9 @@ class LoginController extends Controller
     protected function sendLoginResponse(Request $request)
     {
         $request->session()->regenerate();
-
         $this->clearLoginAttempts($request);
-
+        // 仕様5: ログインIDをセッション保持
+        $request->session()->put('login_ope_id', $request->input('ope_id'));
         return redirect()->intended($this->redirectTo);
     }
 
diff --git a/resources/lang/ja/auth.php b/resources/lang/ja/auth.php
index 635d02d..e756f08 100644
--- a/resources/lang/ja/auth.php
+++ b/resources/lang/ja/auth.php
@@ -12,6 +12,6 @@ return [
     |
     */
 
-    'failed'   => '認証情報と一致するレコードがありません。',
+    'failed'   => 'ログインID・パスワードが不正です。',
     'throttle' => 'ログインの試行回数が多すぎます。:seconds 秒後にお試しください。',
 ];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 7e2fb3b..6de3d35 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -11,12 +11,12 @@
                 <p class="login-box-msg">{{ __('ログインID、パスワードを入力して') }}<br
                             class="d-none d-lg-inline">{{ __('ログインボタンをクリックしてください') }}</p>
 
-                <form action="{{ route('login') }}" method="post">
+                <form action="{{ route('login') }}" method="post" novalidate>
                     <input type="hidden" name="_token" value="{{ csrf_token() }}">
                     <div class="input-group mb-3 {{ $errors->has('ope_id') ? 'error_input' : '' }}">
-                        <input type="text"
-                               class="form-control form-control-lg"
-                               placeholder="{{ __('ログインID') }}" name="ope_id" value="{{ old('ope_id') }}" required>
+               <input type="text"
+                   class="form-control form-control-lg"
+                   placeholder="{{ __('ログインID') }}" name="ope_id" value="{{ old('ope_id') }}">
                         <div class="input-group-append">
                             <span class="fa fa-user input-group-text"></span>
                         </div>
@@ -27,9 +27,9 @@
                                     </div>
                     @endif
                     <div class="input-group mb-3 {{ $errors->has('ope_pass') ? 'error_input' : '' }}">
-                        <input type="password"
-                               class="form-control form-control-lg "
-                               placeholder="{{ __('パスワード') }}" name="ope_pass" required>
+               <input type="password"
+                   class="form-control form-control-lg "
+                   placeholder="{{ __('パスワード') }}" name="ope_pass">
                         <div class="input-group-append">
                             <span class="fa fa-lock input-group-text"></span>
                         </div>