add bootstrap validated and logging to Subject Type Profile

2024-03-12 12:40:05 +03:00 · 2024-03-12 12:40:05 +03:00 · 40414f6da8
parent 64ad13f96f
commit 40414f6da8
7 changed files with 158 additions and 50 deletions
--- a/app/Helpers/PositionHelper.php
+++ b/app/Helpers/PositionHelper.php
@ -6,6 +6,7 @@ use App\Models\Direction;
 use App\Models\DirectionProfile;
 use App\Models\Faculty;
 use App\Models\EducationalInstitution;
+use App\Models\SubjectType;

 class PositionHelper
 {
@ -27,9 +28,15 @@ class PositionHelper
        return $maxPosition >= 254 ? 255 : $maxPosition + 1;
    }

-    public static function directionProfiles()
+    public static function directionProfile()
    {
        $maxPosition = DirectionProfile::max('position');
        return $maxPosition >= 254 ? 255 : $maxPosition + 1;
    }
+
+    public static function subjectType()
+    {
+        $maxPosition = SubjectType::max('position');
+        return $maxPosition >= 254 ? 255 : $maxPosition + 1;
+    }
 }
--- a/app/Http/Controllers/admin/Catalog/Direction/SubjectTypeController.php
+++ b/app/Http/Controllers/admin/Catalog/Direction/SubjectTypeController.php
@ -2,12 +2,16 @@

 namespace App\Http\Controllers\admin\Catalog\Direction;

