RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

Compare commits

base: RomanGolienko:5fc547803c0d966b5edf60219208e91dd20a7b75
Branches Tags
RomanGolienko:main
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator
..
compare: RomanGolienko:f7b5773c4dbf6dbe9674ac753243d0737d317d4b
Branches Tags
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:main
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator

No commits in common. "5fc547803c0d966b5edf60219208e91dd20a7b75" and "f7b5773c4dbf6dbe9674ac753243d0737d317d4b" have entirely different histories.
5fc547803c ... f7b5773c4d

23 changed files with 174 additions and 616 deletions
Show Stats Expand all files Collapse all files

6
app/Helpers/PositionHelper.php
View File

@ -60,10 +60,4 @@ class PositionHelper
$maxPosition = EntranceExamination::max('position');
return $maxPosition >= 254 ? 255 : $maxPosition + 1;
}
public static function department()
{
$maxPosition = EntranceExamination::max('position');
return $maxPosition >= 254 ? 255 : $maxPosition + 1;
}
}

44
app/Http/Controllers/admin/Catalog/DepartmentController.php
View File

@ -2,7 +2,6 @@
namespace App\Http\Controllers\admin\Catalog;
use App\Helpers\SlugHelper;
use App\Http\Controllers\Controller;
use App\Http\Requests\admin\Catalog\StoreDepartmentRequest;
use App\Http\Requests\admin\Catalog\UpdateDepartmentRequest;
@ -12,8 +11,6 @@ use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Application;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
class DepartmentController extends Controller
{
@ -33,22 +30,14 @@ class DepartmentController extends Controller
{
$validated = $request->validated();
$slug = SlugHelper::get($validated);
$department = new Department();
$department->name = $validated['name'];
$department->description = $validated['description'];
$department->position = $validated['position'];
$department->faculty_id = $validated['faculty_id'];
$department->slug = $slug;
$department->slug = $validated['slug'];
$department->save();
Log::channel('app')
->info(
'CREATE кафедра {department} - user {user}',
['user' => Auth::user()->name, 'department' => $department->name, 'data' => $validated]
);
return redirect()->route('departments.index');
}
@ -68,25 +57,12 @@ class DepartmentController extends Controller
public function update(UpdateDepartmentRequest $request, Department $department): RedirectResponse
{
$validated = $request->validated();
$oldData = $department->toArray();
$department->name = $validated['name'];
$department->description = $validated['description'];
$department->position = $validated['position'];
$department->faculty_id = $validated['faculty_id'];
$department->slug = $validated['slug'];
Log::channel('app')
->warning(
'UPDATE кафедра {department} - user {user}',
[
'user' => Auth::user()->name,
'department' => $department->name,
'oldData' => $oldData,
'newData' => $validated
]
);
$department->save();
return redirect()->route('departments.index');
@ -95,26 +71,8 @@ class DepartmentController extends Controller
public function destroy(Department $department): RedirectResponse
{
if ($department->directions()->exists()) {
Log::channel('app')
->error(
'NOT DELETE кафедра {department} - user {user}',
[
'user' => Auth::user()->name,
'department' => $department->name,
'data' => $department->toArray(),
]
);
return back();
}
Log::channel('app')
->critical(
'DELETE кафедра {department} - user {user}',
[
'user' => Auth::user()->name,
'department' => $department->name,
'data' => $department->toArray(),
]
);
$department->delete();
return redirect()->route('departments.index');
}

7
app/Http/Controllers/admin/Catalog/Direction/EntranceExaminationController.php
View File

@ -53,15 +53,10 @@ class EntranceExaminationController extends Controller
$entranceExamination->subject_type_id = $validated['subject_type_id'];
$entranceExamination->save();
Log::channel('app')
->info(
'CREATE вступ. испытания {entranceExamination} - user {user}',
[
'user' => Auth::user()->name,
'entranceExamination' => $entranceExamination->name,
'data' => $validated
]
['user' => Auth::user()->name, 'entranceExamination' => $entranceExamination->name, 'data' => $validated]
);
return redirect()->route('entrance_examinations.index');

63
app/Http/Controllers/admin/Catalog/DirectionController.php
View File

@ -3,7 +3,6 @@
namespace App\Http\Controllers\admin\Catalog;
use App\Enums\ExaminationTypeEnum;
use App\Helpers\SlugHelper;
use App\Http\Controllers\Controller;
use App\Http\Requests\admin\Catalog\StoreDirectionRequest;
use App\Http\Requests\admin\Catalog\UpdateDirectionRequest;
@ -21,14 +20,12 @@ use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Application;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
class DirectionController extends Controller
{
public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
{
$directions = Direction::all()->sortBy('created_at', SORT_REGULAR, true);
$directions = Direction::all();
return view('admin.catalog.direction.index', compact('directions'));
}
@ -59,14 +56,12 @@ class DirectionController extends Controller
{
$validated = $request->validated();
$slug = SlugHelper::get($validated);
$direction = new Direction();
$direction->name = $validated['name'];
$direction->full_name = "{$validated['code']} {$validated['name']}";
$direction->description = $validated['description'];
$direction->position = $validated['position'];
$direction->slug = $slug;
$direction->slug = $validated['slug'];
$direction->code = $validated['code'];
$direction->education_level_id = $validated['education_level_id'];
$direction->education_form_id = $validated['education_form_id'];
@ -97,15 +92,6 @@ class DirectionController extends Controller
$direction->directionProfiles()->attach($validated['direction_profiles']);
}
Log::channel('app')
->info(
'CREATE напр. подготовки {direction} - user {user}',
[
'user' => Auth::user()->name,
'direction' => $direction->name,
'data' => $validated
]
);
return redirect()->route('directions.index');
}
@ -172,9 +158,7 @@ class DirectionController extends Controller
public function update(UpdateDirectionRequest $request, Direction $direction): RedirectResponse
{
$oldData = $direction->toArray();
$validated = $request->validated();
$direction->name = $validated['name'];
$direction->full_name = "{$validated['code']} {$validated['name']}";
$direction->description = $validated['description'];
@ -189,18 +173,6 @@ class DirectionController extends Controller
$direction->paid_places = $validated['paid_places'];
$direction->cost_paid_place = $validated['cost_paid_place'];
$direction->period = $validated['period'];
Log::channel('app')
->warning(
'UPDATE напр. подготовки {direction} - user {user}',
[
'user' => Auth::user()->name,
'direction' => $direction->name,
'oldData' => $oldData,
'newData' => $validated
]
);
$direction->save();
if (array_key_exists('entrance-examination', $validated)) {
@ -216,7 +188,7 @@ class DirectionController extends Controller
}
}
// dd($validated);
if (array_key_exists('delete', $validated)) {
foreach ($validated['delete'] as $id => $value) {
$entranceExamination = EntranceExamination::firstOrNew(['id' => $id]);
@ -235,27 +207,8 @@ class DirectionController extends Controller
public function destroy(Direction $direction): RedirectResponse
{
if ($direction->entranceExaminations()->exists()) {
Log::channel('app')
->error(
'NOT DELETE напр. подготовки {direction} - user {user}',
[
'user' => Auth::user()->name,
'direction' => $direction->name,
'data' => $direction->toArray(),
]
);
return back();
}
Log::channel('app')
->critical(
'DELETE напр. подготовки {direction} - user {user}',
[
'user' => Auth::user()->name,
'direction' => $direction->name,
'data' => $direction->toArray(),
]
);
$direction->directionProfiles()->detach();
$direction->delete();
return redirect()->route('directions.index');
@ -295,16 +248,6 @@ class DirectionController extends Controller
$newDirection->directionProfiles()->attach($direction->directionProfiles);
Log::channel('app')
->info(
'DUPLICATE напр. подготовки {direction} - user {user}',
[
'user' => Auth::user()->name,
'direction' => $direction->name,
'data' => $direction->toArray(),
]
);
return redirect()->route('directions.index');
}
}

48
app/Http/Controllers/admin/Catalog/EducationalInstitutionController.php
View File

@ -2,7 +2,6 @@
namespace App\Http\Controllers\admin\Catalog;
use App\Helpers\SlugHelper;
use App\Http\Controllers\Controller;
use App\Http\Requests\admin\Catalog\StoreEducationalInstitutionRequest;
use App\Http\Requests\admin\Catalog\UpdateEducationalInstitutionRequest;
@ -10,8 +9,6 @@ use App\Models\EducationalInstitution;
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 EducationalInstitutionController extends Controller
{
@ -30,25 +27,13 @@ class EducationalInstitutionController extends Controller
{
$validated = $request->validated();
$slug = SlugHelper::get($validated);
$educationalInstitution = new EducationalInstitution();
$educationalInstitution->name = $validated['name'];
$educationalInstitution->description = $validated['description'];
$educationalInstitution->slug = $slug;
$educationalInstitution->slug = $validated['slug'];
$educationalInstitution->position = $validated['position'];
$educationalInstitution->save();
Log::channel('app')
->info(
'CREATE учеб. заведение {educationalInstitution} - user {user}',
[
'user' => Auth::user()->name,
'educationalInstitution' => $educationalInstitution->name,
'data' => $validated
]
);
return redirect()->route('educational_institutions.index');
}
@ -65,24 +50,11 @@ class EducationalInstitutionController extends Controller
public function update(UpdateEducationalInstitutionRequest $request, EducationalInstitution $educationalInstitution)
{
$validated = $request->validated();
$oldData = $educationalInstitution->toArray();
$educationalInstitution->name = $validated['name'];
$educationalInstitution->description = $validated['description'];
$educationalInstitution->position = $validated['position'];
$educationalInstitution->slug = $validated['slug'];
Log::channel('app')
->warning(
'UPDATE учеб. заведение {educationalInstitution} - user {user}',
[
'user' => Auth::user()->name,
'faculty' => $educationalInstitution->name,
'oldData' => $oldData,
'newData' => $validated
]
);
$educationalInstitution->save();
return redirect()->route('educational_institutions.index');
@ -91,26 +63,8 @@ class EducationalInstitutionController extends Controller
public function destroy(EducationalInstitution $educationalInstitution)
{
if ($educationalInstitution->faculties()->exists()) {
Log::channel('app')
->error(
'NOT DELETE учеб. заведение {educationalInstitution} - user {user}',
[
'user' => Auth::user()->name,
'educationalInstitution' => $educationalInstitution->name,
'data' => $educationalInstitution->toArray(),
]
);
return back();
}
Log::channel('app')
->critical(
'DELETE учеб. заведение {educationalInstitution} - user {user}',
[
'user' => Auth::user()->name,
'educationalInstitution' => $educationalInstitution->name,
'data' => $educationalInstitution->toArray(),
]
);
$educationalInstitution->delete();
return redirect()->route('educational_institutions.index');

20
app/Http/Controllers/admin/PageController.php
View File

@ -2,15 +2,16 @@
namespace App\Http\Controllers\admin;
use App\Enums\ExaminationTypeEnum;
use App\Enums\FacultyEnum;
use App\Http\Controllers\Controller;
use App\Models\Admission;
use App\Models\EntranceExamination;
use App\Models\Direction;
use App\Models\Faculty;
use App\Models\Subject;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Application;
use Illuminate\Support\Facades\DB;
class PageController extends Controller
{
@ -29,20 +30,7 @@ class PageController extends Controller
// ->groupBy('faculties.name')
// ->get();
$faculties = Faculty::all();
$subjects = EntranceExamination::all()
->select('subject_id', 'subject_type_id', 'examination_type_id')
->where('examination_type_id', '=', ExaminationTypeEnum::Ege->value)
->groupBy('subject_type_id')->map(function ($examinate) {
return $examinate->reduce(function (?array $carry, $subject) {
$id = $subject['subject_id'];
$value = Subject::find($id)->name;
$carry[$id] = $value;
return $carry;
});
})
->toArray();
// $subjects = EntranceExamination::pluck('name', 'id');
$subjects = Subject::pluck('name', 'id');
// $infBez = $faculties->find(FacultyEnum::InfBez->value);
// $query = `select faculties.name, directions.name, directions.id
//FROM faculties

25
app/Http/Requests/admin/Catalog/StoreDepartmentRequest.php
View File

@ -17,30 +17,9 @@ class StoreDepartmentRequest extends FormRequest
return [
'position' => 'required|int|numeric|max:255',
'name' => 'required|string|max:255|unique:departments,name',
'description' => 'nullable|string',
'slug' => 'nullable|string|max:255|unique:departments,slug',
'description' => 'string',
'slug' => 'required|string|max:255|unique:departments,slug',
'faculty_id' => 'required|numeric|int|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 символов.',
'faculty_id.required' => 'Поле учебное заведение обязательно.',
'faculty_id.int' => 'Учебное заведение должно быть целым числом.',
'faculty_id.numeric' => 'Учебное заведение должно быть числом.',
'faculty_id.max' => 'Поле учебное заведение не должен быть больше :max.',
];
}
}

89
app/Http/Requests/admin/Catalog/StoreDirectionRequest.php
View File

@ -16,8 +16,8 @@ class StoreDirectionRequest extends FormRequest
return [
'position' => 'required|int|numeric|max:255',
'name' => 'required|string|max:255',
'description' => 'nullable|string',
'slug' => 'nullable|string|max:255|unique:directions,slug',
'description' => 'string',
'slug' => 'required|string|max:255|unique:directions,slug',
'code' => 'required|string|max:255',
'education_level_id' => 'required|int|numeric|max:1000',
'education_form_id' => 'required|int|numeric|max:1000',
@ -30,92 +30,9 @@ class StoreDirectionRequest extends FormRequest
'budget_places' => 'required|int|numeric|max:255',
'paid_places' => 'required|int|numeric|max:255',
'quota' => 'required|int|numeric|max:255',
'cost_paid_place' => 'required|int|numeric|max:200000',
'cost_paid_place' => 'required|int|numeric|max:255',
'period' => 'required|numeric|max:255',
'direction_profiles' => 'nullable|array'
];
}
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 символов.',
'code.required' => 'Поле Код обязательно.',
'code.string' => 'Поле Код должен быть строкой.',
'code.max' => 'Код не должен быть длиннее :max',
'education_level_id.required' => 'Поле "уровень образования" обязательно.',
'education_level_id.int' => 'Поле "уровень образования" должно быть целым числом.',
'education_level_id.numeric' => 'Поле "уровень образования" должно быть числом.',
'education_level_id.max' => 'Поле "уровень образования" не должен быть больше :max',
'education_form_id.required' => 'Поле "форма образования" обязательно.',
'education_form_id.int' => 'Поле "форма образования" должно быть целым числом.',
'education_form_id.numeric' => 'Поле "форма образования" должно быть числом.',
'education_form_id.max' => 'Поле "форма образования" не должен быть больше :max',
'department_id.required' => 'Поле "Кафедра" обязательно.',
'department_id.int' => 'Поле "Кафедра" должно быть целым числом.',
'department_id.numeric' => 'Поле "Кафедра" должно быть числом.',
'department_id.max' => 'Поле "Кафедра" не должен быть больше :max',
'entrance-examination.*.position.required' => 'Поле позиция обязательно.',
'entrance-examination.*.position.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.position.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.position.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.direction_id.required' => 'Поле позиция обязательно.',
'entrance-examination.*.direction_id.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.direction_id.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.direction_id.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.examination_type_id.required' => 'Поле позиция обязательно.',
'entrance-examination.*.examination_type_id.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.examination_type_id.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.examination_type_id.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.subject_id.required' => 'Поле позиция обязательно.',
'entrance-examination.*.subject_id.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.subject_id.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.subject_id.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.subject_type_id.required' => 'Поле позиция обязательно.',
'entrance-examination.*.subject_type_id.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.subject_type_id.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.subject_type_id.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.scores.required' => 'Поле позиция обязательно.',
'entrance-examination.*.scores.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.scores.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.scores.max' => 'Позиция не должен быть больше :max',
'budget_places.required' => 'Поле Кол-во бюджетных мест обязательно.',
'budget_places.int' => 'Кол-во бюджетных мест должно быть целым числом.',
'budget_places.numeric' => 'Кол-во бюджетных мест должно быть числом.',
'budget_places.max' => 'Кол-во бюджетных мест не должен быть больше :max',
'paid_places.required' => 'Поле Кол-во мест по договорам обязательно.',
'paid_places.int' => 'Кол-во мест по договорам должно быть целым числом.',
'paid_places.numeric' => 'Кол-во мест по договорам должно быть числом.',
'paid_places.max' => 'Кол-во мест по договорам не должен быть больше :max',
'quota.required' => 'Поле Квота обязательно.',
'quota.int' => 'Квота должно быть целым числом.',
'quota.numeric' => 'Квота должно быть числом.',
'quota.max' => 'Квота не должен быть больше :max',
'cost_paid_place.required' => 'Поле Стоимость обучения обязательно.',
'cost_paid_place.int' => 'Стоимость обучения должно быть целым числом.',
'cost_paid_place.numeric' => 'Стоимость обучения должно быть числом.',
'cost_paid_place.max' => 'Стоимость обучения не должен быть больше :max',
'period.required' => 'Поле Период обучения обязательно.',
'period.int' => 'Период обучения должно быть целым числом.',
'period.numeric' => 'Период обучения должно быть числом.',
'period.max' => 'Период обучения не должен быть больше :max',
'direction_profiles.array' => 'Поле Профиль подготовки должно быть массивом.',
];
}
}

20
app/Http/Requests/admin/Catalog/StoreEducationalInstitutionRequest.php
View File

@ -16,24 +16,8 @@ class StoreEducationalInstitutionRequest extends FormRequest
return [
'position' => 'required|int|numeric|max:255',
'name' => 'required|string|max:255|unique:educational_institutions,name',
'description' => 'nullable|string',
'slug' => 'nullable|string|max:255|unique:educational_institutions,slug',
];
}
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 символов.',
'description' => 'string',
'slug' => 'required|string|max:255|unique:educational_institutions,slug',
];
}
}

