From 6bad752f0bc6ef5519e0376f43f6f0742d2a9571 Mon Sep 17 00:00:00 2001
From: Fedor <fed8055@yandex.ru>
Date: Tue, 1 Oct 2024 21:07:07 +0700
Subject: [PATCH] task-132687 minor changes

---
 app/Classes/Tools.php                              |   38 ++++++++++++++------
 .../Integrations/Telegram/VacancyChannel.php       |    1 +
 app/Http/Controllers/EmployerController.php        |   12 +++----
 resources/views/admin/users/form.blade.php         |    2 +-
 resources/views/employers/dialog.blade.php         |   24 +++++++++++--
 resources/views/employers/favorite.blade.php       |   38 ++++++++++++++++++--
 .../views/modals/vacancy/add_comment.blade.php     |   31 ++++++++++------
 .../vacancy/ask_for_resume_comment.blade.php       |    2 +-
 .../vacancy/send_response_no_comment.blade.php     |   22 ++++++++++++
 resources/views/vacance-item.blade.php             |    7 ++--
 10 files changed, 137 insertions(+), 40 deletions(-)
 create mode 100644 resources/views/modals/vacancy/send_response_no_comment.blade.php

diff --git a/app/Classes/Tools.php b/app/Classes/Tools.php
index 4b10015..f9aa89a 100644
--- a/app/Classes/Tools.php
+++ b/app/Classes/Tools.php
@@ -27,28 +27,44 @@ class Tools
 
     public static function getWorkerProfilePercent(Worker $Worker): int
     {
-        $persent = 10;
+        $persent = 0;
 
-        if ((!empty($Worker->telephone)) &&
-            (!empty($Worker->email)) && (!empty($Worker->experience)) &&
-            (!empty($Worker->city)) && (!empty($Worker->old_year))) {
-            $persent = $persent + 40;
+        if (
+            (!empty($Worker->users->surname)) &&
+            (!empty($Worker->users->name_man)) &&
+            (!empty($Worker->users->surname2)) &&
+            (!empty($Worker->old_year)) &&
+            ($Worker->job_titles->count() > 0) &&
+            (!empty($Worker->salary_expectations)) &&
+            (!empty($Worker->experience)) &&
+            (!empty($Worker->english_level)) &&
+            (!empty($Worker->ready_boart_date)) &&
+            (!empty($Worker->boart_type_preference)) &&
+            (!empty($Worker->visa_available)) &&
+            (!empty($Worker->confirmation_work_for_vvp)) &&
+            (!empty($Worker->military_id_available)) &&
+            (!empty($Worker->city)) &&
+            (!empty($Worker->telephone)) &&
+            (!empty($Worker->email)) &&
+            (!empty($Worker->telephone2))
+        ) {
+            $persent += 50;
         }
 
         if ($Worker->sertificate->count() > 0) {
-            $persent = $persent + 15;
+            $persent += 10;
         }
 
         if ($Worker->infobloks->count() > 0) {
-            $persent = $persent + 20;
+            $persent += 10;
         }
 
-        if ($Worker->prev_company->count() > 0) {
-            $persent = $persent + 10;
+        if ($Worker->place_worker->count() > 0) {
+            $persent += 25;
         }
 
-        if (!empty($Worker->photo)) {
-            $persent = $persent + 5;
+        if ($Worker->prev_company->count() > 0) {
+            $persent += 5;
         }
 
         return $persent;
diff --git a/app/Components/Integrations/Telegram/VacancyChannel.php b/app/Components/Integrations/Telegram/VacancyChannel.php
index 17a2d75..2a8c167 100644
--- a/app/Components/Integrations/Telegram/VacancyChannel.php
+++ b/app/Components/Integrations/Telegram/VacancyChannel.php
@@ -55,6 +55,7 @@ class VacancyChannel
 
         $text = str_ireplace('<p>', '', $vacancy->text);
         $text = str_ireplace('</p>', '', $text);
+        $text = str_ireplace('<br>', '', $text);
 
         $this->botApi->sendMessage([
             'chat_id' => $chatId,
diff --git a/app/Http/Controllers/EmployerController.php b/app/Http/Controllers/EmployerController.php
index 987c71d..79a379f 100644
--- a/app/Http/Controllers/EmployerController.php
+++ b/app/Http/Controllers/EmployerController.php
@@ -296,13 +296,11 @@ class EmployerController extends Controller
 
     // Обновление даты
     public function vacancy_up(Ad_employer $ad_employer) {
-        $up = date('m/d/Y h:i:s', time());;
-        $vac_emp = Ad_employer::findOrFail($ad_employer->id);
-        $vac_emp->updated_at = $up;
-        $vac_emp->save();
+        $up = date('m/d/Y h:i:s', time());
+        $ad_employer->updated_at = $up;
+        $ad_employer->save();
 
-        return redirect()->back(); //route('employer.vacancy_list');
-        // начало конца
+        return redirect()->back();
     }
 
     //Видимость вакансии
@@ -546,7 +544,7 @@ class EmployerController extends Controller
 
             $workerBuilder->whereHas('users', function (Builder $query) use ($search) {
                 $query->where('surname', 'LIKE', "%$search%")
-                    ->oWhere('name_man', 'LIKE', "%$search%")
+                    ->orWhere('name_man', 'LIKE', "%$search%")
                     ->orWhere('surname2', 'LIKE', "%$search%");
             });
         }
diff --git a/resources/views/admin/users/form.blade.php b/resources/views/admin/users/form.blade.php
index c373242..d40c44f 100644
--- a/resources/views/admin/users/form.blade.php
+++ b/resources/views/admin/users/form.blade.php
@@ -14,7 +14,7 @@
             @isset($list_job_titles)
                 @foreach($list_job_titles as $job_title)
                     <option value="{{ $job_title->id }}"
-                        @if ($user?->workers[0]?->positions_work && in_array($job_title->id , $user->workers[0]->positions_work))
+                        @if (isset($user) && $user?->workers[0]?->positions_work && in_array($job_title->id , $user->workers[0]->positions_work))
                             selected
                         @endif
                     >
diff --git a/resources/views/employers/dialog.blade.php b/resources/views/employers/dialog.blade.php
index 456258b..77e21cb 100644
--- a/resources/views/employers/dialog.blade.php
+++ b/resources/views/employers/dialog.blade.php
@@ -175,12 +175,20 @@
                                                             <img src="{{ asset('images/default_man.jpg') }}" alt="">
                                                         @endif
                                                     @endif
-
                                                 </div>
                                                 <div class="chatbox__item-body">
                                                     @if($it->text || $it->reply_message_id)
                                                         <div class="chatbox__item-text">
-                                                            {{ $it->text ?? '' }}
+                                                            @if($it->ad_employer_id > 0)
+                                                                <b>Отклик на вакансию</b> "{{ \App\Models\Ad_employer::find($it->ad_employer_id)->name }}"<br>
+                                                                @if($it->text)
+                                                                    <b>Комментарий:</b> {{ $it->text }}
+                                                                @endif
+                                                            @else
+                                                                @if($it->text)
+                                                                    {{ $it->text }}
+                                                                @endif
+                                                            @endif
 
                                                             @if($it->reply_message_id)
                                                                 <div class="reply-message">
@@ -234,7 +242,17 @@
                                                 </div>
                                                 <div class="chatbox__item-body">
                                                     @if($it->text)
-                                                        <div class="chatbox__item-text">{{ $it->text }}</div>
+                                                        <div class="chatbox__item-text">
+                                                            @if($it->ad_employer_id > 0)
+                                                                <b>Отклик на вакансию</b> "{{ \App\Models\Ad_employer::find($it->ad_employer_id)->name }}"<br>
+                                                                @if($it->text)
+                                                                    <b>Комментарий:</b> {{ $it->text }}
+                                                                @endif
+                                                            @else
+                                                                @if($it->text)
+                                                                    {{ $it->text }}
+                                                                @endif
+                                                            @endif</div>
                                                     @endif
                                                     @if ((isset($it->file)) && (!empty($it->file)))
                                                         <div class="chatbox__item-text chatbox__item-body-file-name-wrap">
diff --git a/resources/views/employers/favorite.blade.php b/resources/views/employers/favorite.blade.php
index 06169b2..57fe371 100644
--- a/resources/views/employers/favorite.blade.php
+++ b/resources/views/employers/favorite.blade.php
@@ -44,8 +44,39 @@
                 }
             });
         });
