Андрей Ларионов / rekamore.su

Browse Code »

Commit e2907a5767314335bf4860c2cf3a968b37831e8c

Authored by Hayk Nazaryan 2024-12-05 19:48:24 +0300

1 parent e262a331f3

Exists in master

workers fixes

Showing 5 changed files with 166 additions and 16 deletions Inline Diff

app/Console/Commands/ResetData.php
app/Http/Controllers/Admin/UsersController.php
app/Http/Controllers/Admin/WorkersController.php
resources/views/admin/worker/index.blade.php
resources/views/admin/worker/index_ajax.blade.php

app/Console/Commands/ResetData.php

Diff comments View file @ e2907a5

File was created	1	<?php
	2
	3	namespace App\Console\Commands;
	4
	5	use App\Models\Ad_employer;
	6	use App\Models\Ad_jobs;
	7	use App\Models\ad_response;
	8	use App\Models\Answer;
	9	use App\Models\Chat;
	10	use App\Models\Contacts;
	11	use App\Models\Dop_info;
	12	use App\Models\Employer;
	13	use App\Models\EmployerAutoliftOption;
	14	use App\Models\employers_main;
	15	use App\Models\Flot;
	16	use App\Models\Group_user;
	17	use App\Models\Group_works;
	18	use App\Models\Like_vacancy;
	19	use App\Models\Like_worker;
	20	use App\Models\Media;
	21	use App\Models\Message;
	22	use App\Models\MessagesRequests;
	23	use App\Models\PrevCompany;
	24	use App\Models\ResponseWork;
	25	use App\Models\Static_ad;
	26	use App\Models\Static_worker;
	27	use App\Models\Title_worker;
	28	use App\Models\User;
	29	use App\Models\WorkerAutoliftOption;
	30	use Illuminate\Console\Command;
	31	use Illuminate\Support\Facades\Hash;
	32
	33	class ResetData extends Command
	34	{
	35	/**
	36	* The name and signature of the console command.
	37	*
	38	* @var string
	39	*/
	40	protected $signature = 'reset:data';
	41
	42	/**
	43	* The console command description.
	44	*
	45	* @var string
	46	*/
	47	protected $description = 'Command description';
	48
	49	/**
	50	* Execute the console command.
	51	*
	52	* @return int
	53	*/
	54	public function handle()
	55	{
	56	$users = User::query()
	57	->whereHas('workers')
	58	->where('is_bd', 0)
	59	->where('created_at', '<', '2024-11-30 00:00:00')
	60	->whereNotIn('email', [
	61	'vkontakte@rekamore.su',
	62	'2anketa@rekamore.su'
	63	])
	64	->get();
	65
	66	foreach ($users as $user) {
	67	Answer::query()->where(['user_id' => $user->id])->delete();
	68
	69	Chat::query()->where(['user_id' => $user->id])->delete();
	70	Chat::query()->where(['to_user_id' => $user->id])->delete();
	71	Message::query()->where(['user_id' => $user->id])->delete();
	72	Message::query()->where(['to_user_id' => $user->id])->delete();
	73	MessagesRequests::query()->where(['user_id' => $user->id])->delete();
	74
	75	Group_user::query()->where(['user_id' => $user->id])->get()->map(function ($groupUser) {
	76	Group_works::query()->where(['group_user_id' => $groupUser->id])->delete();
	77	$groupUser->delete();
	78	});
	79
	80	Like_vacancy::query()->where(['user_id' => (string)$user->id])->delete();
	81	Like_worker::query()->where(['user_id' => (string)$user->id])->delete();
	82	Media::query()->where(['user_id' => $user->id])->delete();
	83	Static_worker::query()->where(['user_id' => $user->id])->delete();
	84
	85	// $user->employers()->get()->map(function ($employer) {
	86	// Answer::query()->where(['employer_id' => $employer->id])->delete();
	87	//
	88	// Ad_employer::query()->where(['employer_id' => $employer->id])->get()->map(function ($adEmployer) {
	89	// Ad_jobs::query()->where(['ad_employer_id' => $adEmployer->id])->delete();
	90	// ad_response::query()->where(['ad_employer_id' => $adEmployer->id])->delete();
	91	// Static_ad::query()->where(['ad_employer_id' => $adEmployer->id])->delete();
	92	// Like_vacancy::query()->where(['code_record' => $adEmployer->id])->delete();
	93	//
	94	// $adEmployer->delete();
	95	// });
	96	//
	97	// Contacts::query()->where(['employer_id' => $employer->id])->delete();
	98	// employers_main::query()->where(['employer_id' => $employer->id])->delete();
	99	// EmployerAutoliftOption::query()->where(['employer_id' => $employer->id])->delete();
	100	//
	101	// Flot::query()->where(['employer_id' => $employer->id])->delete();
	102	//
	103	// $employer->delete();
	104	// });
	105
	106	$user->workers()->get()->map(function ($worker) {
	107	Dop_info::query()->where(['worker_id' => $worker->id])->delete();
	108	PrevCompany::query()->where(['worker_id' => $worker->id])->delete();
	109	ResponseWork::query()->where(['worker_id' => $worker->id])->delete();
	110	Like_worker::query()->where(['code_record' => $worker->id])->delete();
	111	Title_worker::query()->where(['worker_id' => $worker->id])->delete();
	112	WorkerAutoliftOption::query()->where(['worker_id' => $worker->id])->delete();
	113	$worker->delete();
	114	});
	115
	116	$user->delete();
	117
	118	}
	119
	120	User::query()->where('password', 1234567890)->get()->map(function ($userBd) {
	121	$password = $userBd->password;
	122
	123	$userBd->update([
	124	'password' => Hash::make($password),
	125	'pubpassword' => base64_encode($password),
	126	]);
	127	});
	128
	129	return Command::SUCCESS;
	130	}
	131	}
	132

