From 7fa088c5b0476e7dfcdc6f928a1766b3c30e1b5a Mon Sep 17 00:00:00 2001
From: Sergey Panarin <sp@nologostudio.ru>
Date: Wed, 31 Jul 2024 11:02:13 +0200
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D1=87=D0=B8=2058,49,51=20?=
 =?UTF-8?q?+=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BE=D1=82=20=D0=9C=D0?=
 =?UTF-8?q?=B0=D1=80=D0=B8=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/EmployerController.php        |   14 +++++++++++
 app/Http/Controllers/WorkerController.php          |   13 +++++++---
 public/css/style_may2024.css                       |    2 ++
 resources/views/employers/bd.blade.php             |   16 ++++++++----
 resources/views/employers/dialog.blade.php         |    6 ++++-
 resources/views/workers/cabinet.blade.php          |    7 ++++--
 resources/views/workers/dialog.blade.php           |   26 +++++++++++++++-----
 resources/views/workers/docs-edit.blade.php        |    2 +-
 .../workers/form_additional_documents.blade.php    |    2 +-
 .../views/workers/form_basic_information.blade.php |    2 +-
 .../views/workers/prev_company_edit_form.blade.php |    2 +-
 resources/views/workers/sertificate_edit.blade.php |    2 +-
 12 files changed, 72 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/EmployerController.php b/app/Http/Controllers/EmployerController.php
index 9f427d2..0517707 100644
--- a/app/Http/Controllers/EmployerController.php
+++ b/app/Http/Controllers/EmployerController.php
@@ -530,6 +530,20 @@ class EmployerController extends Controller
 
         $validator = Validator::make($request->all(), $rules, $messages);
 
+        /*if ($validator->fails()) {
+            return redirect()->route('employer.dialog', ['user1' => $user1, 'user2' => $user2])
+                ->withErrors($validator);
+        } else {
+            if ($request->has('file')) {
+                $params['file'] = $request->file('file')->store("messages", 'public');
+            }
+            Message::create($params);
+            //return redirect()->route('employer.dialog', ['user1' => $user1, 'user2' => $user2]);
+            return redirect()->route('employer.dialog',
+                ['user1' => $user1, 'user2' => $user2, 'ad_employer' => $id_vacancy, 'ad_name' => $ad_name]);
+
+        }*/
+
         if ($validator->fails()) {
             return redirect()->route('employer.dialog', ['user1' => $user1, 'user2' => $user2])
                 ->withErrors($validator);
diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php
index f08ed22..34858de 100644
--- a/app/Http/Controllers/WorkerController.php
+++ b/app/Http/Controllers/WorkerController.php
@@ -818,9 +818,12 @@ class WorkerController extends Controller
         }
 
         if (isset($user2->id)) {
-            $companion = User_Model::query()->with('workers')->
-            with('employers')->
-            where('id', $user2->id)->first();
+            $companion = User_Model::query()
+                ->with('workers')
+                ->with('employers')
+                ->where('id', $user2->id)
+                ->first()
+            ;
         }
 
         $Messages = Message::query()->
@@ -832,6 +835,10 @@ class WorkerController extends Controller
         ->get()
         ;
 
+        Message::where('user_id', '=', $user2->id)
+            ->where('to_user_id', '=', $user1->id)
+            ->update(['flag_new' => 0]);
+
         return view('workers.dialog', compact('companion', 'sender', 'Messages', 'ad_employer'));
     }
 
diff --git a/public/css/style_may2024.css b/public/css/style_may2024.css
index f8863c1..d18fd86 100644
--- a/public/css/style_may2024.css
+++ b/public/css/style_may2024.css
@@ -7110,6 +7110,8 @@ main + .news {
       -ms-flex-direction: column;
           flex-direction: column;
   gap: 10px;
+    max-height: 400px;
+    overflow: auto;
 }
 @media (min-width: 768px) {
   .chatbox__list {
diff --git a/resources/views/employers/bd.blade.php b/resources/views/employers/bd.blade.php
index 3f99237..d2ac597 100644
--- a/resources/views/employers/bd.blade.php
+++ b/resources/views/employers/bd.blade.php
@@ -16,6 +16,11 @@
             $('.cabinet__export-button-wrap button').click(function(){
                 $('.cabinet__export-error').parent().remove();
             });
+
+            $('.search-reset-button').click(function(){
+                var wrap = $(this).closest('.cabinet__filters');
+                wrap.find('[name="search"]').val('');
+            });
         });
 
 
