From 9580525f512264699d4bf52d5b3be5de3311ec5d 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: Thu, 25 Apr 2024 14:16:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=B8=D0=B8=D1=82=20=D0=BF=D0=BE?=
 =?UTF-8?q?=20=D0=BA=D0=B0=D0=B1=D0=B8=D0=BD=D0=B5=D1=82=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/EmployerController.php      |   13 +--
 resources/views/employers/add_vacancy.blade.php  |   16 ++--
 resources/views/employers/edit_vacancy.blade.php |   99 ++++++++--------------
 3 files changed, 52 insertions(+), 76 deletions(-)

diff --git a/app/Http/Controllers/EmployerController.php b/app/Http/Controllers/EmployerController.php
index c1f6848..7971813 100644
--- a/app/Http/Controllers/EmployerController.php
+++ b/app/Http/Controllers/EmployerController.php
@@ -190,7 +190,7 @@ class EmployerController extends Controller
         //$params_job["sytki"] = $params_emp['sytki'];
         //$params_job["start"] = $params_emp['start'];
         //$params_job["flot"] = $params_emp['flot'];
-        $params_job["description"] = $params_emp['description'];
+        //$params_job["description"] = $params_emp['description'];
 
         $ad_jobs = Ad_employer::create($params_emp);
         //$params_job['ad_employer_id'] = $ad_jobs->id;
@@ -234,11 +234,12 @@ class EmployerController extends Controller
         $id = Auth()->user()->id;
 
         $Positions = Category::query()->where('is_remove', '=', '0')->get();
-        if ($Positions->count()) {
-            $jobs = Job_title::query()->OrderBy('name')->where('position_id', $Positions[0]->id)->get();
-        } else {
-            $jobs = Job_title::query()->OrderBy('name')->where('position_id', 0)->get();
-        }
+        //if ($Positions->count()) {
+        //    $jobs = Job_title::query()->OrderBy('name')->where('position_id', $Positions[0]->id)->get();
+        //} else {
+        //    $jobs = Job_title::query()->OrderBy('name')->where('position_id', 0)->get();
+        //}
+        $jobs = Job_title::query()->OrderBy('name')->where('is_remove', 0)->get();
 
 
         $Employer = Employer::query()->with('users')->with('ads')->with('flots')->
diff --git a/resources/views/employers/add_vacancy.blade.php b/resources/views/employers/add_vacancy.blade.php
index fb70021..988690e 100644
--- a/resources/views/employers/add_vacancy.blade.php
+++ b/resources/views/employers/add_vacancy.blade.php
@@ -75,7 +75,7 @@
                                 </div>
                             </div>
 
-                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="display:none">
                                 <label class="form-group__label">Телефон</label>
                                 <div class="form-group__item">
                                     <input type="text" class="input" name="telephone" id="telephone" value="{{ old('telephone') ?? $Employer[0]->telephone ?? '' }}" placeholder="Свой телефон">
@@ -87,7 +87,7 @@
                                 </div>
                             </div>
 
-                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="display:none">
                                 <label class="form-group__label">Емайл</label>
                                 <div class="form-group__item">
                                     <input type="text" class="input" name="email" id="email" value="{{ old('email') ?? $Employer[0]->email ?? '' }}" placeholder="Своя почту">
@@ -310,17 +310,17 @@
                                 </div>
                             </div>-->
 
-                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                            <!--<div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
                                 <label class="form-group__label">Дополнительная информация</label>
                                 <div class="form-group__item">
-                                    <textarea class="textarea" name="description" id="description">{{ old('description') ?? '' }}</textarea>
-                                    @error('description')
+                                    <textarea class="textarea" name="description" id="description"> old('description') ?? '' }}</textarea>
+                                    error('description')
                                     <span class="text-xs text-red-600">
-                                          {{ $message }}
+                                           $message }}
                                     </span>
-                                    @enderror
+                                    enderror
                                 </div>
-                            </div>
+                            </div>-->
 
                         </div>
                         <button type="submit" class="button cabinet__submit">Опубликовать</button>
diff --git a/resources/views/employers/edit_vacancy.blade.php b/resources/views/employers/edit_vacancy.blade.php
index b9dba48..6441d32 100644
--- a/resources/views/employers/edit_vacancy.blade.php
+++ b/resources/views/employers/edit_vacancy.blade.php
@@ -70,53 +70,11 @@
                                         <span class="text-xs text-red-600 dark:text-red-400">
                                           {{ $message }}
                                     </span>