app/Http/Controllers/Admin/UsersController.php

Diff comments View file @ e2907a5

 <?php
 namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\BaseUserRequest;
 use App\Models\ContentRoles;
 use App\Models\Job_title;
 use App\Models\User;
 use App\Models\Worker;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Storage;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 class UsersController extends Controller
 {
     public function index(Request $request) {
         $title = 'Админка - Пользователи системы';
         $id_admin = Auth::user()->id;
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
         $find_key = "";
         $users = User::query();
         if (isset($request->find)) {
            $find_key = $request->find;
            $users = $users->where('name', 'LIKE', "%$find_key%")
                         ->orWhere('email', 'LIKE', "%$find_key%");
         }
         $users = $users->paginate(15);
         if ($request->ajax()) {
            return view('admin.users.index_ajax', compact('users', 'id_admin'));
         } else {
             return view('admin.users.index', compact('users', 'title', 'id_admin', 'find_key'));
         }
     }
     public function user_delete(User $user) {
         $worker = $user->workers()->first();
         $employer = $user->employers()->first();
         if ($worker) {
             $worker->delete();
         } elseif ($employer) {
             $employer->delete();
         }
         $user->delete();
         return redirect()->route('admin.users')->with('Пользователь был удален из системы');
     }
     public function index_bd(Request $request) {
         $title = 'Админка - Пользователи базы данных';
         $find_key = "";
         $users = User::query();
         if (isset($request->find)) {
             $find_key = $request->find;
             $users = $users->where('name', 'LIKE', "%$find_key%")
                 ->orWhere('email', 'LIKE', "%$find_key%")
                 ->orWhere('telephone', 'LIKE', "%$find_key%");
         }
         $users = $users->Baseuser()
             ->orderByDesc(Worker::select('created_at')->whereColumn('workers.user_id', 'users.id'))
             ->paginate(15);
         if ($request->ajax()) {
             return view('admin.users.index_bd_ajax', compact('users'));
         } else {
             return view('admin.users.index_bd', compact('users', 'title', 'find_key'));
         }
     }
     public function add_bd() {
         $list_job_titles = Job_title::query()->active()->where('is_bd', '=' , '2')->orderBy('name', 'asc')->get();
         return view('admin.users.add', compact('list_job_titles'));
     }
     public function add_store_bd(BaseUserRequest $request) {
         $params = $request->all();
         if ($request->has('file')) {
             $params['file'] = $request->file('file')->store('basedata', 'public');
         }
         if (isset($request->name)) {
             $params['name'] = $request->surname." ".$request->name_man." ".$request->surname2;
         }
+        $password = $params['password'];
+        $params['password'] = Hash::make($password);
+        $params['pubpassword'] = base64_encode($password);
         $user = User::create($params);
         $worker = new Worker();
         $worker->positions_work = isset($params['positions_work']) ? json_encode($params['positions_work']) : [];
         $worker->user_id = $user->id;
         $worker->comment = isset($params['comment']) ? $params['comment'] : null;
         $worker->save();
         return redirect()->route('admin.basedata');
     }
     public function edit_bd(User $user) {
         $list_job_titles = Job_title::query()
             ->active()
             ->where('is_bd', '=' , '2')
             ->orderByDesc('sort')
             ->orderBy('name', 'asc')
             ->get();
         return view('admin.users.edit', compact('user', 'list_job_titles'));
     }
     public function update_bd(BaseUserRequest $request, User $user) {
         $params = $request->all();
         $positions_work = $request->input('positions_work', []);
         if ($request->has('file')) {
             if (!empty($user->file)) Storage::delete($user->file);
             $params['file'] = $request->file('file')->store('basedata', 'public');
         } else {
             if (!empty($user->image)) $params['file'] = $user->file;
         }
         if (isset($request->name)) {
             $params['name'] = $request->surname." ".$request->name_man." ".$request->surname2;
         }
         $user->update($params);
         if (isset($user->workers[0]->id)) {
             $worker = Worker::find($user->workers[0]->id);
             $worker->positions_work = $positions_work;
             $worker->comment = isset($params['comment']) ? $params['comment'] : null;
             $worker->save();
         } else {
             $worker = new Worker();
             $worker->user_id = $user->id;
             $worker->positions_work = $positions_work;
             $worker->comment = isset($params['comment']) ? $params['comment'] : null;
             $worker->save();
         }
         return redirect()->route('admin.basedata');
     }
     public function destroy_bd(User $user) {
         $user->delete();
         return redirect()->route('admin.basedata');
     }
     public function roles(Request $request) {
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
         $users = User::query()->Realuser()->paginate(15);
         if ($request->ajax()) {
             return view('admin.users.roles.index_ajax', compact('users'));
         } else {
             return view('admin.users.roles.index', compact('users'));
         }
     }
     public function admin_roles(Request $request) {
         if ($request->ajax()) {
             $id = $request->id;
             $request->offsetUnset('id');
             ContentRoles::where('id', '=', $id)->update($request->all());
         }
         $roles = ContentRoles::query()->OrderBy('id')->paginate(25);
         if ($request->ajax()) {
            return view('admin.content.roles_index_ajax', compact('roles'));
         } else {
             return view('admin.content.roles_index', compact('roles'));
         }
     }
     public function doc_bd(User $user) {
         $id = $user->id;
         $spreadsheet = new Spreadsheet();
         $activeWorksheet = $spreadsheet->getActiveSheet();
         $activeWorksheet->setCellValue('A1', 'Отчет по соискателю');
         $activeWorksheet->getStyle('A1')->applyFromArray([
             'font' => [
                 'name' => 'Arial',
                 'bold' => true,
                 'italic' => false,
                 'underline' => Font::UNDERLINE_DOUBLE,
                 'strikethrough' => false,
                 'color' => [
                     'rgb' => '808080'
                 ]
             ],
             'borders' => [
                 'allBorders' => [
                     'borderStyle' => Border::BORDER_THIN,
                     'color' => [
                         'rgb' => '808080'
                     ]
                 ],
                 'outline' => array(
                     'style' => Border::BORDER_THIN,
                     'color' => array('rgb' => '000000')
                 ),
             ],
             'alignment' => [
                 'horizontal' => Alignment::HORIZONTAL_CENTER,
                 'vertical' => Alignment::VERTICAL_CENTER,
                 'wrapText' => true,
             ]
         ]);
         $activeWorksheet->setCellValue('A2', "Псевдоним/имя: ".$user->name);
         $activeWorksheet->setCellValue('A3', "Фамилия: ".$user->surname);
         $activeWorksheet->setCellValue('A4', "Имя: ".$user->name_man);
         $activeWorksheet->setCellValue('A5', "Отчество: ".$user->surname2);
         $activeWorksheet->setCellValue('A6', "Телефон: ".$user->telephone);
         $activeWorksheet->setCellValue('A7', "Емайл: ".$user->email);
         if (isset($user->workers[0]->id)) {
             $activeWorksheet->setCellValue('A9', "Анкета: ");
             $activeWorksheet->setCellValue('A10', "Телефон: " . $user->workers[0]->telephone);
             $activeWorksheet->setCellValue('A11', "Емайл: " . $user->workers[0]->email);
         }
         if (isset($user->jobtitles[0]->id)) {
             $activeWorksheet->setCellValue('A12', "Должность: " . $user->jobtitles[0]->name);
         }
         $activeWorksheet->getColumnDimension("A")->setWidth(100);
         $writer = new Xlsx($spreadsheet);
         header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
         header('Content-Disposition: attachment; filename="user'.$id.'.xlsx"');
         header('Cache-Control: no-cache');
         $writer->save('php://output');
         $writer->save(storage_path("app/public/export/user$id.xlsx"));
         //$spreadsheet->disconnectWorksheets();
         return redirect()->route('admin.basedata');
     }
 }