@@ -65,18 +70,19 @@
                         <h2 class="title cabinet__title">База данных</h2>
                     </div>
                     <div class="cabinet__body-item">
-                        <div class="cabinet__filters">
+                        <div class="cabinet__filters" style="display: flex;flex-direction: unset;justify-content: left;align-items: center;">
                             <div class="cabinet__filters-item">
                                 <form class="search" action="{{ route('employer.bd') }}">
                                     <input type="search" name="search" id="search" class="input" placeholder="Поиск&hellip;" value="@if (isset($_GET['search'])) {{ $_GET['search'] }} @endif">
                                     <button type="submit" class="button">Найти</button>
                                     <span>
-                                            <svg>
-                                                <use xlink:href="{{ asset('images/sprite.svg#search') }}"></use>
-                                            </svg>
-                                        </span>
+                                        <svg>
+                                            <use xlink:href="{{ asset('images/sprite.svg#search') }}"></use>
+                                        </svg>
+                                    </span>
                                 </form>
                             </div>
+                            <a href="javascript:void(0)" class="search-reset-button bold font18" style="color: #377d87;">Сбросить поиск</a>
                         </div>
                         <div class="cabinet__filters">
                             <div class="cabinet__export-wrap">
diff --git a/resources/views/employers/dialog.blade.php b/resources/views/employers/dialog.blade.php
index 318de83..eabdcc5 100644
--- a/resources/views/employers/dialog.blade.php
+++ b/resources/views/employers/dialog.blade.php
@@ -2,7 +2,11 @@
 
 @section('scripts')
     <script>
