From 2b21634e3924e3d301aea07b666c245500a188d7 Mon Sep 17 00:00:00 2001
From: anazaryan <anazaryan@nologostudio.ru>
Date: Thu, 19 Dec 2024 18:30:27 +0400
Subject: [PATCH] workers profile page fixes/modifications

---
 app/Http/Controllers/WorkerController.php          |    4 +-
 public/css/general.css                             |    4 ++
 resources/views/workers/cabinet.blade.php          |    4 ++
 resources/views/workers/docs.blade.php             |   28 +++++++++--
 resources/views/workers/favorite.blade.php         |    2 +-
 .../workers/form_additional_documents.blade.php    |    4 +-
 .../views/workers/form_basic_information.blade.php |   15 +++---
 resources/views/workers/menu.blade.php             |    6 ++-
 resources/views/workers/sertificate_add.blade.php  |   22 +++++++--
 resources/views/workers/sertificate_edit.blade.php |   49 ++++++++++++++++++--
 10 files changed, 114 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php
index 6a0870d..d7dfd75 100644
--- a/app/Http/Controllers/WorkerController.php
+++ b/app/Http/Controllers/WorkerController.php
@@ -799,7 +799,7 @@ class WorkerController extends Controller
         $worker->updated_at = Carbon::now();
         $worker->save();
         // 0
-        return redirect()->route('worker.cabinet')->with('success', 'Ваша анкета была поднята выше остальных');
+        return redirect()->route('worker.cabinet')->with('success', 'Резюме подняли');
     }
 
     // Форма сертификате
@@ -881,7 +881,7 @@ class WorkerController extends Controller
             );
         }
 
-        return redirect()->route('worker.additional_documents')->with('success', 'Успешно сохранено!');
+        return redirect()->route('worker.cabinet')->with('success', 'Успешно сохранено!');
     }
     public function subscribe() {
 
diff --git a/public/css/general.css b/public/css/general.css
index 6559619..e3d0050 100644
--- a/public/css/general.css
+++ b/public/css/general.css
@@ -60,3 +60,7 @@
     margin-top: 0;
     margin-bottom: 15px;
 }
+
+.sertificate-form-inputs {
+    align-items: normal!important;
+}
diff --git a/resources/views/workers/cabinet.blade.php b/resources/views/workers/cabinet.blade.php
index 00700c1..2b5800a 100644
--- a/resources/views/workers/cabinet.blade.php
+++ b/resources/views/workers/cabinet.blade.php
@@ -1,6 +1,10 @@
 @extends('layout.frontend', ['title' => 'Моя анкета - РекаМоре'])
 
 @section('scripts')