app/Http/Controllers/Admin/WorkersController.php

Diff comments View file @ e2907a5

 <?php
 namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\WorkerRequest;
 use App\Models\Company;
 use App\Models\Job_title;
 use App\Models\Static_worker;
 use App\Models\User;
 use App\Models\Worker;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use App\Enums\WorkerStatuses;
 class WorkersController extends Controller
 {
     public function index(Request $request) {
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
         $status_work = Job_title::query()->active()->orderBy('name')->get();
         $users = User::with(['jobtitles', 'workers'])->realuser();
         $all_worker = $users->count();
         $find_status_work = "";
         if (isset($request->status_work)) {
             $find_status_work = $request->status_work;
             if ($request->status_work > 0) {
-                $users = $users->with('workers')->
+                $users = $users->
                 whereHas('workers',
                     function (Builder $query) use ($find_status_work) {
                         $query->where('position_work', $find_status_work);
                     }
                 );
             } else {
-                $users = $users->with('workers');
+                $users = $users->whereHas('workers');
             }
         } else {
-            $users = $users->with('workers');
+            $users = $users->whereHas('workers');
         }
         $find_key = "";
         if (isset($request->find)) {
             $find_key = $request->find;
             $users = $users->where(function($query) use($find_key) {
-                $query->Where('name_man', 'LIKE', "%$find_key%")
+                $query->where('name_man', 'LIKE', "%$find_key%")
                     ->orWhere('email', 'LIKE', "%$find_key%")
                     ->orWhere('telephone', 'LIKE', "%$find_key%")
                     ->orWhere('surname', 'LIKE', "%$find_key%")
                     ->orWhere('surname2', 'LIKE', "%$find_key%");
             });
         }
-        $users = $users->orderByDesc('id')->Realuser()->paginate(15);
+        $all_worker = $users->count();
+        $users = $users->orderByDesc('id')->paginate(15);
         $status_wor = WorkerStatuses::getWorkerStatuses();
         if ($request->ajax()) {
             return view('admin.worker.index_ajax', compact('users', 'status_wor'));
         } else {
             return view('admin.worker.index', compact('users',
                                                         'find_key',
                                                                     'find_status_work',
                                                                     'status_work',
                                                                     'status_wor',
                                                                     'all_worker'));
         }
     }
     public  function form_add_worker(User $user) {
         $job_titles = Job_title::query()->active()->orderBy('name')->get();
         $time_end_anketa = 'Создана только';
         $long_days = Company::find(1)->time_resume;
         $time_end_anketa = date("d.m.Y H:i:s", strtotime(Carbon::now() . "+$long_days days"));
         return view('admin.worker.add', compact('user', 'job_titles', 'time_end_anketa'));
     }
     public function form_store_worker(WorkerRequest $request, User $user) {
         $params = $request->all();
         $worker = Worker::create($params);
         return redirect()->route('admin.basedata');
     }
     public function form_edit_worker(Worker $worker) {
         $job_titles = Job_title::query()->active()->orderBy('name')->get();
         $time_end_anketa = 'Бессрочно';
         if (!empty($worker->updated_at)) {
             $long_days = Company::find(1)->time_resume;
             $time_end_anketa = date("d.m.Y H:i:s", strtotime($worker->updated_at . "+$long_days days"));
         }
         return view('admin.worker.edit', compact('worker', 'job_titles', 'time_end_anketa'));
     }
     public function form_update_worker(Request $request, Worker $worker)
     {
         $params = $request->all();
         $rules = [
             'email' => 'email|string|max:255',
             //'photo' => 'mimes:jpeg,jpg,png|max:15000',
         ];
         $messages = [
             'required' => 'Укажите обязательное поле «:attribute»',
             'confirmed' => 'Пароли не совпадают',
             'email' => 'Введите корректный email',
             'min' => [
                 'string' => 'Поле «:attribute» должно быть не меньше :min символов',
                 'file' => 'Файл «:attribute» должен быть не меньше :min Кбайт'
             ],
             'max' => [
                 'string' => 'Поле «:attribute» должно быть не больше :max символов',
                 'file' => 'Файл «:attribute» должен быть не больше :max Кбайт'
             ],
         ];
         $validator = Validator::make($params, $rules, $messages);
         if ($validator->fails()) {
             return back()->withErrors($validator)->withInput();
         } else {
             $user_id = $worker->user_id;
             if ($request->has('photo')) {
                 if (!empty($worker->photo)) {
                     Storage::delete($worker->photo);
                 }
                 if (!empty($request->photo))
                    $params['photo'] = $request->file('photo')->store("workers/$user_id", 'public');
             }
             $worker->update($params);
             return redirect()->route('admin.workers');
         }
     }
     // кабинет - статистика работников
     public function static_workers(Request $request) {
         $stat = Static_worker::with('users');
             //->join('users', 'users.id', '=', 'static_workers.user_id');
         $users = User::query()->active()->OrderBy('id')->get();
         $periods = Static_worker::query()->distinct('year_month')->select('year_month')->get();
         if ($request->ajax()) {
             if (isset($request->user_id))
                 if (!$request->user_id == "0")
                     $stat = $stat->Where('user_id', '=', $request->user_id);
             if (isset($request->year_month)) {
                 if (!$request->year_month == "0")
                     $stat = $stat->Where('year_month', '=', $request->year_month);
             }
         }
         $stat = $stat->OrderByDesc('year_month');
             //->OrderBy('users.name');
         //OrderBy('users.name')->
         /*$stat->implode() loadMissing(['users' => function (Builder $query) {
             $query->orderBy('name', 'asc');
         }]);*/
         $stat = $stat->paginate(15);
         if ($request->ajax())
             return view('admin.static.index_workers_ajax', compact('stat'));
          else
             return view('admin.static.index_workers', compact('stat', 'users', 'periods'));
     }
 }

