diff --git a/app/Http/Requests/admin/Catalog/UpdateFacultyRequest.php b/app/Http/Requests/admin/Catalog/UpdateFacultyRequest.php index b045a17..0484e83 100644 --- a/app/Http/Requests/admin/Catalog/UpdateFacultyRequest.php +++ b/app/Http/Requests/admin/Catalog/UpdateFacultyRequest.php @@ -15,20 +15,31 @@ class UpdateFacultyRequest extends FormRequest { return [ 'position' => 'required|int|numeric|max:255', + 'name' => ['required', 'string', 'max:255', "unique:faculties,name,{$this->faculty->id}",], 'description' => 'string', - 'slug' => [ - 'required', - 'string', - 'max:255', - "unique:faculties,slug,{$this->faculty->id}", - ], - 'educational_institution_id' => 'required|int|numeric|max:255', - 'name' => [ - 'required', - 'string', - 'max:255', - "unique:faculties,name,{$this->faculty->id}", - ], + 'slug' => ['required', 'string', 'max:255', "unique:faculties,slug,{$this->faculty->id}",], + 'educational_institution_id' => 'required|int|numeric|max:1000', + ]; + } + + 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 символов.', + 'educational_institution_id.required' => 'Поле учебное заведение обязательно.', + 'educational_institution_id.int' => 'Учебное заведение должно быть целым числом.', + 'educational_institution_id.numeric' => 'Учебное заведение должно быть числом.', + 'educational_institution_id.max' => 'Поле учебное заведение не должен быть больше :max.', ]; } } diff --git a/resources/views/admin/catalog/faculty/create.blade.php b/resources/views/admin/catalog/faculty/create.blade.php index 1c5f759..2ec995b 100644 --- a/resources/views/admin/catalog/faculty/create.blade.php +++ b/resources/views/admin/catalog/faculty/create.blade.php @@ -74,7 +74,7 @@ @endif
- {{ Form::submit('создать', ['class' => 'btn btn-primary']) }} + {{ Form::submit('Создать', ['class' => 'btn btn-primary']) }}
{{ Form::close() }} diff --git a/resources/views/admin/catalog/faculty/edit.blade.php b/resources/views/admin/catalog/faculty/edit.blade.php index 5107a46..98553cb 100644 --- a/resources/views/admin/catalog/faculty/edit.blade.php +++ b/resources/views/admin/catalog/faculty/edit.blade.php @@ -1,75 +1,85 @@ +@php use App\Helpers\PositionHelper; @endphp @extends('layouts.admin_layout') @section('content') - @auth()
-

Создать факультет

- {{ Form::open(['url' => route('faculties.update', $faculty), 'method' => 'PATCH', 'class' => '']) }} +

Редактировать факультет

+ {{ Form::open(['url' => route('faculties.update', $faculty), 'method' => 'PATCH', 'class' => 'needs-validation', 'novalidate']) }}
- {{ Form::label('position', 'Позиция') }} + {{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.position')]) }} + *
- {{ Form::text('position', $faculty->position, ['class' => 'form-control']) }} + {{ Form::number('position', $faculty->position, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.position'), 'required']) }} +
+ Поле "Позиция" обязательно! +
-
+
@if ($errors->any()) {{ $errors->first('position') }} @endif
- {{ Form::label('name', 'Название') }} + {{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.name')]) }} + *
- {{ Form::text('name', $faculty->name, ['class' => 'form-control']) }} + {{ Form::text('name', $faculty->name, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.name'), 'required']) }} +
+ Поле "Название" обязательно! +
-
+
@if ($errors->any()) {{ $errors->first('name') }} @endif
- {{ Form::label('description', 'Описание') }} + {{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.description')]) }}
- {{ Form::text('description', $faculty->description, ['class' => 'form-control']) }} + {{ Form::text('description', $faculty->description, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.description')]) }}
-
+
@if ($errors->any()) {{ $errors->first('description') }} @endif
- {{ Form::label('educational_institution_id', 'Учебное заведение') }} + {{ Form::label('educational_institution_id', 'Учебное заведение', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.educational_institution_id')]) }} + *
- {{ Form::select('educational_institution_id', $educationalInstitutions, $faculty->educationalInstitution->id, ['class' => 'form-select']) }} + {{ Form::select('educational_institution_id', $educationalInstitutions, $faculty->educationalInstitution->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.educational_institution_id')]) }}
-
+
@if ($errors->any()) {{ $errors->first('educational_institution_id') }} @endif
- {{ Form::label('slug', 'URL') }} + {{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
- {{ Form::text('slug', $faculty->slug, ['class' => 'form-control']) }} + {{ Form::text('slug', $faculty->slug, ['class' => 'form-control','data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.slug')]) }}
-
+
@if ($errors->any()) {{ $errors->first('slug') }} @endif
- {{ Form::submit('создать', ['class' => 'btn btn-primary']) }} + {{ Form::submit('Изменить', ['class' => 'btn btn-primary']) }}
{{ Form::close() }}
@endauth + @include('layouts.bootstrap_validation') @endsection