From 3e44ec51512d54860d5b919aa130ce055dbd92e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= <alarionov@nologostudio.ru>
Date: Fri, 6 Oct 2023 10:34:53 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0?=
 =?UTF-8?q?=B8=20=D1=84=D0=BE=D1=80=D0=BC=20=D1=81=D0=BE=D0=B8=D1=81=D0=BA=D0?=
 =?UTF-8?q?=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/WorkersController.php |    4 +++-
 resources/views/admin/users/profile.blade.php    |    4 ++--
 resources/views/admin/worker/edit.blade.php      |    2 +-
 resources/views/admin/worker/index.blade.php     |    6 +++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/WorkersController.php b/app/Http/Controllers/Admin/WorkersController.php
index c027b7b..85c157c 100644
--- a/app/Http/Controllers/Admin/WorkersController.php
+++ b/app/Http/Controllers/Admin/WorkersController.php
@@ -64,7 +64,9 @@ class WorkersController extends Controller
             $users = $users->where(function($query) use($find_key) {
                 $query->Where('name_man', 'LIKE', "%$find_key%")
                     ->orWhere('email', 'LIKE', "%$find_key%")
-                    ->orWhere('telephone', 'LIKE', "%$find_key%");
+                    ->orWhere('telephone', 'LIKE', "%$find_key%")
+                    ->orWhere('surname', 'LIKE', "%$find_key%")
+                    ->orWhere('surname2', 'LIKE', "%$find_key%");
             });
         }
 
diff --git a/resources/views/admin/users/profile.blade.php b/resources/views/admin/users/profile.blade.php
index 5e975c9..7371c31 100644
--- a/resources/views/admin/users/profile.blade.php
+++ b/resources/views/admin/users/profile.blade.php
@@ -92,10 +92,10 @@
                     <button type="submit" class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
                         Сохранить
                     </button>
-                    <a href="{{ route('admin.users') }}"
+                    <!--<a href="{{ route('admin.users') }}"
                        class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple"
                        style="display: -webkit-inline-box; height: 30px!important;"
-                    >Назад</a>
+                    >Назад</a>-->
                     @if ($visible==true)
                         <a href="{{$link}}"
                            class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple"
diff --git a/resources/views/admin/worker/edit.blade.php b/resources/views/admin/worker/edit.blade.php
index 6530a6a..49b16b4 100644
--- a/resources/views/admin/worker/edit.blade.php
+++ b/resources/views/admin/worker/edit.blade.php
@@ -5,7 +5,7 @@ use Illuminate\Support\Facades\Storage;
 
 @section('content')
     <h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">
-        Соискатель-пользователь: "{{$worker->users->surname}} {{$worker->users->name_man}} {{$worker->users->surname2}} ({{$worker->user_id}})"
+        Соискатель-пользователь: <a style="text-decoration: underline;" href="{{ route('admin.user-profile', ['user' => $worker->user_id]) }}">"{{$worker->users->surname}} {{$worker->users->name_man}} {{$worker->users->surname2}} ({{$worker->user_id}})"</a>
     </h4>
     <form method="POST" action="">
         @csrf
diff --git a/resources/views/admin/worker/index.blade.php b/resources/views/admin/worker/index.blade.php
index 243c91e..4c74851 100644
--- a/resources/views/admin/worker/index.blade.php
+++ b/resources/views/admin/worker/index.blade.php
@@ -67,7 +67,11 @@
                             {{$user->id}}
                         </td>
                         <td class="px-4 py-3">
-                          {{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}
+                            @if (isset($user->id))
+                                <a style="text-decoration: underline;" href="{{ route('admin.user-profile', ['user' => $user->id]) }}}">{{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}</a>
+                            @else
+                                {{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}
+                            @endif
                         </td>
                         <td class="px-4 py-3 text-sm">
                             <div class="flex items-center text-sm">
-- 
1.7.10.4