From 127b2097de55ab574a90115719798728fef6c077 Mon Sep 17 00:00:00 2001 From: Sergey Panarin Date: Fri, 26 Jul 2024 16:15:00 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2=20=D0?= =?UTF-8?q?=BB=D0=B8=D1=87=D0=BD=D0=BE=D0=BC=20=D0=BA=D0=B0=D0=B1=D0=B8=D0=BD?= =?UTF-8?q?=D0=B5=D1=82=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BD=D0=B8=D0?= =?UTF-8?q?=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/WorkerController.php | 8 +- public/css/style_may2024.css | 4 + public/js/func.js | 21 ++ resources/views/info_company_new.blade.php | 2 +- resources/views/workers/docs.blade.php | 255 +++++++++++--------- .../views/workers/prev_company_form.blade.php | 90 ++++++- resources/views/workers/sertificate_add.blade.php | 2 - routes/web.php | 2 +- 8 files changed, 253 insertions(+), 131 deletions(-) diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php index 8305a02..f08ed22 100644 --- a/app/Http/Controllers/WorkerController.php +++ b/app/Http/Controllers/WorkerController.php @@ -988,8 +988,8 @@ class WorkerController extends Controller //Сохранение стандартого документа public function add_document_save(DocumentsRequest $request) { $params = $request->all(); - $place_work = place_works::create($params); - return redirect()->route('worker.cabinet')->with('success', 'Вы успешно добавили запись!'); + place_works::create($params); + return response()->json(['success' => true]); } // Редактирование документа @@ -1088,9 +1088,9 @@ class WorkerController extends Controller public function add_prev_company(PrevCompanyRequest $request) { // Возвращение параметров $all = $request->all(); - $PrevCompany = PrevCompany::create($all); + PrevCompany::create($all); - return redirect()->route('worker.cabinet')->with('success', 'Вы успешно отредактировали запись'); + return response()->json(['success' => true]); } // Редактирование контакта компании diff --git a/public/css/style_may2024.css b/public/css/style_may2024.css index 16a90dd..cef1225 100644 --- a/public/css/style_may2024.css +++ b/public/css/style_may2024.css @@ -9325,3 +9325,7 @@ body .cke_notifications_area{ padding: 0; width: 100%; } + +.review-image-modal{ + cursor: pointer; +} diff --git a/public/js/func.js b/public/js/func.js index 8ac238f..7d9a0b3 100644 --- a/public/js/func.js +++ b/public/js/func.js @@ -1,3 +1,18 @@ +$(function(){ + $('.review-image-modal').click(function(){ + cl($(this)); + $(this).fancybox({ + 'autoScale': true, + 'transitionIn': 'elastic', + 'transitionOut': 'elastic', + 'speedIn': 500, + 'speedOut': 300, + 'autoDimensions': true, + 'centerOnScroll': true + }) + }); +}); + var spinStart = function(button) { button.prop('disabled', true); @@ -10,3 +25,9 @@ var spinStop= function(button) { button.prop('disabled', false); button.find('.button-loader').remove(); }; + +var cl = function(obj){ + console.log(obj); +} + + diff --git a/resources/views/info_company_new.blade.php b/resources/views/info_company_new.blade.php index 18f3524..af3faf7 100644 --- a/resources/views/info_company_new.blade.php +++ b/resources/views/info_company_new.blade.php @@ -101,7 +101,7 @@ @endif @if (!empty($company[0]->logo)) - {{ $company[0]->name_company }} + {{ $company[0]->name_company }} @else {{ $company[0]->name_company }} @endif diff --git a/resources/views/workers/docs.blade.php b/resources/views/workers/docs.blade.php index b3a847e..7f55b32 100644 --- a/resources/views/workers/docs.blade.php +++ b/resources/views/workers/docs.blade.php @@ -1,120 +1,153 @@ -@extends('layout.frontend', ['title' => 'Добавление стандартного документа - РекаМоре']) +@extends('workers.cabinet_layout', ['title' => 'Добавление стандартного документа - РекаМоре']) -@section('scripts') +@section('cabinet_content') +

Место работы

+
+ @csrf + -@endsection +
-@section('content') -
-
- -
-
-
- @include('workers.emblema') - -
- - @include('workers.menu', ['item' => 1]) +
+
+
+ +
+
+
-
- @csrf -
- @include('messages_error') -
-
-
Новая работа
-
- -
-
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- - -
-
-
-
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + Назад +
+
+
+ +
+
+ + +@endsection + +@section('scripts') + @endsection diff --git a/resources/views/workers/prev_company_form.blade.php b/resources/views/workers/prev_company_form.blade.php index 423658b..8196e57 100644 --- a/resources/views/workers/prev_company_form.blade.php +++ b/resources/views/workers/prev_company_form.blade.php @@ -1,17 +1,14 @@ @extends('workers.cabinet_layout', ['title' => 'Рекомендация - РекаМоре']) @section('cabinet_content') -
+

Рекомендация

+
@csrf -
-
-

Рекомендация

-
-
+
-
+
@@ -37,13 +34,82 @@
+
-
- - Отменить -
+
+ + Назад
+
+ +
+ + +
+@endsection + +@section('scripts') + @endsection diff --git a/resources/views/workers/sertificate_add.blade.php b/resources/views/workers/sertificate_add.blade.php index 28d5256..d3197d6 100644 --- a/resources/views/workers/sertificate_add.blade.php +++ b/resources/views/workers/sertificate_add.blade.php @@ -90,8 +90,6 @@ 'X-CSRF-TOKEN': $('[name="_token"]').val() }, success: function(res){ - console.log('success'); - console.log(res); spinStop(this_btn); $('.open-after_add_serificate_chat-button').click(); }, diff --git a/routes/web.php b/routes/web.php index 58abf52..79e3848 100644 --- a/routes/web.php +++ b/routes/web.php @@ -542,7 +542,7 @@ 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::post('кабинет/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