Настройки форм соискателей

Андрей Ларионов
1 parent a967b2ae7f
Showing 4 changed files with 11 additions and 5 deletions Side-by-side Diff
app/Http/Controllers/Admin/WorkersController.php
resources/views/admin/users/profile.blade.php
resources/views/admin/worker/edit.blade.php
resources/views/admin/worker/index.blade.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%");
             });
         }
  
@@ -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"
@@ -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
@@ -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">
...	...	@@ -64,7 +64,9 @@ class WorkersController extends Controller
64	64	$users = $users->where(function($query) use($find_key) {
65	65	$query->Where('name_man', 'LIKE', "%$find_key%")
66	66	->orWhere('email', 'LIKE', "%$find_key%")
67		- ->orWhere('telephone', 'LIKE', "%$find_key%");
	67	+ ->orWhere('telephone', 'LIKE', "%$find_key%")
	68	+ ->orWhere('surname', 'LIKE', "%$find_key%")
	69	+ ->orWhere('surname2', 'LIKE', "%$find_key%");
68	70	});
69	71	}
70	72
...	...	@@ -92,10 +92,10 @@
92	92	<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">
93	93	Сохранить
94	94	</button>
95		- <a href="{{ route('admin.users') }}"
	95	+ <!--<a href="{{ route('admin.users') }}"
96	96	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"
97	97	style="display: -webkit-inline-box; height: 30px!important;"
98		- >Назад</a>
	98	+ >Назад</a>-->
99	99	@if ($visible==true)
100	100	<a href="{{$link}}"
101	101	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"
...	...	@@ -5,7 +5,7 @@ use Illuminate\Support\Facades\Storage;
5	5
6	6	@section('content')
7	7	<h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">
8		- Соискатель-пользователь: "{{$worker->users->surname}} {{$worker->users->name_man}} {{$worker->users->surname2}} ({{$worker->user_id}})"
	8	+ Соискатель-пользователь: <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>
9	9	</h4>
10	10	<form method="POST" action="">
11	11	@csrf
...	...	@@ -67,7 +67,11 @@
67	67	{{$user->id}}
68	68	</td>
69	69	<td class="px-4 py-3">
70		- {{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}
	70	+ @if (isset($user->id))
	71	+ <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>
	72	+ @else
	73	+ {{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}
	74	+ @endif
71	75	</td>
72	76	<td class="px-4 py-3 text-sm">
73	77	<div class="flex items-center text-sm">