+@include('modals.flash-message', [
+    'title' => 'Успешно!',
+    'message' => session('success')
+])
 <script>
     $(function() {
         $('.cabinet__avatar-form [type="file"][name="photo"]').change(function (event) {
diff --git a/resources/views/workers/docs.blade.php b/resources/views/workers/docs.blade.php
index 7f55b32..56c448d 100644
--- a/resources/views/workers/docs.blade.php
+++ b/resources/views/workers/docs.blade.php
@@ -62,16 +62,29 @@
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Начало контракта</label>
                 <div class="form-group__item">
-                    <input type="text" name="Begin_work" id="Begin_work" class="input" value="{{ old('begin_work') ?? $doc->begin_work ?? '' }}">
+                    <input
+                        type="text"
+                        name="Begin_work"
+                        id="Begin_work"
+                        class="input"
+                        placeholder="11.11.2011"
+                        value="{{ old('begin_work') ?? $doc->begin_work ?? '' }}">
                 </div>
             </div>
 
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Окончание контракта</label>
                 <div class="form-group__item">
-                    <input type="text" name="End_work" id="End_work" class="input" value="{{ old('end_work') ?? $doc->end_work ?? '' }}">
+                    <input
+                        type="text"
+                        name="End_work"
+                        id="End_work"
+                        class="input"
+                        placeholder="11.11.2011"
+                        value="{{ old('end_work') ?? $doc->end_work ?? '' }}">
                 </div>
             </div>
+
         </div>
 
         <div class="flex">
@@ -105,23 +118,30 @@
                 var wrap = this_btn.closest('.cabinet__inputs');
                 var data = {};
                 var form_is_not_filled = false;
+                var date_format_regex = /^\d{2}\.\d{2}\.\d{4}$/;
 
                 wrap.find('.error-block').html('');
                 wrap.find('input').removeClass('border-red');
 
                 wrap.find('input').each(function(){
                     var val = $(this).val().trim();
+                    var name = $(this).attr('name');
 
                     if ($(this).is('[required]') && !val){
                         $(this).addClass('border-red');
                         form_is_not_filled = true;
+                    } else if ($(this).attr('name') === 'Begin_work' || $(this).attr('name') === 'End_work') {
+                        if (!date_format_regex.test(val)) {
+                            $(this).addClass('border-red');
+                            $(this).after('<span class="error-block">Неверный формат даты (дд.мм.гггг).</span>');
+                            form_is_not_filled = true;
+                        }
                     }
 
-                    var name = $(this).attr('name');
                     data[name] = val;
                 });
 
-                if (form_is_not_filled){
+                if (form_is_not_filled) {
                     spinStop(this_btn);
                     return;
                 }
diff --git a/resources/views/workers/favorite.blade.php b/resources/views/workers/favorite.blade.php
index 739b12e..8ea42fe 100644
--- a/resources/views/workers/favorite.blade.php
+++ b/resources/views/workers/favorite.blade.php
@@ -124,7 +124,7 @@
                                             </div>
                                             <div class="main__employer-page-two-item-bottom">
                                                 <div class="main__employer-page-two-item-bottom-date">{{ $Q->created_at }}</div>
-                                                <button type="button" data-val="{{ $Q->id }}" class="like main__employer-page-two-item-bottom-like js-toggle js_vac_favorite {{ \App\Classes\LikesClass::get_status_vacancy($Q) }}?>">
+                                                <button type="button" data-val="{{ $Q->id }}" class="like main__employer-page-two-item-bottom-like js-toggle js_vac_favorite {{ \App\Classes\LikesClass::get_status_vacancy($Q) }}">
                                                     <svg>
                                                         <use xlink:href="{{ asset('images/sprite.svg#heart') }}"></use>
                                                     </svg>
diff --git a/resources/views/workers/form_additional_documents.blade.php b/resources/views/workers/form_additional_documents.blade.php
index 8b3cb97..d37c02c 100644
--- a/resources/views/workers/form_additional_documents.blade.php
+++ b/resources/views/workers/form_additional_documents.blade.php
@@ -1,7 +1,7 @@
 @extends('workers.cabinet_layout', ['title' => 'Дополнительные документы - РекаМоре'])
 
 @section('cabinet_content')
-<form action="{{ route('worker.edit_diploms', ['worker' => $worker->id]) }}" class="cabinet__inputs" method="POST">
+        <form action="{{ route('worker.edit_diploms', ['worker' => $worker->id]) }}" class="cabinet__inputs" method="POST">
     @csrf
     @method('PUT')
 
@@ -38,7 +38,7 @@
             <div class="cabinet__body-item cabinet__inputs-item-full-row">
                 <div class="cabinet__buttons_flex">
                     <button type="submit" class="button mr-10">Сохранить</button>
-                    <a href="{{ route('worker.cabinet') }}" class="button button_light active">Назад</a>
+                    <a href="{{ route('worker.cabinet') }}" class="button button_light active">Вернуться к моей анкете</a>
                 </div>
             </div>
         </div>
diff --git a/resources/views/workers/form_basic_information.blade.php b/resources/views/workers/form_basic_information.blade.php
index 4a7537a..d93ecc1 100644
--- a/resources/views/workers/form_basic_information.blade.php
+++ b/resources/views/workers/form_basic_information.blade.php
@@ -114,27 +114,27 @@
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Наличие визы:</label>
                 <div class="form-group__item">
-                    <input type="text" name="visa_available" id="visa_available" value="{{ $worker->visa_available }}" class="input" placeholder="Да">
+                    <input type="text" name="visa_available" id="visa_available" value="{{ $worker->visa_available }}" class="input" placeholder="В наличии / Отсутствует">
                 </div>
             </div>
 
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Наличие танкерных документов:</label>
                 <div class="form-group__item">
-                    <input type="text" name="tanker_documents_available" id="tanker_documents_available" value="{{ $worker->tanker_documents_available }}" class="input" placeholder="Нет">
+                    <input type="text" name="tanker_documents_available" id="tanker_documents_available" value="{{ $worker->tanker_documents_available }}" class="input" placeholder="В наличии / Отсутствует">
                 </div>
             </div>
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Наличие подтверждения для работы на ВВП:</label>
                 <div class="form-group__item">
-                    <input type="text" name="confirmation_work_for_vvp" id="confirmation_work_for_vvp" value="{{ $worker->confirmation_work_for_vvp }}" class="input" placeholder="Нет">
+                    <input type="text" name="confirmation_work_for_vvp" id="confirmation_work_for_vvp" value="{{ $worker->confirmation_work_for_vvp }}" class="input" placeholder="В наличии / Отсутствует">
                 </div>
             </div>
 
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Наличие военного билета / приписного свидетельства:</label>
                 <div class="form-group__item">
-                    <input type="text" name="military_id_available" id="military_id_available" value="{{ $worker->military_id_available }}" class="input" placeholder="Нет">
+                    <input type="text" name="military_id_available" id="military_id_available" value="{{ $worker->military_id_available }}" class="input" placeholder="НВ наличии / Отсутствуетет">
                 </div>
             </div>
             <div class="cabinet__inputs-item form-group">
@@ -160,14 +160,17 @@
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Контакты родственников:</label>
                 <div class="form-group__item">
-                    <input type="text" name="telephone2" id="telephon2" value="{{ old('telephone2') ?? $worker->telephone2 ?? '' }}" class="input">
+                    <input type="text" name="telephone2" id="telephon2" value="{{ old('telephone2') ?? $worker->telephone2 ?? '' }}" class="input" placeholder="+7 (___) ___-__-__ - мама">
                 </div>
             </div>
             <div class="cabinet__inputs-item form-group"></div>
 
             <div class="cabinet__body-item cabinet__inputs-item-full-row">
                 <h4 class="cabinet__h4">О себе</h4>
-                <textarea class="textarea" name="text" id="text" placeholder="Не указано">{{ $worker->text }}</textarea>
+                <textarea class="textarea" name="text" id="text"
+                          placeholder="Укажите информацию, которая поможет работодателю или укажите недостающую информацию, которую не смогли указать при заполнении анкеты.">
+                    {{ $worker->text }}
+                </textarea>
             </div>
 
             <div class="cabinet__body-item cabinet__inputs-item-full-row">
diff --git a/resources/views/workers/menu.blade.php b/resources/views/workers/menu.blade.php
index dd553b1..39eff91 100644
--- a/resources/views/workers/menu.blade.php
+++ b/resources/views/workers/menu.blade.php
@@ -26,7 +26,7 @@
                     </i>
                     <span>Сообщения</span>
                 </a>
-                <a href="{{ route('worker.autolift') }}" class="cabinet__menu-item @if ($item==7) active @endif">
+                <a href="{{ route('worker.autolift') }}" class="cabinet__menu-item @if ($item==15) active @endif">
                     <i>
                         <svg>
                             <use xlink:href="{{ asset('images/sprite.svg#refresh') }}"></use>
@@ -34,7 +34,7 @@
                     </i>
                     <span>Автоподнятие резюме</span>
                 </a>
-                <a href="{{ route('worker.autoresponder') }}" class="cabinet__menu-item @if ($item==6) active @endif">
+                <a href="{{ route('worker.autoresponder') }}" class="cabinet__menu-item @if ($item==16) active @endif">
                     <i>
                         <svg>
                             <use xlink:href="{{ asset('images/sprite.svg#answering') }}"></use>
@@ -84,7 +84,9 @@
 <script>
     $(function(){
         var active_menu = $('.cabinet__menu-item.active');
+        console.log(active_menu.length);
         if (active_menu.length === 1){
+
             $('.cabinet__menu-toper-text').html(active_menu.html());
         }
     });
diff --git a/resources/views/workers/sertificate_add.blade.php b/resources/views/workers/sertificate_add.blade.php
index d3197d6..4e31338 100644
--- a/resources/views/workers/sertificate_add.blade.php
+++ b/resources/views/workers/sertificate_add.blade.php
@@ -9,7 +9,7 @@
     <div class="error-block"></div>
 
     <div class="cabinet__body-item width100">
-        <div class="cabinet__inputs">
+        <div class="cabinet__inputs sertificate-form-inputs">
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Название сертификата:</label>
                 <div class="form-group__item">
@@ -25,7 +25,14 @@
                     @error('end_begin')
                         <div class="error red">{{ $message }}</div>
                     @enderror
-                    <input type="text" name="end_begin" id="end_begin" class="input" value="{{ old('end_begin') ?? '' }}" required>
+                    <input
+                        type="text"
+                        name="end_begin"
+                        id="end_begin"
+                        class="input"
+                        placeholder="11.11.2011"
+                        value="{{ old('end_begin') ?? '' }}"
+                        required>
                 </div>
             </div>
         </div>
@@ -59,9 +66,10 @@
                 var this_btn = $(this);
                 spinStart(this_btn);
                 var wrap = this_btn.closest('.cabinet__inputs');
-                var name = wrap.find('[name="name"]').val();
-                var end_date = wrap.find('[name="end_begin"]').val();
+                var name = wrap.find('[name="name"]').val().trim();
+                var end_date = wrap.find('[name="end_begin"]').val().trim();
                 var worker_id = wrap.find('[name="worker_id"]').val();
+                var date_format_regex = /^\d{2}\.\d{2}\.\d{4}$/; // Format: DD.MM.YYYY
 
                 wrap.find('.error-block').html('');
                 wrap.find('input').removeClass('border-red');
@@ -73,6 +81,12 @@
                 }
                 if (!end_date) {
                     wrap.find('[name="end_begin"]').addClass('border-red');
+                    wrap.find('[name="end_begin"]').after('<span class="error-block">Поле "Дата окончания" обязательно для заполнения.</span>');
+                    spinStop(this_btn);
+                    return;
+                } else if (!date_format_regex.test(end_date)) {
+                    wrap.find('[name="end_begin"]').addClass('border-red');
+                    wrap.find('[name="end_begin"]').after('<span class="error-block">Неверный формат даты (дд.мм.гггг).</span>');
                     spinStop(this_btn);
                     return;
                 }
diff --git a/resources/views/workers/sertificate_edit.blade.php b/resources/views/workers/sertificate_edit.blade.php
index 1a6bbc6..e6ac98c 100644
--- a/resources/views/workers/sertificate_edit.blade.php
+++ b/resources/views/workers/sertificate_edit.blade.php
@@ -7,14 +7,14 @@
     <input type="hidden" name="worker_id" id="worker_id" class="input" value="{{ $worker->id }}">
 
     <div class="cabinet__body-item width100">
-        <div class="cabinet__inputs">
+        <div class="cabinet__inputs sertificate-form-inputs">
             <div class="cabinet__inputs-item form-group">
                 <label class="form-group__label">Название сертификата:</label>
                 <div class="form-group__item">
                     @error('name')
                     <div class="error red">{{ $message }}</div>
                     @enderror
-                    <input type="text" name="name" id="name" class="input" value="{{ old('name') ?? $doc->name }}" required>
+                    <input type="text" name="name" id="name" class="input" value="{{ old('name') ?? $doc->name }}">
                 </div>
             </div>
             <div class="cabinet__inputs-item form-group">
@@ -23,7 +23,13 @@
                     @error('end_begin')
                     <div class="error red">{{ $message }}</div>
                     @enderror
-                    <input type="text" name="end_begin" id="end_begin" class="input" value="{{ old('end_begin') ?? date('d.m.Y', strtotime($doc->end_begin)) }}" required>
+                    <input
+                        type="text"
+                        name="end_begin"
+                        id="end_begin"
+                        class="input"
+                        placeholder="11.11.2011"
+                        value="{{ old('end_begin') ?? date('d.m.Y', strtotime($doc->end_begin)) }}">
                 </div>
             </div>
         </div>
@@ -35,3 +41,40 @@
     </div>
 </form>
 @endsection
+
+@section('scripts')
+
+    <script>
+        $('#submit_form').on('submit', function (event) {
+            event.preventDefault();
+            var form = $(this);
+            var isValid = true;
+
+            form.find('.error-block').remove();
+            form.find('input').removeClass('border-red');
+
+            var name = form.find('[name="name"]').val().trim();
+            if (!name) {
+                form.find('[name="name"]').addClass('border-red');
+                isValid = false;
+            }
+
+            var endDate = form.find('[name="end_begin"]').val().trim();
+            var dateFormatRegex = /^\d{2}\.\d{2}\.\d{4}$/;
+            if (!endDate) {
+                form.find('[name="end_begin"]').addClass('border-red');
+                form.find('[name="end_begin"]').after('<span class="error-block">Поле "Действия сертификата до" обязательно для заполнения.</span>');
+                isValid = false;
+            } else if (!dateFormatRegex.test(endDate)) {
+                form.find('[name="end_begin"]').addClass('border-red');
+                form.find('[name="end_begin"]').after('<span class="error-block">Неверный формат даты (дд.мм.гггг).</span>');
+                isValid = false;
+            }
+
+            if (isValid) {
+                form.off('submit').submit();
+            }
+        });
+
+    </script>
+@endsection
-- 
1.7.10.4