-<<<<<<< HEAD
-                                    @enderror
-                                </div>
-                            </div>
-
-                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
-                                <label class="form-group__label">Позиция на корабле</label>
-                                <div class="form-group__item">
-                                    <div class="select">
-                                        <select class="js-select2" name="position_id" id="position_id">
-                                            @foreach ($Positions as $it)
-                                                <option value="{{ $it->id }}">{{ $it->name }}</option>
-                                            @endforeach
-                                        </select>
-                                        @error('postion_id')
-                                        <span class="text-xs text-red-600 dark:text-red-400">
-                                              {{ $message }}
-                                        </span>
-                                        @enderror
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
-                                <label class="form-group__label">Должность соискателя</label>
-                                <div class="form-group__item">
-                                    <div class="select">
-                                        <select class="js-select2" name="job_title_id" id="job_title_id">
-                                            <option value="0"> Выберите должность из списка</option>
-
-                                            @if ($jobs->count())
-                                                @foreach($jobs as $j)
-                                                    <option value="{{ $j->id }}" @if ($j->id == $ad_employer->id) selected @endif>{{ $j->name }}</option>
-                                                @endforeach
-                                            @endif
-                                        </select>
-                                        @error('job_title_id')
-                                        <span class="text-xs text-red-600">
-                                              {{ $message }}
-                                        </span>
-=======
->>>>>>> 9f5b1d0112e53e85197df30673ccf1f2f4923df1
                                         @enderror
                                     </div>
                                 </div>
 
-                                <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="display:none">
                                     <label class="form-group__label">Телефон</label>
                                     <div class="form-group__item">
                                         <input type="text" class="input" name="telephone" id="telephone" value="{{ old('telephone') ?? $ad_employer->telephone ?? '' }}" placeholder="Свой телефон">
@@ -128,7 +86,7 @@
                                     </div>
                                 </div>
 
-                                <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="display:none">
                                     <label class="form-group__label">Емайл</label>
                                     <div class="form-group__item">
                                         <input type="text" class="input" name="email" id="email" value="{{ old('email') ?? $ad_employer->email ?? '' }}" placeholder="Своя почту">
@@ -140,7 +98,7 @@
                                     </div>
                                 </div>
 
-                                <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="display:none">
                                     <label class="form-group__label">Зарплата среднестатистическая для вакансии</label>
                                     <div class="form-group__item">
                                         <input type="text" class="input" name="salary" id="salary" value="{{ old('salary') ?? $ad_employer->salary ??'' }}" placeholder="Среднестатистическая зарплата">
@@ -163,32 +121,30 @@
                                         @enderror
                                     </div>
                                 </div>
-
-                                <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                <!--<div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="">
                                     <label class="form-group__label">Категория (локация)</label>
                                     <div class="form-group__item">
                                         <div class="select">
                                             <select class="js-select2" name="category_id" id="category_id">
-                                                @php $i = 1 @endphp
-                                                @if ($Positions->count())
-                                                    @foreach($Positions as $j)
-                                                        @if ($i == 1) <option> Выберите категорию из списка</option>
-                                                        @else
-                                                            <option value="{{ $j->id }}" @if ($ad_employer->category_id == $j->id) selected @endif>{{ $j->name }}</option>
-                                                        @endif
-                                                        @php $i++ @endphp
-                                                    @endforeach
-                                                @endif
+                                                php $i = 1 endphp
+                                                if ($Positions->count())
+                                                    foreach($Positions as $j)
+                                                        if ($i == 1) <option> Выберите категорию из списка</option>
+                                                        else
+                                                            <option value=" $j->id }}" if ($ad_employer->category_id == $j->id) selected endif>$j->name }}</option>
+                                                        endif
+                                                        php $i++ endphp
+                                                    endforeach
+                                                endif
                                             </select>
-                                            @error('category_id')
+                                            error('category_id')
                                             <span class="text-xs text-red-600 dark:text-red-400">
-                                              {{ $message }}
+                                               $message }}
                                         </span>
-                                            @enderror
+                                            enderror
                                         </div>
                                     </div>
-                                </div>
-
+                                </div>-->
 
                                 <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
                                     <label class="form-group__label">Описание вакансии</label>
@@ -201,6 +157,25 @@
                                         @enderror
                                     </div>
                                 </div>
+
+                                <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                    <h4 class="form-group__label">Редактирование должностей</h4>
+                                    <div class="form-group__item">
+                                        <a href="{{ route('employer.add_job_in_vac', ['ad_employer' => $ad_employer->id]) }}" class="button">Добавить</a>
+
+                                        @if ($ad_employer->jobs->count())
+                                            @foreach ($ad_employer->jobs as $key => $it_um)
+                                                <p>@if (isset($ad_employer->jobs_code[$key]))
+                                                        <a href="{{ route('employer.edit_job_in_vac', ['ad_job' => $ad_employer->jobs_code[$key]->id, 'ad_employer' => $ad_employer->id, 'job_title_id' => $it_um->id]) }}" style="text-decoration: underline">{{$it_um->name}}</a>
+                                                        <a href="{{ route('employer.delete_job_in_vac', ['ad_job' => $ad_employer->jobs_code[$key]->id]) }}" style="text-decoration: underline">(Del)</a>
+                                                    @endif
+                                                </p>
+                                            @endforeach
+                                        @else
+                                            Нет связанных <br> с вакансией должностей
+                                        @endif
+                                    </div>
+                                </div>
                             </div>
 
                         <a class="button cabinet__submit" href="{{ route('employer.vacancy_list') }}">Назад</a>
-- 
1.7.10.4