From ddb8f38fb5c15e3fc5bd04800fd7c45b9e3d18fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= <alarionov@nologostudio.ru>
Date: Tue, 28 May 2024 19:41:44 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20=D0=BF=D0=BE?=
 =?UTF-8?q?=20=D1=80=D0=B5=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=D1=83=20=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B0=D0=BD=D1=81=D0=B8=D0=B9=20=D0=BE=D0=B1=D1=8A=D1?=
 =?UTF-8?q?=8F=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/WorkerController.php       |    1 +
 app/Http/Requests/JobTitlesRequest.php          |    6 +++++
 resources/views/admin/job_titles/form.blade.php |   17 +++++++-----
 resources/views/ajax/list_vacancies.blade.php   |   32 ++++++++++++++---------
 resources/views/info_company_new.blade.php      |   14 +++++-----
 resources/views/list_vacancies.blade.php        |   21 ++++++++-------
 resources/views/vacance-item.blade.php          |   21 ++++++++-------
 resources/views/workers/favorite.blade.php      |   23 +++++++++-------
 8 files changed, 81 insertions(+), 54 deletions(-)

diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php
index 927a21b..ee14fa1 100644
--- a/app/Http/Controllers/WorkerController.php
+++ b/app/Http/Controllers/WorkerController.php
@@ -704,6 +704,7 @@ class WorkerController extends Controller
 
         $Query = $Query->OrderBy('updated_at')->paginate(3);
 
+
         return view('workers.favorite', compact('Query',
                                                     'Query_count',
                                                                 'Job_title'));
diff --git a/app/Http/Requests/JobTitlesRequest.php b/app/Http/Requests/JobTitlesRequest.php
index e8edb01..187ed0d 100644
--- a/app/Http/Requests/JobTitlesRequest.php
+++ b/app/Http/Requests/JobTitlesRequest.php
@@ -34,6 +34,12 @@ class JobTitlesRequest extends FormRequest
                 'min:0',
                 'max:9999999',
             ],
+            'sort' => [
+                'numeric',
+                'min:0',
+                'max:9999999',
+            ]
+
         ];
     }
 
diff --git a/resources/views/admin/job_titles/form.blade.php b/resources/views/admin/job_titles/form.blade.php
index 94246d1..d15c952 100644
--- a/resources/views/admin/job_titles/form.blade.php
+++ b/resources/views/admin/job_titles/form.blade.php
@@ -45,13 +45,18 @@
         @php
             $sort_num = 100;
         @endphp
-        <select name="sort" class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
+
+        <input name="sort" id="sort"
+               class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
+               placeholder="Сортировка" value="{{ old('sort') ?? $job_title->sort ?? '100' }}"
+        />
+        <!--<select name="sort" class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                 title="Сортировка">
-            @for($i = 1; $i <= 10; $i++)
-                <option value="{{ $sort_num }}" @if (isset($job_title)) @if ($sort_num == $job_title->sort) selected @else  @endif @endif>{{ $sort_num }}</option>
-                @php $sort_num = $sort_num + 10;  @endphp
-            @endfor
-        </select>
+            for($i = 1; $i <= 10; $i++)
+                <option value="{ $sort_num }}" if (isset($job_title)) if ($sort_num == $job_title->sort) selected else  endif endif>{ $sort_num }}</option>
+                php $sort_num = $sort_num + 10;  endphp
+            endfor
+        </select>-->
     </label><br>
 
     <label class="block text-sm">
diff --git a/resources/views/ajax/list_vacancies.blade.php b/resources/views/ajax/list_vacancies.blade.php
index ca92508..5e306a3 100644
--- a/resources/views/ajax/list_vacancies.blade.php
+++ b/resources/views/ajax/list_vacancies.blade.php
@@ -36,19 +36,23 @@
             @else
                 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Rec->title }}" class="main__vacancies-thing-pic">
             @endif
-            <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
+            <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif</span>
         </div>
 
         <div class="main__employer-page-two-item-text">
