Commit 75665e78f4c42b2e557fdd1a9884cca334b6fa18
Exists in
master
Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su
Showing 4 changed files Side-by-side Diff
app/Http/Controllers/Admin/WorkersController.php
| ... | ... | @@ -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 |
resources/views/admin/users/profile.blade.php
| ... | ... | @@ -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" |
resources/views/admin/worker/edit.blade.php
| ... | ... | @@ -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 |
resources/views/admin/worker/index.blade.php
| ... | ... | @@ -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"> |