From 15f704551e57f2b64fb9f790acbef6fd75f5cfa1 Mon Sep 17 00:00:00 2001
From: anazaryan <anazaryan@nologostudio.ru>
Date: Tue, 17 Dec 2024 20:22:58 +0400
Subject: [PATCH] employer personal cabinet new fixes

---
 app/Http/Controllers/EmployerController.php      |   11 +++-------
 app/Models/Chat.php                              |    6 +++---
 resources/views/employers/bd.blade.php           |    5 +++++
 resources/views/employers/edit_vacancy.blade.php |   24 ++++++++++++++++++----
 resources/views/employers/list_vacancy.blade.php |    4 ++--
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/EmployerController.php b/app/Http/Controllers/EmployerController.php
index 3d7104d..a0cdaed 100644
--- a/app/Http/Controllers/EmployerController.php
+++ b/app/Http/Controllers/EmployerController.php
@@ -390,14 +390,9 @@ class EmployerController extends Controller
         $chat_id = $request->get('id');
         $is_fixed = $request->get('is_fixed');
 
-        $new_state = Chat::pin_chat($chat_id, $is_fixed);
-
-        if ($new_state !== null) {
-            $message = $new_state ? 'Сообщение закреплено' : 'Сообщение откреплено';
-            return redirect()->back()->with('success', $message);
-        }
-
-        return redirect()->back()->withErrors(['message' => 'Ошибка: сообщение не удалось обновить.']);
+        $chat = Chat::pin_chat($chat_id, $is_fixed);
+        $message = $chat->is_fixed ? 'Сообщение закреплено' : 'Сообщение откреплено';
+        return redirect()->back()->with('success', $message);
     }
 
     public function remove_chat(Request $request){
diff --git a/app/Models/Chat.php b/app/Models/Chat.php
index e6199ce..329156c 100644
--- a/app/Models/Chat.php
+++ b/app/Models/Chat.php
@@ -49,12 +49,12 @@ class Chat extends Model
 
     public static function pin_chat(int $chat_id, $fixed)
     {
-
-        return self::where('id', '=', $chat_id)
-            ->update([
+        $chat = self::query()->find($chat_id);
+        $chat->update([
                 'is_fixed' => !empty($fixed) ? 1 : 0,
                 'fixation_date' => !empty($fixed) ? Carbon::now() : null
             ]);
+        return $chat;
     }
 
     public static function remove_chat(int $chat_id)
diff --git a/resources/views/employers/bd.blade.php b/resources/views/employers/bd.blade.php
index 4f7cecb..bbb8ed4 100644
--- a/resources/views/employers/bd.blade.php
+++ b/resources/views/employers/bd.blade.php
@@ -148,6 +148,7 @@
                                     <table>
                                         <thead>
                                         <tr>
+                                            <th></th>
                                             <th>ФИО соискателя</th>
                                             <th>Должность</th>
                                             <th>Наличие<br>анкеты</th>
@@ -163,6 +164,10 @@
                         @foreach ($users as $key => $it)
                             @php $worker = !empty($it->workers[0]) ? $it->workers[0] : ''; @endphp
                             <tr>
+                                <td style="max-width: 40px; min-width: 30px; font-size: 1.5rem">
+                                    {{ $it->workers[0]->comment }}
+                                </td>
+
                                 <td>{{ $it->surname." ".$it->name_man }}<br>{{ $it->surname2 }}</td>
 
                                 <td>
diff --git a/resources/views/employers/edit_vacancy.blade.php b/resources/views/employers/edit_vacancy.blade.php
index a40e259..8cc3923 100644
--- a/resources/views/employers/edit_vacancy.blade.php
+++ b/resources/views/employers/edit_vacancy.blade.php
@@ -154,9 +154,9 @@
                                     <div class="form-group__item">
                                         <textarea class="textarea ckeditor" name="text" id="text">{{ old('text') ?? $ad_employer->text ?? '' }}</textarea>
                                         @error('text')
-                                        <span class="text-xs text-red-600">
-                                          {{ $message }}
-                                    </span>
+                                            <span class="text-xs text-red-600">
+                                                  {{ $message }}
+                                            </span>
                                         @enderror
                                     </div>
                                 </div>
@@ -172,7 +172,23 @@
     </div>
     <script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>
     <script>
-        CKEDITOR.replace('text');
+        CKEDITOR.replace('text', {
+            allowedContent: true,
+            extraAllowedContent: 'p br strong em u ul ol li span;*{*}',
+
+            on: {
+                paste: function (event) {
+                    let data = event.data.dataValue;
+                    data = data.replace(/<br\s*\/?>\s*<br\s*\/?>/g, '<br>');
+                    event.data.dataValue = data.trim();
+                }
+            },
+
+            contentsCss: [
+                CKEDITOR.basePath + 'contents.css',
+                '/css/custom-ckeditor.css'
+            ]
+        });
         //CKEDITOR.replace( 'text', {
         //     filebrowserUploadUrl: "{{route('ckeditor.image-upload', ['_token' => csrf_token() ])}}",
         //     filebrowserImageUploadUrl: "{{ route('ckeditor.image-upload', ['_token' => csrf_token() ])}}",
diff --git a/resources/views/employers/list_vacancy.blade.php b/resources/views/employers/list_vacancy.blade.php
index 014371a..b67cc57 100644
--- a/resources/views/employers/list_vacancy.blade.php
+++ b/resources/views/employers/list_vacancy.blade.php
@@ -158,13 +158,13 @@
                                                         @if ($it->active_is)
                                                             <a href="{{ route('employer.vacancy_eye', ['ad_employer' => $it->id, 'status' => 0]) }}" title="Скрыть вакансию"  class="table__controls-item">
                                                                 <svg preserveAspectRatio="xMidYMid meet">
-                                                                    <use xlink:href="{{ asset('images/sprite.svg#eye') }}"></use>
+                                                                    <use xlink:href="{{ asset('images/sprite.svg#eye-3') }}"></use>
                                                                 </svg>
                                                             </a>
                                                         @else
                                                             <a href="{{ route('employer.vacancy_eye', ['ad_employer' => $it->id, 'status' => 1]) }}" title="Показать вакансию"  class="table__controls-item">
                                                                 <svg preserveAspectRatio="xMidYMid meet">
-                                                                    <use xlink:href="{{ asset('images/sprite.svg#eye-3') }}"></use>
+                                                                    <use xlink:href="{{ asset('images/sprite.svg#eye') }}"></use>
                                                                 </svg>
                                                             </a>
                                                         @endif
-- 
1.7.10.4