-            <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
-                специалистов на следующие должности:</div>
-            <div class="main__employer-page-two-item-text-links">
-                @if (isset($Q->jobs))
-                    @foreach ($Q->jobs as $key => $j)
-                        <a>“{{ $j->name }}” – з/п от @if (isset($Q->jobs_code[$key]->min_salary)) {{ $Q->jobs_code[$key]->min_salary }} @endif - @if (isset($Q->jobs_code[$key]->max_salary)) {{ $Q->jobs_code[$key]->max_salary }} @endif рублей (на руки)</a>
-                    @endforeach
-                @endif
+            <div class="main__employer-page-two-item-text-name">
+                <h3>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h3>
             </div>
+            <!--Судоходная компания ведет набор
+            специалистов на следующие должности:</div>
+        <div class="main__employer-page-two-item-text-links">
+        if (isset($Q->jobs))
+            foreach ($Q->jobs as $key => $j)
+                <a>“{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
+            <!--  </a>
+          endforeach
+      endif
+     </div>-->
         </div>
 
         <div class="main__employer-page-two-item-text">
@@ -57,24 +61,25 @@
                 {!! $Q->text !!}
             </div>
         </div>
-        <div class="main__employer-page-two-item-text">
+        <!--<div class="main__employer-page-two-item-text">
             <div class="main__employer-page-two-item-text-name">Наши ожидания:</div>
             <div class="main__employer-page-two-item-text-body">
-                {!! $Q->description !!}
+                !! $Q->description !!}
             </div>
         </div>
         <div class="main__employer-page-two-item-text">
             <div class="main__employer-page-two-item-text-name">Резюме направляйте на почту:</div>
             <div class="main__employer-page-two-item-text-body">
-                {!! $Q->contacts_emails !!}
+                !! $Q->contacts_emails !!}
             </div>
         </div>
         <div class="main__employer-page-two-item-text">
             <div class="main__employer-page-two-item-text-name">Или звоните:</div>
             <div class="main__employer-page-two-item-text-body">
-                {!! $Q->contacts_telephones !!}
+                !! $Q->contacts_telephones !!}
             </div>
         </div>
+        -->
 
         <div class="main__employer-page-two-item-tags">
             @if (!empty($Q->jobs_code[0]->position_ship))
@@ -87,6 +92,7 @@
                 @endif
             @endif
         </div>
+
         <div class="main__employer-page-two-item-buttons">
             @guest
                 <button type="button" data-fancybox data-src="#question" data-options='{"touch":false,"autoFocus":false}'
diff --git a/resources/views/info_company_new.blade.php b/resources/views/info_company_new.blade.php
index e809ffa..c49e5be 100644
--- a/resources/views/info_company_new.blade.php
+++ b/resources/views/info_company_new.blade.php
@@ -207,17 +207,19 @@
                                                 @else
                                                     <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $job->name }}">
                                                 @endif
-                                                <span>{{ $job->name }}</span>
+                                                <span>{{ $company[0]->name_company }}</span>
                                             </div>
                                             <!--<div class="main__employer-page-two-item-title"> $item->flot }}</div>-->
                                             <div class="main__employer-page-two-item-text">
-                                                @if ((isset($job->jobs)) && ($job->jobs->count()))
-                                                    @foreach($job->jobs as $item)
+                                                <h3>{{ $job->name }}</h3>
+                                                <!--if ((isset($job->jobs)) && ($job->jobs->count()))
+                                                    foreach($job->jobs as $item)
                                                     <a class="main__employer-page-two-item-text-name">
-                                                        {{ $item->name }}
+                                                        { $item->name }}
                                                     </a>
-                                                    @endforeach
-                                                @endif
+                                                    endforeach
+                                                endif
+                                                    -->
                                                 <span>Описание:
                                                    {!!  $job->text !!}
                                                 </span>
diff --git a/resources/views/list_vacancies.blade.php b/resources/views/list_vacancies.blade.php
index 11714e1..d9971d4 100644
--- a/resources/views/list_vacancies.blade.php
+++ b/resources/views/list_vacancies.blade.php
@@ -233,20 +233,23 @@
                         @else
                             <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Rec->title }}" class="main__vacancies-thing-pic">
                         @endif
-                        <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
+                        <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif</span>
                     </div>
 
                     <div class="main__employer-page-two-item-text">
