From 2104362d4ee6844f858c5882d5a874b1815809e0 Mon Sep 17 00:00:00 2001 From: aslan Date: Tue, 12 Mar 2024 15:45:48 +0300 Subject: [PATCH] add bootstrap validation and Logging for Education Form --- .../Direction/EducationFormController.php | 44 ++++++++++++++++++- .../Direction/StoreEducationFormRequest.php | 17 ++++++- .../Direction/UpdateEducationFormRequest.php | 15 ++++++- lang/ru/tooltips.php | 5 +++ .../direction/education_form/create.blade.php | 24 +++++----- .../direction/education_form/edit.blade.php | 24 +++++----- 6 files changed, 105 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/admin/Catalog/Direction/EducationFormController.php b/app/Http/Controllers/admin/Catalog/Direction/EducationFormController.php index 5c6778d..1572bb6 100644 --- a/app/Http/Controllers/admin/Catalog/Direction/EducationFormController.php +++ b/app/Http/Controllers/admin/Catalog/Direction/EducationFormController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\admin\Catalog\Direction; +use App\Helpers\SlugHelper; use App\Http\Controllers\Controller; use App\Http\Requests\admin\Catalog\Direction\StoreEducationFormRequest; use App\Http\Requests\admin\Catalog\Direction\UpdateEducationFormRequest; @@ -9,6 +10,8 @@ use App\Models\EducationForm; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; use Illuminate\Foundation\Application; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Log; class EducationFormController extends Controller { @@ -26,12 +29,20 @@ class EducationFormController extends Controller public function store(StoreEducationFormRequest $request) { $validated = $request->validated(); + + $slug = SlugHelper::get($validated); + $form = new EducationForm(); $form->name = $validated['name']; $form->description = $validated['description']; - $form->slug = $validated['slug']; + $form->slug = $slug; $form->save(); + Log::channel('app') + ->info( + 'CREATE форма образования {educationForm} - user {user}', + ['user' => Auth::user()->name, 'educationForm' => $form->name, 'data' => $validated] + ); return redirect()->route('education_forms.index'); } @@ -49,10 +60,23 @@ class EducationFormController extends Controller public function update(UpdateEducationFormRequest $request, EducationForm $educationForm) { $validated = $request->validated(); + $oldData = $educationForm->toArray(); $educationForm->name = $validated['name']; $educationForm->description = $validated['description']; $educationForm->slug = $validated['slug']; + + Log::channel('app') + ->warning( + 'UPDATE форма образования {educationForm} - user {user}', + [ + 'user' => Auth::user()->name, + 'educationForm' => $educationForm->name, + 'oldData' => $oldData, + 'newData' => $validated + ] + ); + $educationForm->save(); return redirect()->route('education_forms.index'); @@ -61,8 +85,26 @@ class EducationFormController extends Controller public function destroy(EducationForm $educationForm) { if ($educationForm->directions()->exists()) { + Log::channel('app') + ->error( + 'NOT DELETE форма образования {educationForm} - user {user}', + [ + 'user' => Auth::user()->name, + 'educationForm' => $educationForm->name, + 'data' => $educationForm->toArray(), + ] + ); return back(); } + Log::channel('app') + ->critical( + 'DELETE факультет {faculty} - user {user}', + [ + 'user' => Auth::user()->name, + 'educationForm' => $educationForm->name, + 'data' => $educationForm->toArray(), + ] + ); $educationForm->delete(); return redirect()->route('education_forms.index'); } diff --git a/app/Http/Requests/admin/Catalog/Direction/StoreEducationFormRequest.php b/app/Http/Requests/admin/Catalog/Direction/StoreEducationFormRequest.php index b277170..e8953fd 100644 --- a/app/Http/Requests/admin/Catalog/Direction/StoreEducationFormRequest.php +++ b/app/Http/Requests/admin/Catalog/Direction/StoreEducationFormRequest.php @@ -15,8 +15,21 @@ class StoreEducationFormRequest extends FormRequest { return [ 'name' => 'required|string|max:255|unique:education_levels,name', - 'description' => 'string', - 'slug' => 'required|string|max:255|unique:education_levels,slug', + 'description' => 'nullable|string', + 'slug' => 'nullable|string|max:255|unique:education_levels,slug', + ]; + } + + public function messages(): array + { + return [ + 'name.required' => 'Поле название обязательно.', + 'name.string' => 'Поле название должен быть строкой.', + 'name.max' => 'Поле название не должен превышать :max символов.', + 'name.unique' => 'Название уже занят.', + 'description.string' => 'Поле описание должен быть строкой.', + 'slug.string' => 'Поле URL должен быть строкой.', + 'slug.max' => 'Поле URL не должен превышать :max символов.', ]; } } diff --git a/app/Http/Requests/admin/Catalog/Direction/UpdateEducationFormRequest.php b/app/Http/Requests/admin/Catalog/Direction/UpdateEducationFormRequest.php index 458ea57..a9d524a 100644 --- a/app/Http/Requests/admin/Catalog/Direction/UpdateEducationFormRequest.php +++ b/app/Http/Requests/admin/Catalog/Direction/UpdateEducationFormRequest.php @@ -15,8 +15,21 @@ class UpdateEducationFormRequest extends FormRequest { return [ 'name' => "required|string|max:255|unique:education_forms,name,{$this->education_form->id}", - 'description' => 'string', + 'description' => 'nullable|string', 'slug' => "required|string|max:255|unique:education_forms,slug,{$this->education_form->id}", ]; } + + public function messages(): array + { + return [ + 'name.required' => 'Поле название обязательно.', + 'name.string' => 'Поле название должен быть строкой.', + 'name.max' => 'Поле название не должен превышать :max символов.', + 'name.unique' => 'Название уже занят.', + 'description.string' => 'Поле описание должен быть строкой.', + 'slug.string' => 'Поле URL должен быть строкой.', + 'slug.max' => 'Поле URL не должен превышать :max символов.', + ]; + } } diff --git a/lang/ru/tooltips.php b/lang/ru/tooltips.php index 14782d5..6c2baba 100644 --- a/lang/ru/tooltips.php +++ b/lang/ru/tooltips.php @@ -69,4 +69,9 @@ return [ 'description' => 'Поле "Описание" может быть пустым для отображения на сайте', 'slug' => 'Поле "URL" нужно для отображения в браузере' ], + 'education_forms' => [ + 'name' => 'Поле "Название" должно быть уникальным для отображения на сайте', + 'description' => 'Поле "Описание" может быть пустым для отображения на сайте', + 'slug' => 'Поле "URL" нужно для отображения в браузере' + ], ]; diff --git a/resources/views/admin/catalog/direction/education_form/create.blade.php b/resources/views/admin/catalog/direction/education_form/create.blade.php index 074fd85..59ca318 100644 --- a/resources/views/admin/catalog/direction/education_form/create.blade.php +++ b/resources/views/admin/catalog/direction/education_form/create.blade.php @@ -4,39 +4,43 @@

