From 7243b8e24ff5eeb747552407780e71e7abb36141 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: Fri, 19 Apr 2024 17:32:35 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0?=
 =?UTF-8?q?=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=BF=D0?=
 =?UTF-8?q?=BE=20=D0=B1=D0=B0=D0=B3=D0=B0=D0=BC=20=D0=BE=D1=82=2019=20=D1=87?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/MainController.php            |    6 +-
 app/Http/Controllers/WorkerController.php          |   14 ++++
 app/Models/Dop_info.php                            |    3 +-
 app/Models/Worker.php                              |    2 +-
 .../2024_04_19_092957_alter_table_dop_info.php     |   32 ++++++++
 resources/views/employers/cabinet.blade.php        |    2 +
 resources/views/workers/cabinet.blade.php          |   15 ++--
 .../views/workers/prev_company_edit_form.blade.php |   86 ++++++++++++++++++++
 routes/web.php                                     |    2 +
 9 files changed, 152 insertions(+), 10 deletions(-)
 create mode 100644 database/migrations/2024_04_19_092957_alter_table_dop_info.php
 create mode 100644 resources/views/workers/prev_company_edit_form.blade.php

diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php
index 9ee6b5d..e4638a1 100644
--- a/app/Http/Controllers/MainController.php
+++ b/app/Http/Controllers/MainController.php
@@ -352,7 +352,11 @@ class MainController extends Controller
         ];
         $validator = Validator::make($request->all(), $rules, $messages);
         if ($validator->fails()) {
-            $user_id = $request->user()->id;
+            if (Auth::check())
+                $user_id = $request->user()->id;
+            else
+                $user_id = 0;
+
             if ($user_id > 0)
                 return json_encode(Array("ERROR" => "Email или пароль невалидный!"));
             else
diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php
index d011281..da1a7de 100644
--- a/app/Http/Controllers/WorkerController.php
+++ b/app/Http/Controllers/WorkerController.php
@@ -781,6 +781,7 @@ class WorkerController extends Controller
         else {
             $params['infoblok_id'] = $infoblok_id;
             $params['worker_id'] = $worker->id;
+            $params['status'] = $request->get('val');
             $id = Dop_info::create($params);
             //$id = $worker->infobloks()->sync([$infoblok_id]);
         }
@@ -888,6 +889,19 @@ class WorkerController extends Controller
         return redirect()->route('worker.cabinet')->with('success', 'Вы успешно отредактировали запись');
     }
 
+    // Редактирование контакта компании
+    public function edit_prev_company(PrevCompany $doc, Worker $worker) {
+        return view('workers.prev_company_edit_form', compact('doc', 'worker'));
+    }
+
+    //Сохранение редактирования контакта компании
+    public function update_prev_company(PrevCompany $doc, Request $request){
+        $all = $request->all();
+        $doc->update($all);
+
+        return redirect()->route('worker.cabinet')->with('success', 'Вы успешно отредактировали запись');
+    }
+
     // Удаление контакта предыдущей компании
     public function delete_prev_company(PrevCompany $doc) {
         $doc->delete();
diff --git a/app/Models/Dop_info.php b/app/Models/Dop_info.php
index 09a8a5a..f6911df 100644
--- a/app/Models/Dop_info.php
+++ b/app/Models/Dop_info.php
@@ -14,6 +14,7 @@ class Dop_info extends Model
     public $fillable = [
         'worker_id',
         'infoblok_id',
-        'text'
+        'text',
+        'status'
     ];
 }
diff --git a/app/Models/Worker.php b/app/Models/Worker.php
index cb74832..a11bd95 100644
--- a/app/Models/Worker.php
+++ b/app/Models/Worker.php
@@ -86,7 +86,7 @@ class Worker extends Model
 
     //Связи Работника с дополнительными
     public function dop_info() {
-        return $this->hasMany(Dop_info::class, 'infoblok_id');
+        return $this->hasMany(Dop_info::class, 'worker_id');
     }
 
 }
diff --git a/database/migrations/2024_04_19_092957_alter_table_dop_info.php b/database/migrations/2024_04_19_092957_alter_table_dop_info.php
new file mode 100644
index 0000000..1340f44
--- /dev/null
+++ b/database/migrations/2024_04_19_092957_alter_table_dop_info.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('dop_info', function (Blueprint $table) {
+            $table->integer('status')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('messages', function (Blueprint $table) {
+            $table->dropColumn('status');
+        });
+    }
+};
diff --git a/resources/views/employers/cabinet.blade.php b/resources/views/employers/cabinet.blade.php
index 91cca40..680e34f 100644
--- a/resources/views/employers/cabinet.blade.php
+++ b/resources/views/employers/cabinet.blade.php
@@ -3,6 +3,8 @@
 @section('scripts')
     <script>
         console.log('Test system');