resources/views/admin/worker/index.blade.php

Diff comments View file @ e2907a5

 @extends('layout.admin', ['title' => 'Админка - Работники'])
 @section('script')
     <script>
         $(document).ready(function() {
             $(document).on('click', '.checkban', function () {
                 var this_ = $(this);
                 var value = this_.val();
                 var ajax_block = $('#ajax_block');
                 var bool = 0;
                 if(this.checked){
                     bool = 1;
                 } else {
                     bool = 0;
                 }
                 $.ajax({
                     type: "GET",
                     url: "{{ url()->full()}}",
                     data: "id=" + value + "&is_ban=" + bool,
                     success: function (data) {
                         console.log('Обновление таблицы работников ');
                         //data = JSON.parse(data);
                         console.log(data);
                         ajax_block.html(data);
                     },
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
                     },
                     error: function (data) {
                         console.log('Error: ' + data);
                     }
                 });
             });
         });
     </script>
 @endsection
 @section('search')
     @include('admin.find_worker', ['find_status_work' => $find_status_work])
 @endsection
 @section('content')
     <div class="grid gap-6 mb-8 md:grid-cols-2 xl:grid-cols-4">
         <div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
             <div class="p-3 mr-4 text-orange-500 bg-orange-100 rounded-full dark:text-orange-100 dark:bg-orange-500">
                 <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
                     <path
                         d="M13 6a3 3 0 11-6 0 3 3 0 016 0zM18 8a2 2 0 11-4 0 2 2 0 014 0zM14 15a4 4 0 00-8 0v3h8v-3zM6 8a2 2 0 11-4 0 2 2 0 014 0zM16 18v-3a5.972 5.972 0 00-.75-2.906A3.005 3.005 0 0119 15v3h-3zM4.75 12.094A5.973 5.973 0 004 15v3H1v-3a3 3 0 013.75-2.906z"></path>
                 </svg>
             </div>
             <div>
                 <p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
                     Всего соискателей
                 </p>
                 <p class="text-lg font-semibold text-gray-700 dark:text-gray-200">
                     {{ $all_worker }}
                 </p>
             </div>
         </div>
     </div>
     <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
         <div class="w-full overflow-x-auto">
             <table class="w-full whitespace-no-wrap">
                 <thead>
                 <tr
                     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">ФИО/Email/Телефон</th>