-                        <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
+                        <div class="main__employer-page-two-item-text-name">
+                            <h3>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h3>
+                        </div>
+                            <!--Судоходная компания ведет набор
                             специалистов на следующие должности:</div>
                         <div class="main__employer-page-two-item-text-links">
-                        @if (isset($Q->jobs))
-                            @foreach ($Q->jobs as $key => $j)
-                                <a>“{{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
-                                </a>
-                            @endforeach
-                        @endif
-                       </div>
+                        if (isset($Q->jobs))
+                            foreach ($Q->jobs as $key => $j)
+                                <a>“{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
+                              <!--  </a>
+                            endforeach
+                        endif
+                       </div>-->
                     </div>
 
                     <div class="main__employer-page-two-item-text">
diff --git a/resources/views/vacance-item.blade.php b/resources/views/vacance-item.blade.php
index 8b38b67..2842887 100644
--- a/resources/views/vacance-item.blade.php
+++ b/resources/views/vacance-item.blade.php
@@ -110,19 +110,19 @@
 
             @foreach ($Query as $Q)
             <div class="main__vacancies-item-page main__employer-page-two-item">
-                <div class="main__employer-page-two-item-text">
+                <!--<div class="main__employer-page-two-item-text">
                     <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
                         специалистов на следующие должности:</div>
                     <div class="main__employer-page-two-item-text-links">
-                        @if (isset($Q->jobs))
-                            @foreach ($Q->jobs as $key => $j)
-                                <a>“{{ $j->name }}”
-                                    <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
-                                </a>
-                            @endforeach
-                        @endif
+                        if (isset($Q->jobs))
+                            foreach ($Q->jobs as $key => $j)
+                                <a>“{ $j->name }}”
+                                    <!-- з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
+                                <!--</a>
+                            endforeach
+                        endif
                     </div>
-                </div>
+                </div>-->
                 <div class="main__employer-page-two-item-text">
                     <div class="main__employer-page-two-item-text-name">Мы предлагаем:</div>
                     <div class="main__employer-page-two-item-text-body">
@@ -186,7 +186,7 @@
 
             @endforeach
 
-        </div> <a href="{{ redirect()->back()->getTargetUrl() }}" class="back">
+         <a href="{{ redirect()->back()->getTargetUrl() }}" class="back">
                     <svg>
                         <use xlink:href="{{ asset('images/sprite.svg#back') }}"></use>
                     </svg>
@@ -194,6 +194,7 @@
                         Вернуться к списку вакансий
                 </span>
                 </a>
+        </div>
     </main>
     </div>
 @endsection
diff --git a/resources/views/workers/favorite.blade.php b/resources/views/workers/favorite.blade.php
index 2ec595c..739b12e 100644
--- a/resources/views/workers/favorite.blade.php
+++ b/resources/views/workers/favorite.blade.php
@@ -68,20 +68,23 @@
                                                     @else
                                                         <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Q->employer->name }}" class="main__vacancies-thing-pic">
                                                     @endif
-                                                <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
+                                                <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif </span>
                                             </div>
                                             <div class="main__employer-page-two-item-text">
-                                                <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
+                                                <div class="main__employer-page-two-item-text-name">
+                                                    <h2>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h2>
+                                                </div>
+                                                <!-- Судоходная компания ведет набор
                                                     специалистов на следующие должности:</div>
                                                 <div class="main__employer-page-two-item-text-links">
-                                                    @if (isset($Q->jobs))
-                                                        @foreach ($Q->jobs as $key => $j)
-                                                            <a>“{{ $j->name }}”
-                                                                <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
-                                                            </a>
-                                                        @endforeach
-                                                    @endif
-                                                </div>
+                                                    if (isset($Q->jobs))
+                                                        foreach ($Q->jobs as $key => $j)
+                                                            <a>“{ $j->name }}”
+                                                                 <!-- з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
+                                                        <!--    </a>
+                                                        endforeach
+                                                    endif
+                                                </div>-->
                                             </div>
                                             <div class="main__employer-page-two-item-text">
                                                 <div class="main__employer-page-two-item-text-name">Мы предлагаем:</div>
-- 
1.7.10.4