From e60a32501c1872ebb2ed899fb5fe8309a155b6d6 Mon Sep 17 00:00:00 2001 From: Sergey Panarin Date: Thu, 4 Jul 2024 12:36:14 +0200 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B5=D0?= =?UTF-8?q?=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B7=D0=B4=D0?= =?UTF-8?q?=B5=D0=BB=D0=B0=20"=D0=98=D0=B7=D0=B1=D1=80=D0=B0=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=B0=D0=BD=D0=B4=D0=B8=D0=B4=D0=B0=D1=82=D1=8B"=20?= =?UTF-8?q?+=20=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0?= =?UTF-8?q?=B4=D0=B0=D1=87=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/WorkerController.php | 19 +- public/css/style_may2024.css | 132 +++++++------ resources/views/employers/favorite.blade.php | 198 +++++++++++++------- resources/views/info_company_new.blade.php | 44 +---- resources/views/modals/send_employer.blade.php | 1 - resources/views/modals/send_worker.blade.php | 1 - resources/views/modals/send_worker_new.blade.php | 1 - resources/views/resume.blade.php | 2 +- resources/views/worker.blade.php | 34 ++-- .../workers/form_additional_documents.blade.php | 44 +---- .../views/workers/form_basic_information.blade.php | 8 +- resources/views/workers/sertificate_add.blade.php | 4 +- routes/web.php | 1 + 13 files changed, 258 insertions(+), 231 deletions(-) diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php index 3e10710..231d1a0 100644 --- a/app/Http/Controllers/WorkerController.php +++ b/app/Http/Controllers/WorkerController.php @@ -475,7 +475,7 @@ class WorkerController extends Controller public function cabinet_save_foto(Worker $worker, Request $request){ $params = ['photo' => null]; - + if ($request->has('photo')) { if (!empty($worker->photo)) { Storage::delete($worker->photo); @@ -952,6 +952,23 @@ class WorkerController extends Controller return redirect()->route('worker.cabinet')->with('success', 'Вы успешно отредактировали запись!'); } + public function edit_diploms(Request $request, Worker $worker) { + $dop_info_data = $request->input('diploms'); + + if (empty($dop_info_data)) { + return redirect()->route('worker.additional_documents')->with('error', 'Данные не предоставлены!'); + } + + foreach ($dop_info_data as $infoblok_id => $status) { + Dop_info::updateOrCreate( + ['worker_id' => $worker->id, 'infoblok_id' => $infoblok_id], + ['status' => $status] + ); + } + + return redirect()->route('worker.additional_documents')->with('success', 'Успешно сохранено!'); + } + public function delete_add_diplom(Request $request, Worker $worker) { $infoblok_id = $request->get('infoblok_id'); diff --git a/public/css/style_may2024.css b/public/css/style_may2024.css index 75a8cd6..826d35d 100644 --- a/public/css/style_may2024.css +++ b/public/css/style_may2024.css @@ -4365,6 +4365,20 @@ h1 { .main__resume-profile-about-buttons .like{ width: 200px; } +.main__resume-profile-about-buttons .like.active{ + background: #fff; + color: #eb5757; +} +.main__resume-profile-about-buttons .like .in-favorites{ + display: none; +} +.main__resume-profile-about-buttons .like.active .in-favorites{ + display: block; + color: #eb5757; +} +.main__resume-profile-about-buttons .like.active .to-favorites{ + display: none; +} .main__resume-profile-about-text { position: relative; z-index: 2; @@ -7362,15 +7376,33 @@ main + .news { display: flex; } .cvs__item-like { - position: absolute; - top: 10px; - right: 10px; + width: unset; + padding: 5px 10px; + margin-right: 10px; } -@media (min-width: 768px) { - .cvs__item-like { - top: 20px; - right: 20px; - } +.cvs__item .cvs__item-buttons .chat{ + width: unset; + padding: 5px 10px; + margin-right: 10px; +} +.cvs__item-like.active{ + background: #ffffff; + color: #eb5757; +} +.cvs__item-like .in-favorites{ + display: none; +} +.cvs__item-like.active .in-favorites{ + display: block; + color: #eb5757; +} +.cvs__item-like.active .to-favorites{ + display: none; +} +.cvs__item .cvs__item-header{ + display: flex; + width: 100%; + justify-content: space-between; } .cvs__item-photo { position: relative; @@ -7419,71 +7451,47 @@ main + .news { -ms-flex-direction: column; flex-direction: column; gap: 10px; + width: 100%; + margin-top: 30px; } -@media (min-width: 768px) { - .cvs__item-text { - gap: 20px; - width: calc(100% - 68px); - padding-left: 20px; - padding-right: 60px; - } +.cvs__item .cvs__item-buttons{ + display: flex; + align-items: start; } -.cvs__item-text div { +.cvs.active .cvs__item { display: -webkit-box; display: -ms-flexbox; display: flex; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; - -webkit-box-pack: justify; - -ms-flex-pack: justify; - justify-content: space-between; } -@media (min-width: 768px) { - .cvs__item-text div { - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - -webkit-box-pack: start; - -ms-flex-pack: start; - justify-content: flex-start; - -webkit-box-align: start; - -ms-flex-align: start; - align-items: flex-start; - } +.cvs__item-text .cvs__item-text-row{ + display: flex; + justify-content: space-between; + width: 100%; } -.cvs__item-text span, -.cvs__item-text a { - color: #000; +.cvs__item-text .cvs__item-text-row > div{ + width: 50%; } -.cvs__item-button { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; - -webkit-box-align: center; - -ms-flex-align: center; - align-items: center; +.cvs__item-text .cvs__item-text-row b{ + color: #377d87; + font-size: 18px; } -@media (min-width: 768px) { - .cvs__item-button { - -webkit-box-align: end; - -ms-flex-align: end; - align-items: flex-end; - width: 100%; - padding-top: 20px; - } +.cvs__item-text .cvs__item-text-status { + width: fit-content; + background-color: #e6e6e6; + font-weight: bold; + padding: 5px 10px; + border-radius: 8px; + margin-right: 30px; } -.cvs.active .cvs__item { - display: -webkit-box; - display: -ms-flexbox; - display: flex; +.cvs__item-text .cvs__item-text-status.looking-for-job { + background-color: #eb5757; + color: #fff; +} +.cvs__item-text .cvs__item-text-updated-at{ + padding: 5px 10px; + border-radius: 8px; + border: 1px #e6e6e6 solid; } - .faqs { display: -webkit-box; display: -ms-flexbox; diff --git a/resources/views/employers/favorite.blade.php b/resources/views/employers/favorite.blade.php index bca3e6d..c51ca92 100644 --- a/resources/views/employers/favorite.blade.php +++ b/resources/views/employers/favorite.blade.php @@ -83,90 +83,162 @@ -
- @if ((isset($Workers) && ($Workers->count()))) @foreach ($Workers as $it)
- -
- - - - @if (!empty($it->photo)) + +
+
+ + + + @if (!empty($it->photo)) - @else + @else - @endif + @endif +
+ +
+ + + @guest + + @else + @if (App\Classes\StatusUser::Status()==0) + @if ((!Auth()->user()->is_worker) && (Auth()->user()->is_message)) + + @endif + @else + + @endif + @endif + + Подробнее +
+ +
-
- Статус - @if ($it->status_work == 0) Ищу работу - @elseif ($it->status_work == 1) Не указано - @elseif ($it->status_work == 2) Не ищу - @endif - +
+
+
+ @if ($it->status_work == 0) Ищу работу + @elseif ($it->status_work == 1) Не указано + @elseif ($it->status_work == 2) Не ищу + @endif +
+
+ Обновлено: {{ date('d.m.Y', strtotime($it->updated_at)) }} +
+
+
+ Предпочтение по типу судна: +
{{ $it->boart_type_preference ?? '-' }}
+
-
- Имя кандидата - ({{ $it->id }}) @if (isset($it->users)) {{ $it->users->surname." ".$it->users->name_man." ".$it->users->surname2." (".$it->users->id.")" }} @endif + +
+
+ ФИО: +
@if (isset($it->users)){{ $it->users->surname." ".$it->users->name_man." ".$it->users->surname2 }} @endif
+
+
+ Наличие визы: +
{{ $it->visa_available ?? '-' }}
+
- @if (!empty($it->telephone)) -
- Номер телефона - {{ $it->telephone }} +
+
+ Возраст: +
{{ $it->old_year ?? '-' }}
+
+
+ Наличие танкерных документов: +
{{ $it->tanker_documents_available ?? '-' }}
+
- @endif - @if (!empty($it->telephone2)) -
- Номер телефона2 - {{ $it->telephone2 }} +
+
+ Желаемые вакансии: +
+ @if ($it->job_titles->count()) + @foreach ($it->job_titles as $job_title) + {{ $job_title->name }} + @if (!$loop->last) / @endif + @endforeach + @else + - + @endif +
+
+
+ Наличие подтверждения для работы на ВВП: +
{{ $it->confirmation_work_for_vvp ?? '-' }}
+
- @endif - @if (!empty($it->email)) -
- Электронный адрес - {{ $it->email }} + +
+
+ Пожелание к З/П: +
{{ $it->salary_expectations ?? '-' }}
+
+
+ Город проживания +
{{ $it->city ?? "-" }}
+
- @endif - @if (!empty($it->city)) -
- Город проживания - {{ $it->city }}, {{ $it->address }} + +
+
+ Уровень английского: +
{{ $it->english_level ?? '-' }}
+
+
+ Телефон: + +
- @endif -
- Опыт работы на танкерах - @if (!empty($it->experience)) {{ $it->experience }} @else 0 @endif годов (лет). +
+
+ Дата готовности к посадке: +
{{ $it->ready_boart_date ?? '-' }}
+
+
+ E-mail: + +
-
- Перейти к профилю -
@endforeach diff --git a/resources/views/info_company_new.blade.php b/resources/views/info_company_new.blade.php index 40d4634..c8d5042 100644 --- a/resources/views/info_company_new.blade.php +++ b/resources/views/info_company_new.blade.php @@ -225,54 +225,12 @@ @endif {{ $company[0]->name_company }}
- -
+

{{ $job->name }}

- Описание: {!! $job->text !!} -
- - - @if ((isset($job->jobs)) && ($job->jobs->count()))
diff --git a/resources/views/modals/send_employer.blade.php b/resources/views/modals/send_employer.blade.php index 0c04831..a319ab3 100644 --- a/resources/views/modals/send_employer.blade.php +++ b/resources/views/modals/send_employer.blade.php @@ -12,7 +12,6 @@