add bootstrap validation and Logging for Education Form

2024-03-12 15:45:48 +03:00 · 2024-03-12 15:45:48 +03:00 · 2104362d4e
parent 299817069e
commit 2104362d4e
6 changed files with 105 additions and 24 deletions
--- 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');
    }
--- 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 символов.',
        ];
    }
 }
--- 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 символов.',
+        ];
+    }
 }
--- a/lang/ru/tooltips.php
+++ b/lang/ru/tooltips.php
@ -69,4 +69,9 @@ return [
        'description' => 'Поле "Описание" может быть пустым для отображения на сайте',
        'slug' => 'Поле "URL" нужно для отображения в браузере'
    ],
+    'education_forms' => [
+        'name' => 'Поле "Название" должно быть уникальным для отображения на сайте',
+        'description' => 'Поле "Описание" может быть пустым для отображения на сайте',
+        'slug' => 'Поле "URL" нужно для отображения в браузере'
+    ],
 ];
--- 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 @@
        <div class="row">
            <div class="col">
                <h1 class=""> Создать форму Образования</h1>
-                {{ Form::open(['url' => route('education_forms.store'), 'method' => 'POST', 'class' => '']) }}
+                {{ Form::open(['url' => route('education_forms.store'), 'method' => 'POST', 'class' => 'needs-validation', 'novalidate']) }}
                <div class="col">
                    <div class="mt-3">
-                        {{ Form::label('name', 'Название') }}
+                        {{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.position')]) }}
+                        <span class="text-danger">*</span>
                    </div>
                    <div class="mt-1">
-                        {{ Form::text('name', '', ['class' => 'form-control']) }}
+                        {{ Form::text('name', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.name'), 'required']) }}
+                        <div class="invalid-feedback">
+                            Поле "Название" обязательно!
+                        </div>
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('name') }}
                        @endif
                    </div>

                    <div class="mt-3">
-                        {{ Form::label('description', 'Описание') }}
+                        {{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.description')]) }}
                    </div>
                    <div class="mt-1">
-                        {{ Form::text('description', '', ['class' => 'form-control']) }}
+                        {{ Form::text('description', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.description')]) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('description') }}
                        @endif
                    </div>

                    <div class="mt-3">
-                        {{ Form::label('slug', 'URL') }}
+                        {{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
                    </div>
                    <div class="mt-1">
-                        {{ Form::text('slug', '', ['class' => 'form-control']) }}
+                        {{ Form::text('slug', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('slug') }}
                        @endif
--- 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 @@
        <div class="row">
            <div class="col">
                <h1 class="">Изменить форму образования</h1>
-                {{ 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']) }}
                <div class="col">
                    <div class="mt-3">
-                        {{ Form::label('name', 'Название') }}
+                        {{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.name')]) }}
+                        <span class="text-danger">*</span>
                    </div>
                    <div class="mt-1">
-                        {{ 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']) }}
+                        <div class="invalid-feedback">
+                            Поле "Название" обязательно!
+                        </div>
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('name') }}
                        @endif
                    </div>

                    <div class="mt-3">
-                        {{ Form::label('description', 'Описание') }}
+                        {{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.education_forms.description')]) }}
                    </div>
                    <div class="mt-1">
-                        {{ 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')]) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('description') }}
                        @endif
                    </div>

                    <div class="mt-3">
-                        {{ Form::label('slug', 'URL') }}
+                        {{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
                    </div>
                    <div class="mt-1">
-                        {{ 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')]) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('slug') }}
                        @endif