23
app/Http/Requests/admin/Catalog/UpdateDepartmentRequest.php
View File

@ -14,7 +14,7 @@ class UpdateDepartmentRequest extends FormRequest
{
return [
'position' => 'required|int|numeric|max:255',
'description' => 'nullable|string',
'description' => 'string',
'slug' => [
'string',
'required',
@ -30,25 +30,4 @@ class UpdateDepartmentRequest 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 символов.',
'faculty_id.required' => 'Поле учебное заведение обязательно.',
'faculty_id.int' => 'Учебное заведение должно быть целым числом.',
'faculty_id.numeric' => 'Учебное заведение должно быть числом.',
'faculty_id.max' => 'Поле учебное заведение не должен быть больше :max.',
];
}
}

88
app/Http/Requests/admin/Catalog/UpdateDirectionRequest.php
View File

@ -16,7 +16,7 @@ class UpdateDirectionRequest extends FormRequest
return [
'position' => 'required|int|numeric|max:255',
'name' => 'required|string|max:255',
'description' => 'nullable|string',
'description' => 'string',
'slug' => "required|string|max:255|unique:directions,slug,{$this->direction->id}",
'code' => "required|string|max:255",
'education_level_id' => 'required|int|numeric|max:1000',
@ -30,94 +30,10 @@ class UpdateDirectionRequest extends FormRequest
'budget_places' => 'required|int|numeric|max:255',
'paid_places' => 'required|int|numeric|max:255',
'quota' => 'required|int|numeric|max:255',
'cost_paid_place' => 'required|int|numeric|max:200000',
'cost_paid_place' => 'required|int|numeric|max:255',
'period' => 'required|numeric|max:255',
'direction_profiles' => 'nullable|array',
'delete.*' => 'nullable|array'
];
}
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 символов.',
'code.required' => 'Поле Код обязательно.',
'code.string' => 'Поле Код должен быть строкой.',
'code.max' => 'Код не должен быть длиннее :max',
'education_level_id.required' => 'Поле "уровень образования" обязательно.',
'education_level_id.int' => 'Поле "уровень образования" должно быть целым числом.',
'education_level_id.numeric' => 'Поле "уровень образования" должно быть числом.',
'education_level_id.max' => 'Поле "уровень образования" не должен быть больше :max',
'education_form_id.required' => 'Поле "форма образования" обязательно.',
'education_form_id.int' => 'Поле "форма образования" должно быть целым числом.',
'education_form_id.numeric' => 'Поле "форма образования" должно быть числом.',
'education_form_id.max' => 'Поле "форма образования" не должен быть больше :max',
'department_id.required' => 'Поле "Кафедра" обязательно.',
'department_id.int' => 'Поле "Кафедра" должно быть целым числом.',
'department_id.numeric' => 'Поле "Кафедра" должно быть числом.',
'department_id.max' => 'Поле "Кафедра" не должен быть больше :max',
'entrance-examination.*.position.required' => 'Поле позиция обязательно.',
'entrance-examination.*.position.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.position.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.position.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.direction_id.required' => 'Поле позиция обязательно.',
'entrance-examination.*.direction_id.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.direction_id.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.direction_id.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.examination_type_id.required' => 'Поле позиция обязательно.',
'entrance-examination.*.examination_type_id.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.examination_type_id.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.examination_type_id.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.subject_id.required' => 'Поле позиция обязательно.',
'entrance-examination.*.subject_id.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.subject_id.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.subject_id.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.subject_type_id.required' => 'Поле позиция обязательно.',
'entrance-examination.*.subject_type_id.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.subject_type_id.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.subject_type_id.max' => 'Позиция не должен быть больше :max',
'entrance-examination.*.scores.required' => 'Поле позиция обязательно.',
'entrance-examination.*.scores.int' => 'Позиция должно быть целым числом.',
'entrance-examination.*.scores.numeric' => 'Позиция должно быть числом.',
'entrance-examination.*.scores.max' => 'Позиция не должен быть больше :max',
'budget_places.required' => 'Поле Кол-во бюджетных мест обязательно.',
'budget_places.int' => 'Кол-во бюджетных мест должно быть целым числом.',
'budget_places.numeric' => 'Кол-во бюджетных мест должно быть числом.',
'budget_places.max' => 'Кол-во бюджетных мест не должен быть больше :max',
'paid_places.required' => 'Поле Кол-во мест по договорам обязательно.',
'paid_places.int' => 'Кол-во мест по договорам должно быть целым числом.',
'paid_places.numeric' => 'Кол-во мест по договорам должно быть числом.',
'paid_places.max' => 'Кол-во мест по договорам не должен быть больше :max',
'quota.required' => 'Поле Квота обязательно.',
'quota.int' => 'Квота должно быть целым числом.',
'quota.numeric' => 'Квота должно быть числом.',
'quota.max' => 'Квота не должен быть больше :max',
'cost_paid_place.required' => 'Поле Стоимость обучения обязательно.',
'cost_paid_place.int' => 'Стоимость обучения должно быть целым числом.',
'cost_paid_place.numeric' => 'Стоимость обучения должно быть числом.',
'cost_paid_place.max' => 'Стоимость обучения не должен быть больше :max',
'period.required' => 'Поле Период обучения обязательно.',
'period.int' => 'Период обучения должно быть целым числом.',
'period.numeric' => 'Период обучения должно быть числом.',
'period.max' => 'Период обучения не должен быть больше :max',
'direction_profiles.array' => 'Поле Профиль подготовки должно быть массивом.',
];
}
}

