Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su

Андрей Ларионов
2 parents c119eec133 a967b2ae7f
Showing 1 changed file Side-by-side Diff
resources/views/admin/worker/index.blade.php
@@ -51,7 +51,7 @@
                     class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                 >
                     <th class="px-4 py-3">№</th>
-                    <th class="px-4 py-3">Имя</th>
+                    <th class="px-4 py-3">ФИО</th>
                     <th class="px-4 py-3">Email/Телефон</th>
                     <th class="px-4 py-3">% заполнения анкеты</th>
                     <th class="px-4 py-3">Должность</th>
@@ -67,7 +67,7 @@
                             {{$user->id}}
                         </td>
                         <td class="px-4 py-3">
-                            {{ !empty($user->name_man) ? $user->name_man : $user->name }}
+                          {{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}
                         </td>
                         <td class="px-4 py-3 text-sm">
                             <div class="flex items-center text-sm">
@@ -107,12 +107,12 @@
                             {{ $user->created_at }}
                         </td>
                         <td class="px-4 py-3 text-sm">
-                            @if ($user->id > 1)
+                            <!--if ($user->id > 1)-->
                                 @if (isset($user->workers[0]->id))
                                 <a href="{{ route('admin.worker-profile-edit', ['worker' => $user->workers[0]->id]) }}">Изменить</a>
  
                                 @endif
-                            @endif
+                            <!--endif-->
                         </td>
                         <!--<td class="px-4 py-3 text-sm">
                             @if ($user->id > 1)
...	...	@@ -51,7 +51,7 @@
51	51	class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
52	52	>
53	53	<th class="px-4 py-3">№</th>
54		- <th class="px-4 py-3">Имя</th>
	54	+ <th class="px-4 py-3">ФИО</th>
55	55	<th class="px-4 py-3">Email/Телефон</th>
56	56	<th class="px-4 py-3">% заполнения анкеты</th>
57	57	<th class="px-4 py-3">Должность</th>
...	...	@@ -67,7 +67,7 @@
67	67	{{$user->id}}
68	68	</td>
69	69	<td class="px-4 py-3">
70		- {{ !empty($user->name_man) ? $user->name_man : $user->name }}
	70	+ {{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}
71	71	</td>
72	72	<td class="px-4 py-3 text-sm">
73	73	<div class="flex items-center text-sm">
...	...	@@ -107,12 +107,12 @@
107	107	{{ $user->created_at }}
108	108	</td>
109	109	<td class="px-4 py-3 text-sm">
110		- @if ($user->id > 1)
	110	+ <!--if ($user->id > 1)-->
111	111	@if (isset($user->workers[0]->id))
112	112	<a href="{{ route('admin.worker-profile-edit', ['worker' => $user->workers[0]->id]) }}">Изменить</a>
113	113
114	114	@endif
115		- @endif
	115	+ <!--endif-->
116	116	</td>
117	117	<!--<td class="px-4 py-3 text-sm">
118	118	@if ($user->id > 1)