+
+
         $(document).on('click', '.die_black', function() {
             var this_ = $(this);
             var ajax_ = $('#ajax_flot_div');
diff --git a/resources/views/workers/cabinet.blade.php b/resources/views/workers/cabinet.blade.php
index 6cba7ee..57f2bce 100644
--- a/resources/views/workers/cabinet.blade.php
+++ b/resources/views/workers/cabinet.blade.php
@@ -438,24 +438,24 @@
                                         <label class="form-group__label">{{ $doc->name }}</label>
                                         <div class="form-group__item">
                                             <div class="select">
-                                                @php $Selected = false; @endphp
+                                                @php $Selected = 0; @endphp
                                                 @if ($Worker[0]->infobloks->count())
-                                                    @foreach ($Worker[0]->infobloks as $info)
-                                                        @if ($info->id == $doc->id)
-                                                            @php $Selected = true; @endphp
+                                                    @foreach ($Worker[0]->dop_info as $info)
+                                                        @if ($info->infoblok_id == $doc->id)
+                                                            @php $Selected = $info->status; @endphp
                                                         @endif
                                                     @endforeach
                                                 @endif
                                                 <select data-info="{{ $doc->id }}" class="js-select2 sertificates_js">
-                                                    <option value="0">Нет</option>
-                                                    <option value="1" @if ($Selected) selected @endif>Да</option>
+                                                    <option value="0" @if ($Selected == 0) selected @endif>Не указано</option>
+                                                    <option value="1" @if ($Selected == 1) selected @endif>В наличии</option>
+                                                    <option value="2" @if ($Selected == 2) selected @endif>Отсутствует</option>
                                                 </select>
                                             </div>
                                         </div>
                                     </div>
                                 @endforeach
                             @endif
-
                             <!--_if (isset($Worker[0]->infobloks))
                                 _php dd($Worker[0]->infobloks) _endphp
                                 _if ($Worker[0]->infobloks->count())
@@ -640,6 +640,7 @@
                                             </svg>
                                             Удалить
                                         </a>
+                                        <a href="{{ route('worker.edit_prev_company', ['worker' => $Worker[0]->id, 'doc' => $it->id ]) }}" class="button">Редактирование</a>
                                     </div>
                                 </div>
                                 @php $i++ @endphp
diff --git a/resources/views/workers/prev_company_edit_form.blade.php b/resources/views/workers/prev_company_edit_form.blade.php
new file mode 100644
index 0000000..106908c
--- /dev/null
+++ b/resources/views/workers/prev_company_edit_form.blade.php
@@ -0,0 +1,86 @@
+@extends('layout.frontend', ['title' => 'Редактирование контакта предыдущей компании - РекаМоре'])
+
+@section('scripts')
+    <script>
+        console.log('Test system');
+        $(document).on('submit', '#submit_form', function() {
+            var this_ = $(this);
+            var new_diplom = $('#name');
+            var new_diplom_val = new_diplom.val();
+            var new_data_begin = $('#new_data_begin');
+            var new_data_begin_val = new_data_begin.val();
+            var new_data_end = $('#new_data_end');
+            var new_data_end_val = new_data_end.val();
+            var education = $('#education');
+            var education_val = education.val();
+            var worker_id = $('#new_id');
+            var worker_val = worker_id.val();
+
+            console.log('Валидация формы.');
+
+            if (new_diplom_val == '') {
+                new_diplom.addClass('err_red');
+                console.log('Border Up');
+                return false;
+            } else {
+                return true;
+            }
+        });
+    </script>
+@endsection
+
+@section('content')
+    <section class="cabinet">
+        <div class="container">
+            <ul class="breadcrumbs cabinet__breadcrumbs">
+                <li><a href="{{ route('index') }}">Главная</a></li>
+                <li><b>Личный кабинет</b></li>
+            </ul>
+            <div class="cabinet__wrapper">
+                <div class="cabinet__side">
+                    <div class="cabinet__side-toper">
+                        @include('workers.emblema')
+                    </div>
+                    @include('workers.menu', ['item' => 1])
+                </div>
+
+                <div class="cabinet__body">
+                    <div class="cabinet__body-item">
+                        <h4 class="cabinet__h4">Добавление контакта предыдущей компании</h4>
+                        <form id="submit_form" name="submit_form" action="{{ route('worker.update_prev_company', ['doc' => $doc]) }}" class="cabinet__inputs" method="POST">
+                            @csrf
+                            <input type="hidden" name="worker_id" id="worker_id" class="input" value="{{ $worker->id }}">
+                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                <label class="form-group__label">Название компании</label>
+                                <div class="form-group__item">
+                                    <input type="text" name="name_company" id="name_company" class="input" value="{{ old('name_company') ?? $doc->name_company ?? '' }}">
+                                </div>
+                            </div>
+                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                <label class="form-group__label">ФИО директора</label>
+                                <div class="form-group__item">
+                                    <input type="text" name="direct" id="direct" class="input" value="{{ old('direct') ?? $doc->direct ?? '' }}">
+                                </div>
+                            </div>
+                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                <label class="form-group__label">Телефон</label>
+                                <div class="form-group__item">
+                                    <input type="text" name="telephone" id="telephone" class="input" value="{{ old('telephone') ?? $doc->telephone ?? '' }}">
+                                </div>
+                            </div>
+                            <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group">
+                                <label class="form-group__label">Телефон 2</label>
+                                <div class="form-group__item">
+                                    <input type="text" name="telephone2" id="telephone2" class="input" value="{{ old('telephone2') ?? $doc->telephone2 ?? '' }}">
+                                </div>
+                            </div>
+                            <button type="submit" class="button">Сохранить</button>
+                            <a href="{{ route('worker.cabinet') }}" class="button">Назад</a>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+
+@endsection
diff --git a/routes/web.php b/routes/web.php
index d3de7a6..3f172e4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -522,6 +522,8 @@ Route::group([
     // Добавление предыдущих контактов компании
     Route::get('кабинет/prev_company/{worker}', [WorkerController::class, 'new_prev_company'])->name('new_prev_company');
     Route::get('кабинет/add_prev_company', [WorkerController::class, 'add_prev_company'])->name('add_prev_company');
+    Route::get('кабинет/edit_prev_company/{doc}/{worker}', [WorkerController::class, 'edit_prev_company'])->name('edit_prev_company');
+    Route::post('кабинет/update_prev_company/{doc}', [WorkerController::class, 'update_prev_company'])->name('update_prev_company');
     Route::get('кабинет/delete_prev_company/{doc}', [WorkerController::class, 'delete_prev_company'])->name('delete_prev_company');
 
     // Добавление документа-диплома
-- 
1.7.10.4