-        console.log('Test system');
+        $(function(){
+            var chatbox_div = $('.chatbox__list');
+            chatbox_div.scrollTop(chatbox_div.prop("scrollHeight"));
+        });
+
         $(document).on('change', '#send_btn', function() {
             var this_ = $(this);
             var val_ = this_.val();
diff --git a/resources/views/workers/cabinet.blade.php b/resources/views/workers/cabinet.blade.php
index 1727ce3..8e48cab 100644
--- a/resources/views/workers/cabinet.blade.php
+++ b/resources/views/workers/cabinet.blade.php
@@ -118,15 +118,18 @@
                                 </div>
                                 <div class="cabinet__avatar-form">
                                     <label class="file">
-                                            <span class="file__input">
+                                            <span class="file__input flex">
                                                 <input type="file" name="photo" id="photo">
 
-                                                <span class="button">
+                                                <span class="button mr-20">
                                                     <svg>
                                                         <use xlink:href="{{ asset('images/sprite.svg#plus') }}"></use>
                                                     </svg>
                                                     Загрузить
                                                 </span>
+                                                @if (!empty($worker->photo))
+                                                    <button type="submit" class="button">Удалить фото</button>
+                                                @endif
                                             </span>
                                     </label>
                                     <p class="cabinet__text">Загрузите фотографию в формате svg., jpg., jpeg., png.</p>
diff --git a/resources/views/workers/dialog.blade.php b/resources/views/workers/dialog.blade.php
index a06c656..2dee58a 100644
--- a/resources/views/workers/dialog.blade.php
+++ b/resources/views/workers/dialog.blade.php
@@ -2,7 +2,11 @@
 
 @section('scripts')
     <script>
-        console.log('Test system');
+        $(function(){
+            var chatbox_div = $('.chatbox__list');
+            chatbox_div.scrollTop(chatbox_div.prop("scrollHeight"));
+        });
+
         $(document).on('change', '#send_btn', function() {
             var this_ = $(this);
             var val_ = this_.val();
@@ -91,8 +95,8 @@
                                             @endif
                                         </div>
                                     </div>
-                                    @if (isset($companion->worker->id))
-                                    <a href="{{ route('resume_profile', ['worker' => $companion->worker->id]) }}" class="button chatbox__toper-button">
+                                    @if (isset($companion->workers[0]->id))
+                                    <a href="{{ route('resume_profile', ['worker' => $companion->workers[0]->id]) }}" class="button chatbox__toper-button">
                                         <svg>
                                             <use xlink:href="{{ asset('images/sprite.svg#cabinet-1') }}"></use>
                                         </svg>
@@ -100,7 +104,7 @@
                                     </a>
                                     @endif
                                 @else
-                                    <div class="chatbox__toper-info messages__item-info">
+                                    <div class="chatbox__toper-info messages__item-info 222">
                                         <div class="messages__item-photo">
                                             <svg>
                                                 <use xlink:href="{{ asset('images/sprite.svg#pic') }}"></use>
@@ -117,8 +121,8 @@
                                             <div><span>Статус:</span> Работодатель или Администратор</div>
                                         </div>
                                     </div>
-                                    @if (isset($companion->employer->id))
-                                    <a href="" class="button chatbox__toper-button">
+                                    @if (isset($companion->employers[0]->id))
+                                    <a href="{{ route('info_company', ['company' => $companion->employers[0]->id]) }}" class="button chatbox__toper-button">
                                         <svg>
                                             <use xlink:href="{{ asset('images/sprite.svg#cabinet-1') }}"></use>
                                         </svg>
@@ -128,6 +132,16 @@
                                 @endif
                             </div>
 
+                            @if ($errors->any())
+                                <div class="red bold">
+                                    <ul>
+                                        @foreach ($errors->all() as $error)
+                                            <li>{{ $error }}</li>
+                                        @endforeach
+                                    </ul>
+                                </div>
+                            @endif
+
                             <div class="chatbox__list" id="dialogs" name="dialogs">
                                @if ($Messages->count())
                                     @foreach ($Messages as $it)
diff --git a/resources/views/workers/docs-edit.blade.php b/resources/views/workers/docs-edit.blade.php
index d13ccc0..4034465 100644
--- a/resources/views/workers/docs-edit.blade.php
+++ b/resources/views/workers/docs-edit.blade.php
@@ -82,7 +82,7 @@
 
                 <div class="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_additional_documents.blade.php b/resources/views/workers/form_additional_documents.blade.php
index e2dfb92..8b3cb97 100644
--- a/resources/views/workers/form_additional_documents.blade.php
+++ b/resources/views/workers/form_additional_documents.blade.php
@@ -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 df35f75..4a7537a 100644
--- a/resources/views/workers/form_basic_information.blade.php
+++ b/resources/views/workers/form_basic_information.blade.php
@@ -173,7 +173,7 @@
             <div class="cabinet__body-item cabinet__inputs-item-full-row">
                 <div class="cabinet__buttons_flex">
                     <button type="submit" class="button">Сохранить</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/prev_company_edit_form.blade.php b/resources/views/workers/prev_company_edit_form.blade.php
index 0e7bb9b..5d6f8db 100644
--- a/resources/views/workers/prev_company_edit_form.blade.php
+++ b/resources/views/workers/prev_company_edit_form.blade.php
@@ -40,7 +40,7 @@
 
             <div class="flex">
                 <button type="submit" class="button mr-10">Сохранить</button>
-                <a href="{{ route('worker.cabinet') }}" class="button button_light">Отменить</a>
+                <a href="{{ route('worker.cabinet') }}" class="button button_light">Назад</a>
             </div>
         </div>
     </div>
diff --git a/resources/views/workers/sertificate_edit.blade.php b/resources/views/workers/sertificate_edit.blade.php
index 60dda77..1a6bbc6 100644
--- a/resources/views/workers/sertificate_edit.blade.php
+++ b/resources/views/workers/sertificate_edit.blade.php
@@ -31,7 +31,7 @@
 
     <div class="flex">
         <button type="submit" class="button mr-10">Сохранить</button>
-        <a href="{{ route('worker.cabinet') }}" class="button button_light">Отменить</a>
+        <a href="{{ route('worker.cabinet') }}" class="button button_light">Назад</a>
     </div>
 </form>
 @endsection
-- 
1.7.10.4