19
app/Http/Requests/admin/Catalog/UpdateEducationalInstitutionRequest.php
View File

@ -16,7 +16,7 @@ class UpdateEducationalInstitutionRequest extends FormRequest
{
return [
'position' => 'required|int|numeric|max:255',
'description' => 'nullable|string',
'description' => 'string',
'slug' => [
'required',
'string',
@ -31,21 +31,4 @@ class UpdateEducationalInstitutionRequest 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 символов.',
];
}
}

4
database/migrations/2024_02_09_114155_create_directions_table.php
View File

@ -10,7 +10,7 @@ return new class extends Migration
{
Schema::create('directions', function (Blueprint $table) {
$table->id();
$table->string('name', 255);
$table->string('name', 255)->unique();
$table->string('full_name', 255);
$table->text('description')->nullable();
$table->string('code', 255);
@ -22,7 +22,7 @@ return new class extends Migration
$table->smallInteger('budget_places');
$table->smallInteger('quota');
$table->smallInteger('paid_places');
$table->integer('cost_paid_place');
$table->smallInteger('cost_paid_place');
$table->float('period');
$table->timestamps();
});

9
lang/ru/tooltips.php
View File

@ -21,7 +21,7 @@ return [
'paid_places' => 'Поле "Платные места" указывает на количество платных мест в направлении',
'cost_paid_place' => 'Поле "Стоимость обучения" указывает на стоимость платных мест в направлении',
'slug' => 'Поле "Учебное заведение" указывает на привязку к учебному заведению',
'code' => 'Поле "Код" для идентификации направления',
'code' => 'Поле "URL" нужно для отображения в браузере',
'quota' => 'Поле "Квота" указывает на количество мест по квоте',
'period' => 'Поле "Период обучения" указывает на период обучения',
'direction_profile' => 'Поле "Профиль подготовки" указывает на привязку направления к профилям подготовки',
@ -75,11 +75,4 @@ return [
'description' => 'Поле "Описание" может быть пустым для отображения на сайте',
'slug' => 'Поле "URL" нужно для отображения в браузере'
],
'departments' => [
'position' => 'Поле "Позиция" нужно для упорядочивания отображения на сайте',
'name' => 'Поле "Название" должно быть уникальным для отображения на сайте',
'description' => 'Поле "Описание" может быть пустым для отображения на сайте',
'faculty_id' => 'Поле "Факультет" указывает на привязку к факультету',
'slug' => 'Поле "URL" нужно для отображения в браузере'
],
];

42
resources/views/admin/catalog/department/create.blade.php
View File

@ -1,4 +1,3 @@
@php use App\Helpers\PositionHelper; @endphp
@extends('layouts.admin_layout')
@section('content')
@auth()
@ -7,71 +6,60 @@
<h1 class=""> Создать кафедру</h1>
{{ Form::open(['url' => route('departments.store'), 'method' => 'POST', 'class' => '']) }}
<div class="col">
<div class="mt-3">
{{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.position')]) }}
<span class="text-danger">*</span>
{{ Form::label('position', 'Позиция') }}
</div>
<div class="mt-1">
{{ Form::number('position', PositionHelper::department(), ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.position'), 'required']) }}
<div class="invalid-feedback">
Поле "Позиция" обязательно!
{{ Form::text('position', '', ['class' => 'form-control']) }}
</div>
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('position') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.name')]) }}
<span class="text-danger">*</span>
{{ Form::label('name', 'Название') }}
</div>
<div class="mt-1">
{{ Form::text('name', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.name'), 'required']) }}
<div class="invalid-feedback">
Поле "Название" обязательно!
{{ Form::text('name', '', ['class' => 'form-control']) }}
</div>
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('name') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.description')]) }}
{{ Form::label('description', 'Описание') }}
</div>
<div class="mt-1">
{{ Form::text('description', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.description')]) }}
{{ Form::text('description', '', ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('description') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('faculty_id', 'Факультет', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.faculty_id')]) }}
<span class="text-danger">*</span>
{{ Form::label('faculty_id', 'Факультет') }}
</div>
<div class="mt-1">
{{ Form::select('faculty_id', $faculties, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.faculty_id')]) }}
{{ Form::select('faculty_id', $faculties, null, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('faculty_id') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.slug')]) }}
{{ Form::label('slug', 'URL') }}
</div>
<div class="mt-1">
{{ Form::text('slug', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.slug')]) }}
{{ Form::text('slug', '', ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('slug') }}
@endif

41
resources/views/admin/catalog/department/edit.blade.php
View File

@ -7,68 +7,59 @@
{{ Form::open(['url' => route('departments.update', $department), 'method' => 'PATCH', 'class' => '']) }}
<div class="col">
<div class="mt-3">
{{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.position')]) }}
<span class="text-danger">*</span>
{{ Form::label('position', 'Позиция') }}
</div>
<div class="mt-1">
{{ Form::number('position', $department->position, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.position'), 'required']) }}
<div class="invalid-feedback">
Поле "Позиция" обязательно!
{{ Form::text('position', $department->position, ['class' => 'form-control']) }}
</div>
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('position') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.name')]) }}
<span class="text-danger">*</span>
{{ Form::label('name', 'Название') }}
</div>
<div class="mt-1">
{{ Form::text('name', $department->name, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.name'), 'required']) }}
<div class="invalid-feedback">
Поле "Название" обязательно!
{{ Form::text('name', $department->name, ['class' => 'form-control']) }}
</div>
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('name') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.description')]) }}
{{ Form::label('description', 'Описание') }}
</div>
<div class="mt-1">
{{ Form::text('description', $department->description, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.description')]) }}
{{ Form::text('description', $department->description, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('description') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('faculty_id', 'Факультет', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.faculty_id')]) }}
<span class="text-danger">*</span>
{{ Form::label('educational_institution_id', 'Факультет') }}
</div>
<div class="mt-1">
{{ Form::select('faculty_id', $faculties, $department->faculty->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.faculty_id')]) }}
{{ Form::select('faculty_id', $faculties, $department->faculty->id, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('faculty_id') }}
{{ $errors->first('educational_institution_id') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.slug')]) }}
{{ Form::label('slug', 'URL') }}
</div>
<div class="mt-1">
{{ Form::text('slug', $department->slug, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.departments.slug')]) }}
{{ Form::text('slug', $department->slug, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('slug') }}
@endif

38
resources/views/admin/catalog/direction/create.blade.php
View File

@ -16,7 +16,7 @@
Поле "Кафедра" обязательно!
</div>
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('department_id') }}
@endif
@ -30,7 +30,7 @@
<div class="mt-1">
{{ Form::select('education_level_id', $levels, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.education_level_id'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('education_level_id') }}
@endif
@ -44,7 +44,7 @@
<div class="mt-1">
{{ Form::select('education_form_id', $forms, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.education_form_id'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('education_form_id') }}
@endif
@ -60,7 +60,7 @@
<div class="mt-1">
{{ Form::number('position', PositionHelper::direction(), ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.position'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('position') }}
@endif
@ -74,7 +74,7 @@
<div class="mt-1">
{{ Form::text('code', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.code'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('code') }}
@endif
@ -87,7 +87,7 @@
<div class="mt-1">
{{ Form::text('slug', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.slug')]) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('slug') }}
@endif
@ -101,7 +101,7 @@
<div class="mt-1">
{{ Form::text('name', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.name'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('name') }}
@endif
@ -113,7 +113,7 @@
<div class="mt-1">
{{ Form::text('description', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.name')]) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('description') }}
@endif
@ -129,7 +129,7 @@
<div class="mt-1">
{{ Form::number('budget_places', null, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.budget_places'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('budget_places') }}
@endif
@ -143,7 +143,7 @@
<div class="mt-1">
{{ Form::number('quota', null, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.quota'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('quota') }}
@endif
@ -157,7 +157,7 @@
<div class="mt-1">
{{ Form::number('paid_places', null, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.paid_places'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('paid_places') }}
@endif
@ -172,7 +172,7 @@
<div class="mt-1">
{{ Form::number('cost_paid_place', null, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.cost_paid_place'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('cost_paid_place') }}
@endif
@ -187,7 +187,7 @@
<div class="mt-1">
{{ Form::text('period', null, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.period'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('period') }}
@endif
@ -204,7 +204,7 @@
<div class="mt-1">
{{ Form::select('direction_profiles[]', $directionProfiles, null, ['class' => 'form-control rounded border-gray-300 w-1/3 h-32', 'multiple' => 'multiple', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.direction_profile'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('direction_profile') }}
@endif
@ -225,7 +225,7 @@
<div class="mt-1">
{{ Form::select('entrance-examination[0][examination_type_id]', $examination_types, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.examination_type_id'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('entrance-examination[0][examination_type_id]') }}
@endif
@ -239,7 +239,7 @@
<div class="mt-1 col">
{{ Form::select('entrance-examination[0][subject_id]', $subjects, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.subject_id'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('entrance-examination[0][subject_id]') }}
@endif
@ -253,7 +253,7 @@
<div class="mt-1 col">
{{ Form::select('entrance-examination[0][subject_type_id]', $subjectTypes, null, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.subject_type_id'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('entrance-examination[0][subject_type_id]') }}
@endif
@ -267,7 +267,7 @@
<div class="mt-1 col">
{{ Form::number('entrance-examination[0][scores]', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.scores'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('entrance-examination[0][scores]') }}
@endif
@ -281,7 +281,7 @@
<div class="mt-1 col">
{{ Form::number('entrance-examination[0][position]', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.position'), 'required']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('entrance-examination[0][position]') }}
@endif

130
resources/views/admin/catalog/direction/edit.blade.php
View File

@ -1,21 +1,17 @@
@extends('layouts.admin_layout')
@section('content')
@auth()
<h1 class=""> Изменить Направление</h1>
{{ Form::open(['url' => route('directions.update', $direction), 'method' => 'PATCH', 'class' => 'ffff needs-validation', 'novalidate']) }}
<h1 class=""> Создать Направление</h1>
{{ Form::open(['url' => route('directions.update', $direction), 'method' => 'PATCH', 'class' => 'ffff']) }}
<div class="row">
<div class="col">
<div class="mt-3">
{{ Form::label('department_id', 'Кафедра', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id')]) }}
<span class="text-danger">*</span>
{{ Form::label('department_id', 'Кафедра') }}
</div>
<div class="mt-1">
{{ Form::select('department_id', $departments, $direction->department->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.department_id'), 'required']) }}
<div class="invalid-feedback">
Поле "Кафедра" обязательно!
{{ Form::select('department_id', $departments, $direction->department->id, ['class' => 'form-select']) }}
</div>
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('department_id') }}
@endif
@ -23,13 +19,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label('education_level_id', 'Увовень образования', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.education_level_id')]) }}
<span class="text-danger">*</span>
{{ Form::label('education_level_id', 'Увовень образования') }}
</div>
<div class="mt-1">
{{ Form::select('education_level_id', $levels, $direction->educationLevel->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.education_level_id'), 'required']) }}
{{ Form::select('education_level_id', $levels, $direction->educationLevel->id, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('education_level_id') }}
@endif
@ -37,13 +32,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label('education_form_id', 'Форма образования', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.education_form_id')]) }}
<span class="text-danger">*</span>
{{ Form::label('education_form_id', 'Форма образования') }}
</div>
<div class="mt-1">
{{ Form::select('education_form_id', $forms, $direction->educationForm->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.education_form_id'), 'required']) }}
{{ Form::select('education_form_id', $forms, $direction->educationForm->id, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('education_form_id') }}
@endif
@ -53,13 +47,12 @@
<div class="row">
<div class="col">
<div class="mt-3">
{{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.position')]) }}
<span class="text-danger">*</span>
{{ Form::label('position', 'Позиция') }}
</div>
<div class="mt-1">
{{ Form::number('position', $direction->position, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.position'), 'required']) }}
{{ Form::number('position', $direction->position, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('position') }}
@endif
@ -67,12 +60,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label('code', 'Код', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.code')]) }}
{{ Form::label('code', 'Код') }}
</div>
<div class="mt-1">
{{ Form::text('code', $direction->code, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.code'), 'required']) }}
{{ Form::text('code', $direction->code, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('code') }}
@endif
@ -80,12 +73,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.slug')]) }}
{{ Form::label('slug', 'URL') }}
</div>
<div class="mt-1">
{{ Form::text('slug', $direction->slug, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.slug')]) }}
{{ Form::text('slug', $direction->slug, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('slug') }}
@endif
@ -93,25 +86,24 @@
</div>
<div class="mt-3">
{{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.name')]) }}
<span class="text-danger">*</span>
{{ Form::label('name', 'Название') }}
</div>
<div class="mt-1">
{{ Form::text('name', $direction->name, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.name'), 'required']) }}
{{ Form::text('name', $direction->name, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('name') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.description')]) }}
{{ Form::label('description', 'Описание') }}
</div>
<div class="mt-1">
{{ Form::text('description', $direction->description, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.name')]) }}
{{ Form::text('description', $direction->description, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('description') }}
@endif
@ -121,13 +113,12 @@
<div class="row">
<div class="col">
<div class="mt-3">
{{ Form::label('budget_places', 'Кол-во бюджетных мест', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.budget_places')]) }}
<span class="text-danger">*</span>
{{ Form::label('budget_places', 'Кол-во бюджетных мест') }}
</div>
<div class="mt-1">
{{ Form::number('budget_places', $direction->budget_places, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.budget_places'), 'required']) }}
{{ Form::number('budget_places', $direction->budget_places, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('budget_places') }}
@endif
@ -135,13 +126,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label('quota', 'Квота', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.quota')]) }}
<span class="text-danger">*</span>
{{ Form::label('quota', 'Квота') }}
</div>
<div class="mt-1">
{{ Form::number('quota', $direction->quota, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.quota'), 'required']) }}
{{ Form::number('quota', $direction->quota, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('quota') }}
@endif
@ -149,13 +139,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label('paid_places', 'Кол-во мест по договорам', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.paid_places')]) }}
<span class="text-danger">*</span>
{{ Form::label('paid_places', 'Кол-во мест по договорам') }}
</div>
<div class="mt-1">
{{ Form::number('paid_places', $direction->paid_places, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.paid_places'), 'required']) }}
{{ Form::number('paid_places', $direction->paid_places, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('paid_places') }}
@endif
@ -164,13 +153,12 @@
<div class="col">
<div class="mt-3">
{{ Form::label('cost_paid_place', 'Стоимость обучения', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.cost_paid_place')]) }}
<span class="text-danger">*</span>
{{ Form::label('cost_paid_place', 'Стоимость обучения') }}
</div>
<div class="mt-1">
{{ Form::number('cost_paid_place', $direction->cost_paid_place, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.cost_paid_place'), 'required']) }}
{{ Form::number('cost_paid_place', $direction->cost_paid_place, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('cost_paid_place') }}
@endif
@ -179,13 +167,12 @@
<div class="col">
<div class="mt-3">
{{ Form::label('period', 'Период обучения', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.period')]) }}
<span class="text-danger">*</span>
{{ Form::label('period', 'Период обучения') }}
</div>
<div class="mt-1">
{{ Form::text('period', $direction->period, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.period'), 'required']) }}
{{ Form::text('period', $direction->period, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('period') }}
@endif
@ -196,13 +183,12 @@
<div class="row">
<div class="col">
<div class="mt-3">
{{ Form::label('direction_profile', 'Профиль подготовки', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.direction_profile')]) }}
<span class="text-danger">*</span>
{{ Form::label('direction_profile', 'Профиль подготовки') }}
</div>
<div class="mt-1">
{{ Form::select('direction_profiles[]', $directionProfiles, $direction->directionProfiles, ['class' => 'form-control rounded border-gray-300 w-1/3 h-32', 'multiple' => 'multiple', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.direction.direction_profile'), 'required']) }}
{{ Form::select('direction_profiles[]', $directionProfiles, $direction->directionProfiles, ['class' => 'form-control rounded border-gray-300 w-1/3 h-32', 'multiple' => 'multiple']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('direction_profile') }}
@endif
@ -223,12 +209,12 @@
<div class="row field">
<div class="col">
<div class="mt-3">
{{ Form::label("entrance-examination[{$entranceExamination->id}][examination_type_id]", 'Тип экзамена', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.examination_type_id')]) }}
{{ Form::label("entrance-examination[{$entranceExamination->id}][examination_type_id]", 'Тип экзамена') }}
</div>
<div class="mt-1">
{{ Form::select("entrance-examination[{$entranceExamination->id}][examination_type_id]", $examination_types, $entranceExamination->examinationType->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.examination_type_id'), 'required']) }}
{{ Form::select("entrance-examination[{$entranceExamination->id}][examination_type_id]", $examination_types, $entranceExamination->examinationType->id, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first("entrance-examination[{$entranceExamination->id}][examination_type_id]") }}
@endif
@ -236,12 +222,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label("entrance-examination[{$entranceExamination->id}][subject_id]", 'Предмет', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.subject_id')]) }}
{{ Form::label("entrance-examination[{$entranceExamination->id}][subject_id]", 'Предмет') }}
</div>
<div class="mt-1 col">
{{ Form::select("entrance-examination[{$entranceExamination->id}][subject_id]", $subjects, $entranceExamination->subject->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.subject_id'), 'required']) }}
{{ Form::select("entrance-examination[{$entranceExamination->id}][subject_id]", $subjects, $entranceExamination->subject->id, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first("entrance-examination[{$entranceExamination->id}][subject_id]") }}
@endif
@ -249,12 +235,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label("entrance-examination[{$entranceExamination->id}][subject_type_id]", 'Тип предмета', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.subject_type_id')]) }}
{{ Form::label("entrance-examination[{$entranceExamination->id}][subject_type_id]", 'Тип предмета') }}
</div>
<div class="mt-1 col">
{{ Form::select("entrance-examination[{$entranceExamination->id}][subject_type_id]", $subjectTypes, $entranceExamination->subjectType->id, ['class' => 'form-select', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.subject_type_id'), 'required']) }}
{{ Form::select("entrance-examination[{$entranceExamination->id}][subject_type_id]", $subjectTypes, $entranceExamination->subjectType->id, ['class' => 'form-select']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first("entrance-examination[{$entranceExamination->id}][subject_type_id]") }}
@endif
@ -262,10 +248,10 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label("entrance-examination[{$entranceExamination->id}][scores]", 'Кол-во баллов', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.scores')]) }}
{{ Form::label("entrance-examination[{$entranceExamination->id}][scores]", 'Кол-во баллов') }}
</div>
<div class="mt-1 col">
{{ Form::text("entrance-examination[{$entranceExamination->id}][scores]", $entranceExamination->scores, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.scores'), 'required']) }}
{{ Form::text("entrance-examination[{$entranceExamination->id}][scores]", $entranceExamination->scores, ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
@ -275,12 +261,12 @@
</div>
<div class="col">
<div class="mt-3">
{{ Form::label("entrance-examination[{$entranceExamination->id}][position]", 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.position')]) }}
{{ Form::label("entrance-examination[{$entranceExamination->id}][position]", 'Позиция') }}
</div>
<div class="mt-1 col">
{{ Form::text("entrance-examination[{$entranceExamination->id}][position]", $entranceExamination->position, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.entrance-examination.position'), 'required']) }}
{{ Form::text("entrance-examination[{$entranceExamination->id}][position]", $entranceExamination->position, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first("entrance-examination[{$entranceExamination->id}][position]") }}
@endif

2
resources/views/admin/catalog/educational_institution/create.blade.php
View File

@ -28,7 +28,7 @@
<span class="text-danger">*</span>
</div>
<div class="mt-2">
{{ Form::number('name', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.name'), 'required']) }}
{{ Form::text('name', '', ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.name'), 'required']) }}
<div class="invalid-feedback">
Поле "Название" обязательно!
</div>

48
resources/views/admin/catalog/educational_institution/edit.blade.php
View File

@ -4,58 +4,50 @@
<div class="row">
<div class="col">
<h1 class="">Изменить учебное заведение</h1>
{{ Form::model($educationalInstitution, ['route' => ['educational_institutions.update', $educationalInstitution], 'method' => 'PATCH', 'class' => 'needs-validation', 'novalidate']) }}
{{ Form::model($educationalInstitution, ['route' => ['educational_institutions.update', $educationalInstitution], 'method' => 'PATCH', 'class' => '']) }}
<div class="col">
<div>
{{ Form::label('position', 'Позиция') }}
</div>
<div class="mt-2">
{{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.position')]) }}
<span class="text-danger">*</span>
{{ Form::text('position', $educationalInstitution->position, ['class' => 'form-control']) }}
</div>
<div class="mt-1">
{{ Form::number('position', $educationalInstitution->position, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.position'), 'required']) }}
<div class="invalid-feedback">
Поле "Позиция" обязательно!
</div>
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('position') }}
@endif
</div>
<div>
{{ Form::label('name', 'Название') }}
</div>
<div class="mt-2">
{{ Form::label('name', 'Название', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.name')]) }}
<span class="text-danger">*</span>
{{ Form::text('name', $educationalInstitution->name, ['class' => 'form-control']) }}
</div>
<div class="mt-1">
{{ Form::text('name', $educationalInstitution->name, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.name'), 'required']) }}
<div class="invalid-feedback">
Поле "Название" обязательно!
</div>
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('name') }}
@endif
</div>
<div>
{{ Form::label('description', 'Описание') }}
</div>
<div class="mt-2">
{{ Form::label('description', 'Описание', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.description')]) }}
{{ Form::text('description', $educationalInstitution->description, ['class' => 'form-control']) }}
</div>
<div class="mt-1">
{{ Form::text('description', $educationalInstitution->description, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.description')]) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('description') }}
@endif
</div>
<div class="mt-2">
{{ Form::label('slug', 'URL', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.slug')]) }}
<div class="mt-3">
{{ Form::label('slug', 'URL') }}
</div>
<div class="mt-1">
{{ Form::text('slug', $educationalInstitution->slug, ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.educational_institutions.slug')]) }}
{{ Form::text('slug', $educationalInstitution->slug, ['class' => 'form-control']) }}
</div>
<div class="text-danger">
<div>
@if ($errors->any())
{{ $errors->first('slug') }}
@endif

1
resources/views/admin/catalog/faculty/create.blade.php
View File

@ -7,7 +7,6 @@
<h1 class=""> Создать факультет</h1>
{{ Form::open(['url' => route('faculties.store'), 'method' => 'POST', 'class' => 'needs-validation', 'novalidate']) }}
<div class="col">
<div class="mt-3">
{{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.faculty.position')]) }}
<span class="text-danger">*</span>

4
resources/views/new-design/bakalavr-special.blade.php
View File

@ -424,10 +424,10 @@
<span class="checkmark"></span>
</label>
@endif
@endforeac1
@endforeach
<hr class="col-5">
@foreach($subjects as $id => $name)
@if($name !== "Русский язык" && $name !== "Математика" )
@if($name !== "Русский язык" && $name !== "математика" )
<label class="checkbox1"> {{$name }}
<input class="checkbox_input_clear" type="checkbox" value="{{ $id }}">
<span class="checkmark"></span>

19
tests/Feature/ExampleTest.php Normal file
View File

@ -0,0 +1,19 @@
<?php
namespace Tests\Feature;
// use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class ExampleTest extends TestCase
{
/**
* A basic test example.
*/
public function testTheApplicationReturnsASuccessfulResponse(): void
{
$response = $this->get('/');
$response->assertStatus(200);
}
}