+
+        $(document).ready(function() {
+            $(document).on('click', '.js_box_favorit', function () {
+                var id_worker = $(this).attr('data-val');
+                var data = {code_record: id_worker};
+
+                if ($(this).hasClass('active')){
+                    data.delete = 1;
+                }
+
+                $.ajax({
+                    type: "GET",
+                    url: "{{ route('like_resume') }}",
+                    data: data,
+                    headers: {
+                        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+                    },
+                    success: function (data) {
+                        if ($(this).hasClass('active')){
+                            $(this).removeClass('active');
+                        } else{
+                            $(this).addClass('active');
+                        }
+                    },
+                    error: function (data) {
+                        data = JSON.stringify(data);
+                        console.log('Error: ' + data);
+                    }
+                });
+            });
+        });
     </script>
-    @include('js.favorite-worker')
+
 @endsection
 
 @section('content')
@@ -102,7 +133,10 @@
                                             </div>
 
                                             <div class="cvs__item-buttons">
-                                                <button type="button" id="elem_{{ $it->id }}" data-val="{{ $it->id }}" class="like cvs__item-like js_box_favorit js-toggle {{ \App\Classes\LikesClass::get_status_worker($it) }}">
+                                                <button type="button"
+                                                        id="elem_{{ $it->id }}"
+                                                        data-val="{{ $it->id }}"
+                                                        class="like cvs__item-like js_box_favorit {{ \App\Classes\LikesClass::get_status_worker($it) }}">
                                                     <svg class="mr-10">
                                                         <use xlink:href="{{ asset('images/sprite.svg#heart') }}"></use>
                                                     </svg>