Создать форму Образования

- {{ Form::open(['url' => route('education_forms.store'), 'method' => 'POST', 'class' => '']) }} + {{ Form::open(['url' => route('education_forms.store'), 'method' => 'POST', 'class' => 'needs-validation', 'novalidate']) }}
- {{ Form::label('name', 'Название') }} + {{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.position')]) }} + *
- {{ Form::text('name', '', ['class' => 'form-control']) }} + {{ Form::text('name', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.name'), 'required']) }} +
+ Поле "Название" обязательно! +
-
+
@if ($errors->any()) {{ $errors->first('name') }} @endif
- {{ Form::label('description', 'Описание') }} + {{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.description')]) }}
- {{ Form::text('description', '', ['class' => 'form-control']) }} + {{ Form::text('description', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.description')]) }}
-
+
@if ($errors->any()) {{ $errors->first('description') }} @endif
- {{ Form::label('slug', 'URL') }} + {{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
- {{ Form::text('slug', '', ['class' => 'form-control']) }} + {{ Form::text('slug', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
-
+
@if ($errors->any()) {{ $errors->first('slug') }} @endif diff --git a/resources/views/admin/catalog/direction/education_form/edit.blade.php b/resources/views/admin/catalog/direction/education_form/edit.blade.php index bbac7cc..081c738 100644 --- a/resources/views/admin/catalog/direction/education_form/edit.blade.php +++ b/resources/views/admin/catalog/direction/education_form/edit.blade.php @@ -5,39 +5,43 @@

Изменить форму образования

- {{ Form::open(['url' => route('education_forms.update', $educationForm), 'method' => 'PATCH', 'class' => '']) }} + {{ Form::open(['url' => route('education_forms.update', $educationForm), 'method' => 'PATCH', 'class' => 'needs-validation', 'novalidate']) }}
- {{ Form::label('name', 'Название') }} + {{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.name')]) }} + *
- {{ Form::text('name', $educationForm->name, ['class' => 'form-control']) }} + {{ Form::text('name', $educationForm->name, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.name'), 'required']) }} +
+ Поле "Название" обязательно! +
-
+
@if ($errors->any()) {{ $errors->first('name') }} @endif
- {{ Form::label('description', 'Описание') }} + {{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.description')]) }}
- {{ Form::text('description', $educationForm->description, ['class' => 'form-control']) }} + {{ Form::text('description', $educationForm->description, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.description')]) }}
-
+
@if ($errors->any()) {{ $errors->first('description') }} @endif
- {{ Form::label('slug', 'URL') }} + {{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
- {{ Form::text('slug', $educationForm->slug, ['class' => 'form-control']) }} + {{ Form::text('slug', $educationForm->slug, ['class' => 'form-control','data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
-
+
@if ($errors->any()) {{ $errors->first('slug') }} @endif