+use App\Helpers\SlugHelper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\admin\Catalog\Direction\StoreSubjectTypeRequest;
 use App\Http\Requests\admin\Catalog\Direction\UpdateSubjectTypeRequest;
 use App\Models\SubjectType;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;

 class SubjectTypeController extends Controller
 {
@ -26,13 +30,21 @@ class SubjectTypeController extends Controller
    {
        $validated = $request->validated();

+        $slug = SlugHelper::get($validated);
+
        $type = new SubjectType();
        $type->name = $validated['name'];
        $type->description = $validated['description'];
-        $type->slug = $validated['slug'];
+        $type->slug = $slug;
        $type->position = $validated['position'];
        $type->save();

+        Log::channel('app')
+            ->info(
+                'CREATE тип предмета {subjectType} - user {user}',
+                ['user' => Auth::user()->name, 'subjectType' => $type->name, 'data' => $validated]
+            );
+
        return redirect()->route('subject_types.index');
    }

@ -49,6 +61,7 @@ class SubjectTypeController extends Controller
    public function update(UpdateSubjectTypeRequest $request, SubjectType $subjectType): RedirectResponse
    {
        $validated = $request->validated();
+        $oldData = $subjectType->toArray();

        $subjectType->name = $validated['name'];
        $subjectType->description = $validated['description'];
@ -56,14 +69,43 @@ class SubjectTypeController extends Controller
        $subjectType->position = $validated['position'];
        $subjectType->save();

+        Log::channel('app')
+            ->warning(
+                'UPDATE тип предмета {subjectType} - user {user}',
+                [
+                    'user' => Auth::user()->name,
+                    'subjectType' => $subjectType->name,
+                    'oldData' => $oldData,
+                    'newData' => $validated
+                ]
+            );
+
        return redirect()->route('subject_types.index');
    }

    public function destroy(SubjectType $subjectType): RedirectResponse
    {
        if ($subjectType->entranceExaminations()->exists()) {
+            Log::channel('app')
+                ->error(
+                    'NOT DELETE тип предмета {subjectType} - user {user}',
+                    [
+                        'user' => Auth::user()->name,
+                        'subjectType' => $subjectType->name,
+                        'data' => $subjectType->toArray(),
+                    ]
+                );
            return back();
        }
+        Log::channel('app')
+            ->critical(
+                'DELETE тип предмета {subjectType} - user {user}',
+                [
+                    'user' => Auth::user()->name,
+                    'subjectType' => $subjectType->name,
+                    'data' => $subjectType->toArray(),
+                ]
+            );
        $subjectType->delete();
        return redirect()->route('subject_types.index');
    }
--- a/app/Http/Requests/admin/Catalog/Direction/StoreSubjectTypeRequest.php
+++ b/app/Http/Requests/admin/Catalog/Direction/StoreSubjectTypeRequest.php
@ -14,10 +14,27 @@ class StoreSubjectTypeRequest extends FormRequest
    public function rules(): array
    {
        return [
-            'position' => 'required|int|numeric|max:255',
            'name' => 'required|string|max:255|unique:subject_types,name',
-            'description' => 'string',
-            'slug' => 'required|string|max:255|unique:subject_types,slug',
+            'description' => 'nullable|string',
+            'slug' => 'nullable|string|max:255|unique:subject_types,slug',
+            'position' => 'required|int|numeric|max:255',
+        ];
+    }
+
+    public function messages(): array
+    {
+        return [
+            'position.required' => 'Поле позиция обязательно.',
+            'position.int' => 'Позиция должно быть целым числом.',
+            'position.numeric' => 'Позиция должно быть числом.',
+            'position.max' => 'Позиция не должен быть больше :max',
+            '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/UpdateSubjectTypeRequest.php
+++ b/app/Http/Requests/admin/Catalog/Direction/UpdateSubjectTypeRequest.php
@ -15,7 +15,7 @@ class UpdateSubjectTypeRequest extends FormRequest
    {
        return [
            'position' => 'required|int|numeric|max:255',
-            'description' => 'string',
+            'description' => 'nullable|string',
            'slug' => [
                'string',
                'required',
@ -30,4 +30,21 @@ class UpdateSubjectTypeRequest extends FormRequest
            ],
        ];
    }
+
+    public function messages(): array
+    {
+        return [
+            'position.required' => 'Поле позиция обязательно.',
+            'position.int' => 'Позиция должно быть целым числом.',
+            'position.numeric' => 'Позиция должно быть числом.',
+            'position.max' => 'Позиция не должен быть больше :max',
+            '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
@ -45,5 +45,11 @@ return [
        'name' => 'Поле "Название" должно быть уникальным для отображения на сайте',
        'description' => 'Поле "Описание" может быть пустым для отображения на сайте',
        'slug' => 'Поле "URL" нужно для отображения в браузере'
+    ],
+    'subject_types' => [
+        'position' => 'Поле "Позиция" нужно для упорядочивания отображения на сайте',
+        'name' => 'Поле "Название" должно быть уникальным для отображения на сайте',
+        'description' => 'Поле "Описание" может быть пустым для отображения на сайте',
+        'slug' => 'Поле "URL" нужно для отображения в браузере'
    ]
 ];
--- a/resources/views/admin/catalog/direction/subject_type/create.blade.php
+++ b/resources/views/admin/catalog/direction/subject_type/create.blade.php
@ -1,59 +1,69 @@
+@php use App\Helpers\PositionHelper; @endphp
@extends('layouts.admin_layout')
@section('content')
    @auth()
        <div class="row">
            <div class="col">
                <h1 class=""> Создать Тип предмета</h1>
-                {{ Form::open(['url' => route('subject_types.store'), 'method' => 'POST', 'class' => '']) }}
+                {{ Form::open(['url' => route('subject_types.store'), 'method' => 'POST', 'class' => 'needs-validation', 'novalidate']) }}
                <div class="col">
+
                    <div class="mt-3">
-                        {{ Form::label('name', 'Название') }}
+                        {{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.position')]) }}
+                        <span class="text-danger">*</span>
                    </div>
                    <div class="mt-1">
-                        {{ Form::text('name', '', ['class' => 'form-control']) }}
+                        {{ Form::text('position', PositionHelper::subjectType(), ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.position'), 'required']) }}
+                        <div class="invalid-feedback">
+                            Поле "Позиция" обязательно!
+                        </div>
                    </div>
-                    <div>
+                    <div class="text-danger">
+                        @if ($errors->any())
+                            {{ $errors->first('position') }}
+                        @endif
+                    </div>
+
+                    <div class="mt-3">
+                        {{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.name')]) }}
+                        <span class="text-danger">*</span>
+                    </div>
+                    <div class="mt-1">
+                        {{ Form::text('name', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.name'), 'required']) }}
+                        <div class="invalid-feedback">
+                            Поле "Название" обязательно!
+                        </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.subject_types.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.subject_types.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.subject_types.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.subject_types.slug')]) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('slug') }}
                        @endif
                    </div>

-                    <div class="mt-3">
-                        {{ Form::label('position', 'Позиция') }}
-                    </div>
-                    <div class="mt-1">
-                        {{ Form::text('position', '', ['class' => 'form-control']) }}
-                    </div>
-                    <div>
-                        @if ($errors->any())
-                            {{ $errors->first('position') }}
-                        @endif
-                    </div>
-
                    <div class="mt-3">
                        {{ Form::submit('Создать', ['class' => 'btn btn-primary']) }}
                    </div>
--- a/resources/views/admin/catalog/direction/subject_type/edit.blade.php
+++ b/resources/views/admin/catalog/direction/subject_type/edit.blade.php
@ -5,56 +5,65 @@
        <div class="row">
            <div class="col">
                <h1 class="">Изменить тип предмета</h1>
-                {{ Form::open(['url' => route('subject_types.update', $subjectType), 'method' => 'PATCH', 'class' => '']) }}
+                {{ Form::open(['url' => route('subject_types.update', $subjectType), 'method' => 'PATCH', 'class' => 'needs-validation', 'novalidate']) }}
                <div class="col">
+
                    <div class="mt-3">
-                        {{ Form::label('name', 'Название') }}
+                        {{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.position')]) }}
+                        <span class="text-danger">*</span>
                    </div>
                    <div class="mt-1">
-                        {{ Form::text('name', $subjectType->name, ['class' => 'form-control']) }}
+                        {{ Form::text('position', $subjectType->position, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.position'), 'required']) }}
+                        <div class="invalid-feedback">
+                            Поле "Позиция" обязательно!
+                        </div>
                    </div>
-                    <div>
+                    <div class="text-danger">
+                        @if ($errors->any())
+                            {{ $errors->first('position') }}
+                        @endif
+                    </div>
+
+                    <div class="mt-3">
+                        {{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.name')]) }}
+                        <span class="text-danger">*</span>
+                    </div>
+                    <div class="mt-1">
+                        {{ Form::text('name', $subjectType->name, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.name'), 'required']) }}
+                        <div class="invalid-feedback">
+                            Поле "Название" обязательно!
+                        </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.subject_types.description')]) }}
                    </div>
                    <div class="mt-1">
-                        {{ Form::text('description', $subjectType->description, ['class' => 'form-control']) }}
+                        {{ Form::text('description', $subjectType->description, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.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.subject_types.slug')]) }}
                    </div>
                    <div class="mt-1">
-                        {{ Form::text('slug', $subjectType->slug, ['class' => 'form-control']) }}
+                        {{ Form::text('slug', $subjectType->slug, ['class' => 'form-control','data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.subject_types.slug')]) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('slug') }}
                        @endif
                    </div>

-                    <div class="mt-3">
-                        {{ Form::label('position', 'Позиция') }}
-                    </div>
-                    <div class="mt-1">
-                        {{ Form::text('position', $subjectType->position, ['class' => 'form-control']) }}
-                    </div>
-                    <div>
-                        @if ($errors->any())
-                            {{ $errors->first('position') }}
-                        @endif
-                    </div>
-
                    <div class="mt-3">
                        {{ Form::submit('Изменить', ['class' => 'btn btn-primary']) }}
                    </div>