+                    <th class="px-4 py-3">ФИО/Email/Телефон/Пароль</th>
                     <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">Дата регистрации</th>
                     <th class="px-4 py-3">Изменить</th>
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
                 @foreach($users as $user)
                     @if (!isset($user->workers[0]))
                         @continue(1)
                     @endif
                     <tr class="text-gray-700 dark:text-gray-400">
                         <td class="px-4 py-3 text-xs">
                             {{$user->id}}
                         </td>
                         <td class="px-4 py-3 text-xs">
                             @if (isset($user->workers[0]->photo))
                                 <div class="flex items-center text-sm">
                                     <div
                                         class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                                     >
                                         <img
                                             class="object-cover w-full h-full rounded-full"
                                             src="{{ asset(Storage::url($user->workers[0]->photo)) }}"
                                             alt=""
                                             loading="lazy"
                                         />
                                         <div
                                             class="absolute inset-0 rounded-full shadow-inner"
                                             aria-hidden="true"
                                         ></div>
                                     </div>
                                 </div>
                             @else
                                 -
                             @endif
                         </td>
                         <td class="px-4 py-3 text-xs">
                             <div class="flex items-center text-sm">
                                 <div>
                                     <p class="font-semibold">
-                                @if (isset($user->id))
+                                        @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>
+                                            <a style="text-decoration: underline;"
-                                @else
+                                               href="{{ route('admin.user-profile', ['user' => $user->id]) }}}">{{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}</a>
-                                    {{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}
+                                        @else
-                                @endif
+                                            {{ $user->surname }} {{ !empty($user->name_man) ? $user->name_man : $user->name }} {{ $user->surname2 }}
+                                        @endif
+                                    </p>
+{{--                                    <p class="font-semibold">{{ empty($user->workers->email) ? $user->email : $user->workers->email }}</p>--}}
+                                    <p class="font-semibold">{{ $user->email }}</p>
+                                    <p class="text-xs text-gray-600 dark:text-gray-400">
+                                        {{ empty($user->workers->telephone) ? $user->telephone : $user->workers->telephone }}
+                                    </p>
+                                    <p class="text-xs text-gray-600 dark:text-gray-400">
+                                        @if (!empty($user->pubpassword))
+                                            {{ base64_decode($user->pubpassword) }}
+                                        @endif
                                     </p>
-                                <p class="font-semibold">{{ empty($user->workers->email) ? $user->email : $user->workers->email }}</p>
-                                <p class="text-xs text-gray-600 dark:text-gray-400">
-                                    {{ empty($user->workers->telephone) ? $user->telephone : $user->workers->telephone }}
-                                </p>
                                 </div>
                             </div>
                         </td>
                         <td class="px-4 py-3 text-xs">
                             @if (isset($user->workers[0]->status_work))
                                 {{ $status_wor[$user->workers[0]->status_work] }}
                             @else
                                 -
                             @endif
                         </td>
                         <td class="px-4 py-3 text-xs">
                             <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full @if(($persent = \App\Classes\Tools::getWorkerProfilePercent($user->workers[0])) > 50) dark:bg-green-700 dark:text-green-100 @else dark:text-white dark:bg-orange-600 @endif">
                                 {{ $persent }}%
                             </span>
                         </td>
                         <td class="px-4 py-3 text-xs">
                           @if ($user->job !== null)
                             {{ $user->job }}
                           @else
                             Не задана
                           @endif
                         </td>
                         <td class="px-4 py-3 text-xs">
                             {{ date('d.m.Y h:i:s', strtotime($user->created_at)) }}
                         </td>
                         <td class="px-4 py-3 text-xs">
                             @if (isset($user->workers[0]->id))
                             <a href="{{ route('admin.worker-profile-edit', ['worker' => $user->workers[0]->id]) }}">Изменить</a>
                             @endif
                         </td>
                     </tr>
                 @endforeach
                 </tbody>
             </table>
         </div>
         <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
             <?=$users->appends($_GET)->links('admin.pagginate'); ?>

resources/views/admin/worker/index_ajax.blade.php

Diff comments View file @ e2907a5

 <div class="w-full overflow-x-auto">
     <table class="w-full whitespace-no-wrap">
         <thead>
         <tr
             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">ФИО/Email/Телефон</th>
+            <th class="px-4 py-3">ФИО/Email/Телефон/Пароль</th>
             <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">Дата регистрации</th>
             <th class="px-4 py-3">Изменить</th>
         </tr>
         </thead>
         <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
         @foreach($users as $user)
             <tr class="text-gray-700 dark:text-gray-400">
                 <td class="px-4 py-3">
                     {{$user->id}}
                 </td>
                 <td class="px-4 py-3">
                     @if (isset($user->workers[0]->photo))
                         <div class="flex items-center text-sm">
                             <div
                                 class="relative hidden w-8 h-8 mr-3 rounded-full md:block"
                             >
                                 <img
                                     class="object-cover w-full h-full rounded-full"
                                     src="{{ asset(Storage::url($user->workers[0]->photo)) }}"
                                     alt=""
                                     loading="lazy"
                                 />
                                 <div
                                     class="absolute inset-0 rounded-full shadow-inner"
                                     aria-hidden="true"
                                 ></div>
                             </div>
                         </div>
                     @else
                         -
                     @endif
                 </td>
                 <td class="px-4 py-3">
                     <div class="flex items-center text-sm">
                         <div>
                             <p class="font-semibold">
                                 @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
                             </p>
                             <p class="font-semibold">{{ empty($user->workers->email) ? $user->email : $user->workers->email }}</p>
                             <p class="text-xs text-gray-600 dark:text-gray-400">
                                 {{ empty($user->workers->telephone) ? $user->telephone : $user->workers->telephone }}
                             </p>
+                            <p class="text-xs text-gray-600 dark:text-gray-400">
+                                @if (!empty($user->pubpassword))
+                                    {{ base64_decode($user->pubpassword) }}
+                                @endif
+                            </p>
                         </div>
                     </div>
                 </td>
                 <td class="px-4 py-3">
                     @if (isset($user->workers[0]->status_work))
                         {{ $status_wor[$user->workers[0]->status_work] }}
                     @else
                         -
                     @endif
                 </td>
                 <td class="px-4 py-3 text-xs">
                     @if (isset($user->workers[0]->persent_anketa))
                         @if ($user->workers[0]->persent_anketa > 40)
                             <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
                                     {{$user->workers[0]->persent_anketa}}%
                                     </span>
                         @else
                             <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                                     {{$user->workers[0]->persent_anketa}}%
                                 </span>
                         @endif
                     @else
                         <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
                                     0%
                                 </span>
                     @endif
                 </td>
                 <td class="px-4 py-3 text-sm">
                     @if (isset($user->jobtitles[0]->name))
                         {{ $user->jobtitles[0]->name }}
                     @else
                         Не задана
                     @endif
                 </td>
                 <td class="px-4 py-3 text-sm">
                     {{ date('d.m.Y h:i:s', strtotime($user->created_at)) }}
                 </td>
                 <td class="px-4 py-3 text-sm">
                     <!--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-->
                 </td>
             <!--<td class="px-4 py-3 text-sm">
                             @if ($user->id > 1)
                 <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                             @endif
                 </td>-->
             </tr>
         @endforeach
         </tbody>
     </table>
 </div>
 <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
     <?=$users->appends($_GET)->links('admin.pagginate'); ?>
 </div>