diff --git a/resources/views/modals/vacancy/add_comment.blade.php b/resources/views/modals/vacancy/add_comment.blade.php
index 589256b..1e13256 100644
--- a/resources/views/modals/vacancy/add_comment.blade.php
+++ b/resources/views/modals/vacancy/add_comment.blade.php
@@ -16,29 +16,38 @@
                 <label for="comment_text">Не заполнено поле</label>
             </div>
             <div class="modal__form-item">
-                {{--<a id="send_resume" class="button">Отправить</a>--}}
                 <button type="button"
                         data-fancybox
-                        id="send_resume"
                         data-src="#response_sent"
-                        class="button main__employer-page-two-item-button">Отправить</button>
+                        class="button main__employer-page-two-item-button send_resume">Отправить</button>
+                <button type="button"
+                        data-fancybox
+                        data-src="#response_sent_no_comment"
+                        class="button main__employer-page-two-item-button send_resume">Пропустить</button>
             </div>
         </form>
     </div>
 </div>
 
 <script>
-    $(document).on('click', '#send_resume', function(){
+    $(document).on('click', '.send_resume', function(){
+        var data = {
+            user_from: $('#response_user_id').val(),
+            user_to: $('#response_to_user_id').val(),
+            vacancy: $('#response_vacancy').val(),
+            _token: '{{csrf_token()}}'
+        }
+
+        var comment = $('.comment_form textarea').serializeArray()[0].value;
+
+        if (comment !== '') {
+            data.comment = comment;
+        }
+
         $.ajax({
             url: '{{ route('worker.new_message') }}',
             type: 'POST',
-            data: {
-                user_from: $('#response_user_id').val(),
-                user_to: $('#response_to_user_id').val(),
-                vacancy: $('#response_vacancy').val(),
-                comment: $('.comment_form textarea').serializeArray()[0].value,
-                _token: '{{csrf_token()}}'
-            },
+            data: data,
             success: function (data) {
                 //
             }
diff --git a/resources/views/modals/vacancy/ask_for_resume_comment.blade.php b/resources/views/modals/vacancy/ask_for_resume_comment.blade.php
index 0424237..cbc481e 100644
--- a/resources/views/modals/vacancy/ask_for_resume_comment.blade.php
+++ b/resources/views/modals/vacancy/ask_for_resume_comment.blade.php
@@ -20,7 +20,7 @@
             <button type="button"
                     data-fancybox
                     id="send_resume_no_comment"
-                    data-src="#response_sent"
+                    data-src="#response_sent_no_comment"
                     class="button main__employer-page-two-item-button">Нет</button>
         </div>
     </div>
diff --git a/resources/views/modals/vacancy/send_response_no_comment.blade.php b/resources/views/modals/vacancy/send_response_no_comment.blade.php
new file mode 100644
index 0000000..c736d5d
--- /dev/null
+++ b/resources/views/modals/vacancy/send_response_no_comment.blade.php
@@ -0,0 +1,22 @@
+<div id="response_sent_no_comment" class="modal modal_bg">
+    <div class="modal__body">
+        <div class="modal__text">Ваше резюме отправлено работодателю.</div>
+        <div class="modal__text">Спасибо, что пользуетесь нашим сервисом.</div>
+        <div class="modal__text">Удачи Вам в поисках работы.</div>
+        <div class="modal__text"></div>
+        <div class="modal__text"></div>
+        <button type="button"
+            id="close-button"
+            class="button"
+        >
+            Вернуться
+        </button>
+    </div>
+</div>
+<script>
+    $('#close-button').click(function(){
+        $.fancybox.close();
+        $.fancybox.close();
+        $.fancybox.close();
+    });
+</script>
diff --git a/resources/views/vacance-item.blade.php b/resources/views/vacance-item.blade.php
index ef45824..a5325f1 100644
--- a/resources/views/vacance-item.blade.php
+++ b/resources/views/vacance-item.blade.php
@@ -69,19 +69,19 @@
                     <div class="main__employer-page-item">
                         <b>Сайт</b>
                         <span>
-                             <a href="{{ $Query[0]->employer->site }}">{{ $Query[0]->employer->site }}</a>
+                             {{ $Query[0]->employer->site }}
                         </span>
                     </div>
                     <div class="main__employer-page-item">
                         <b>Почта</b>
                         <span>
-                           <a href="{{ $Query[0]->employer->email }}">{{ $Query[0]->employer->email }}</a>
+                           {{ $Query[0]->employer->email }}
                         </span>
                     </div>
                     <div class="main__employer-page-item">
                         <b>Телефон</b>
                         <span>
-                                <a href="tel:{{ $Query[0]->employer->telephone }}">{{ $Query[0]->employer->telephone }}</a>
+                            {{ $Query[0]->employer->telephone }}
                         </span>
                     </div>
                 </div>
@@ -97,7 +97,6 @@
                 @endif
                 <h2 class="main__employer-page-title">{{ $Query[0]->name }}</h2>
                 <h3 class="main__employer-page-title_">Описание вакансии</h3>
-
             </div>
 
             @foreach ($Query as $Q)
-- 
1.7.10.4