aslan
/
applicant-site
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: aslan:5b1e4cab991035523bff74215ac73b077c87bbd2
Branches Tags
aslan:main
aslan:new-calculator
..
compare: aslan:1462d70800bdf99d62c843d0da3b2dae40b5faff
Branches Tags
aslan:main
aslan:new-calculator

No commits in common. "5b1e4cab991035523bff74215ac73b077c87bbd2" and "1462d70800bdf99d62c843d0da3b2dae40b5faff" have entirely different histories.
5b1e4cab99 ... 1462d70800

22 changed files with 10 additions and 632 deletions
Show Stats Expand all files Collapse all files

70
app/Http/Controllers/admin/Catalog/Direction/SubjectTypeController.php
View File

@ -1,70 +0,0 @@
<?php
namespace App\Http\Controllers\admin\Catalog\Direction;
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;
class SubjectTypeController extends Controller
{
public function index(): View
{
$subjectTypes = SubjectType::all();
return view('admin.catalog.direction.subject_type.index', compact('subjectTypes'));
}
public function create(): View
{
return view('admin.catalog.direction.subject_type.create');
}
public function store(StoreSubjectTypeRequest $request): RedirectResponse
{
$validated = $request->validated();
$type = new SubjectType();
$type->name = $validated['name'];
$type->description = $validated['description'];
$type->slug = $validated['slug'];
$type->position = $validated['position'];
$type->save();
return redirect()->route('subject_types.index');
}
public function show(SubjectType $type): View
{
return view('admin.catalog.direction.subject_type.show', compact('type'));
}
public function edit(SubjectType $subjectType): View
{
return view('admin.catalog.direction.subject_type.edit', compact('subjectType'));
}
public function update(UpdateSubjectTypeRequest $request, SubjectType $subjectType): RedirectResponse
{
$validated = $request->validated();
$subjectType->name = $validated['name'];
$subjectType->description = $validated['description'];
$subjectType->slug = $validated['slug'];
$subjectType->position = $validated['position'];
$subjectType->save();
return redirect()->route('subject_types.index');
}
public function destroy(SubjectType $subjectType): RedirectResponse
{
if ($subjectType->entranceExaminations()->exists()) {
return back();
}
$subjectType->delete();
return redirect()->route('subject_types.index');
}
}

23
app/Http/Requests/admin/Catalog/Direction/StoreSubjectTypeRequest.php
View File

@ -1,23 +0,0 @@
<?php
namespace App\Http\Requests\admin\Catalog\Direction;
use Illuminate\Foundation\Http\FormRequest;
class StoreSubjectTypeRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
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',
];
}
}

33
app/Http/Requests/admin/Catalog/Direction/UpdateSubjectTypeRequest.php
View File

@ -1,33 +0,0 @@
<?php
namespace App\Http\Requests\admin\Catalog\Direction;
use Illuminate\Foundation\Http\FormRequest;
class UpdateSubjectTypeRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
return [
'position' => 'required|int|numeric|max:255',
'description' => 'string',
'slug' => [
'string',
'required',
'max:255',
"unique:subject_types,slug,{$this->subject_type->id}",
],
'name' => [
'required',
'string',
'max:255',
"unique:subject_types,name,{$this->subject_type->id}",
],
];
}
}

25
app/Models/SubjectType.php
View File

@ -1,25 +0,0 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
class SubjectType extends Model
{
use HasFactory;
protected $fillable = [
'id',
'name',
'description',
'slug',
'position',
];
public function entranceExaminations(): HasMany
{
return $this->hasMany('App\Models\EntranceExamination', 'subject_type_id');
}
}

18
database/factories/SubjectTypeFactory.php
View File

@ -1,18 +0,0 @@
<?php
namespace Database\Factories;
use Illuminate\Database\Eloquent\Factories\Factory;
class SubjectTypeFactory extends Factory
{
public function definition(): array
{
return [
'name' => fake()->name(),
'description' => fake()->text(),
'slug' => fake()->slug(),
'position' => fake()->randomDigit(),
];
}
}

25
database/migrations/2024_02_15_075912_create_subject_types_table.php
View File

@ -1,25 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::create('subject_types', function (Blueprint $table) {
$table->id();
$table->integer('position');
$table->string('name');
$table->text('description')->nullable();
$table->string('slug');
$table->timestamps();
});
}
public function down(): void
{
Schema::dropIfExists('subject_types');
}
};

1
database/seeders/DatabaseSeeder.php
View File

@ -29,7 +29,6 @@ class DatabaseSeeder extends Seeder
EducationFormSeeder::class,
ExaminationTypeSeeder::class,
SubjectSeeder::class,
SubjectTypeSeeder::class,
DirectionSeeder::class,
]);

28
database/seeders/SubjectTypeSeeder.php
View File

@ -1,28 +0,0 @@
<?php
namespace Database\Seeders;
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
class SubjectTypeSeeder extends Seeder
{
public function run(): void
{
DB::table('subject_types')->insert([
[
'name' => 'Обязательные',
'description' => 'compulsory',
'position' => '1',
'slug' => 'compulsory',
],
[
'name' => 'Предметы по выбору',
'description' => 'optional',
'position' => '2',
'slug' => 'optional',
],
]);
}
}

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

@ -1,66 +0,0 @@
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="row">
<div class="col">
<h1 class="">Изменить тип экзамена</h1>
{{ Form::open(['url' => route('examination_types.update', $examinationType), 'method' => 'PATCH', 'class' => '']) }}
<div class="col">
<div class="mt-3">
{{ Form::label('name', 'Название') }}
</div>
<div class="mt-1">
{{ Form::text('name', $examinationType->name, ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('name') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('description', 'Описание') }}
</div>
<div class="mt-1">
{{ Form::text('description', $examinationType->description, ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('description') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('slug', 'URL') }}
</div>
<div class="mt-1">
{{ Form::text('slug', $examinationType->slug, ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('slug') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('position', 'Позиция') }}
</div>
<div class="mt-1">
{{ Form::text('position', $examinationType->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>
</div>
{{ Form::close() }}
</div>
</div>
@endauth
@endsection

41
resources/views/admin/catalog/direction/examination_type/index.blade.php
View File

@ -1,41 +0,0 @@
@extends('layouts.admin_layout')
@section('content')
<div class="container">
<h2>Тип Экзамена</h2>
<br>
<a href="{{ route('examination_types.create') }}" class="btn btn-primary">Создать тип экзамена</a>
<br>
<br>
<table class="table">
<thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
<tr>
<th scope="col">Позиция</th>
<th scope="col">Название</th>
<th scope="col">Описание</th>
<th scope="col">URL</th>
<th scope="col">действия</th>
<th scope="col"></th>
</tr>
</thead>
<tbody>
@foreach($types as $type)
<tr class="">
<td>{{ $type->position }}</td>
<td><a href="{{ route('examination_types.show', $type) }}">{{ $type->name }}</a></td>
<td>{{ Str::words($type->description, 10, '...') }}</td>
<td>{{ $type->slug }}</td>
<td>
<a href="{{ route("examination_types.edit", $type) }}"
class="btn btn-secondary">редактировать</a>
<a rel="nofollow" data-method="delete" data-confirm="Вы действительно хотите удалить?"
href="{{ route('examination_types.destroy', $type) }}"
class="btn btn-danger">удалить</a>
</td>
</tr>
@endforeach
</tbody>
</table>
<br>
<br>
</div>
@endsection

2
resources/views/admin/catalog/direction/examination_type/show.blade.php
View File

@ -10,7 +10,7 @@
<p>{{ $examinationType->slug }}</p>
<h2>Позиция</h2>
<p>{{ $examinationType->position }}</p>
<h2>Вступительные испытания</h2>
<h2>Направления</h2>
@foreach($examinationType->entranceExaminations as $entranceExamination)
<p><a href="{{ route('entrance_examinations.show', $entranceExamination) }}">{{ $entranceExamination->name }}</a></p>
@endforeach

2
resources/views/admin/catalog/direction/subject/index.blade.php
View File

@ -1,7 +1,7 @@
@extends('layouts.admin_layout')
@section('content')
<div class="container">
<h2>Предметы</h2>
<h2>Тип Экзамена</h2>
<br>
<a href="{{ route('subjects.create') }}" class="btn btn-primary">Создать предмет</a>
<br>

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

@ -1,65 +0,0 @@
@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' => '']) }}
<div class="col">
<div class="mt-3">
{{ Form::label('name', 'Название') }}
</div>
<div class="mt-1">
{{ Form::text('name', '', ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('name') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('description', 'Описание') }}
</div>
<div class="mt-1">
{{ Form::text('description', '', ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('description') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('slug', 'URL') }}
</div>
<div class="mt-1">
{{ Form::text('slug', '', ['class' => 'form-control']) }}
</div>
<div>
@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>
</div>
{{ Form::close() }}
</div>
</div>
@endauth
@endsection

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

@ -1,66 +0,0 @@
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="row">
<div class="col">
<h1 class="">Изменить тип предмета</h1>
{{ Form::open(['url' => route('subject_types.update', $subjectType), 'method' => 'PATCH', 'class' => '']) }}
<div class="col">
<div class="mt-3">
{{ Form::label('name', 'Название') }}
</div>
<div class="mt-1">
{{ Form::text('name', $subjectType->name, ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('name') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('description', 'Описание') }}
</div>
<div class="mt-1">
{{ Form::text('description', $subjectType->description, ['class' => 'form-control']) }}
</div>
<div>
@if ($errors->any())
{{ $errors->first('description') }}
@endif
</div>
<div class="mt-3">
{{ Form::label('slug', 'URL') }}
</div>
<div class="mt-1">
{{ Form::text('slug', $subjectType->slug, ['class' => 'form-control']) }}
</div>
<div>
@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>
</div>
{{ Form::close() }}
</div>
</div>
@endauth
@endsection

41
resources/views/admin/catalog/direction/subject_type/index.blade.php
View File

@ -1,41 +0,0 @@
@extends('layouts.admin_layout')
@section('content')
<div class="container">
<h2>Тип предмета</h2>
<br>
<a href="{{ route('subject_types.create') }}" class="btn btn-primary">Создать тип предмет</a>
<br>
<br>
<table class="table">
<thead class="border-b-2 border-solid border-black text-left" style="text-align: left">
<tr>
<th scope="col">Позиция</th>
<th scope="col">Название</th>
<th scope="col">Описание</th>
<th scope="col">URL</th>
<th scope="col">действия</th>
<th scope="col"></th>
</tr>
</thead>
<tbody>
@foreach($subjectTypes as $subjectType)
<tr class="">
<td>{{ $subjectType->position }}</td>
<td><a href="{{ route('subject_types.show', $subjectType) }}">{{ $subjectType->name }}</a></td>
<td>{{ Str::words($subjectType->description, 10, '...') }}</td>
<td>{{ $subjectType->slug }}</td>
<td>
<a href="{{ route("subject_types.edit", $subjectType) }}"
class="btn btn-secondary">редактировать</a>
<a rel="nofollow" data-method="delete" data-confirm="Вы действительно хотите удалить?"
href="{{ route('subject_types.destroy', $subjectType) }}"
class="btn btn-danger">удалить</a>
</td>
</tr>
@endforeach
</tbody>
</table>
<br>
<br>
</div>
@endsection

19
resources/views/admin/catalog/direction/subject_type/show.blade.php
View File

@ -1,19 +0,0 @@
@extends('layouts.admin_layout')
@section('content')
@auth()
<div class="container mt-4">
<h2>Название</h2>
<p>{{ $type->name }}</p>
<h2>Описание</h2>
<p>{{ $type->description }}</p>
<h2>URL</h2>
<p>{{ $type->slug }}</p>
<h2>Позиция</h2>
<p>{{ $type->position }}</p>
<h2>Вступительные испытания</h2>
@foreach($type->entranceExaminations as $entranceExamination)
<p><a href="{{ route('entrance_examinations.show', $entranceExamination) }}">{{ $entranceExamination->name }}</a></p>
@endforeach
</div>
@endauth
@endsection

1
resources/views/layouts/admin_layout.blade.php
View File

@ -60,7 +60,6 @@
<li class="list-group-item"><a href="{{ route('education_forms.index') }}">Формы образования</a></li>
<li class="list-group-item"><a href="{{ route('examination_types.index') }}">Типы Экзаменов</a></li>
<li class="list-group-item"><a href="{{ route('subjects.index') }}">Предметы</a></li>
<li class="list-group-item"><a href="{{ route('subject_types.index') }}">Типы Предметов</a></li>
</ul>
</aside>
<main class="col-10">@yield('content')</main>

4
routes/admin.php
View File

@ -6,7 +6,6 @@ use App\Http\Controllers\admin\Catalog\Direction\EducationFormController;
use App\Http\Controllers\admin\Catalog\Direction\EducationLevelController;
use App\Http\Controllers\admin\Catalog\Direction\ExaminationTypeController;
use App\Http\Controllers\admin\Catalog\Direction\SubjectController;
use App\Http\Controllers\admin\Catalog\Direction\SubjectTypeController;
use App\Http\Controllers\admin\Catalog\DirectionController;
use App\Http\Controllers\admin\Catalog\EducationalInstitutionController;
use App\Http\Controllers\admin\Catalog\FacultyController;
@ -50,9 +49,6 @@ Route::middleware(['auth', 'verified'])->prefix('admin')->group(function () {
Route::resource('/subjects', SubjectController::class)
->scoped(['subject' => 'slug']);
Route::resource('/subject_types', SubjectTypeController::class)
->scoped(['subject_type' => 'slug']);
Route::resources([
'/documents' => DocumentController::class,
'/users' => UserController::class,

2
tests/Feature/admin/catalog/direction/EducationFormTest.php → tests/Feature/admin/catalog/EducationFormTest.php
View File

@ -1,6 +1,6 @@
<?php
namespace Tests\Feature\admin\catalog\direction;
namespace Tests\Feature\admin\catalog;
use App\Models\Department;
use App\Models\Direction;

2
tests/Feature/admin/catalog/direction/EducationLevelTest.php → tests/Feature/admin/catalog/EducationLevelTest.php
View File

@ -1,6 +1,6 @@
<?php
namespace Tests\Feature\admin\catalog\direction;
namespace Tests\Feature\admin\catalog;
use App\Models\Department;
use App\Models\Direction;

6
tests/Feature/admin/catalog/direction/ExaminationTypeTest.php
View File

@ -2,7 +2,13 @@
namespace Tests\Feature\admin\catalog\direction;
use App\Models\Department;
use App\Models\Direction;
use App\Models\EducationalInstitution;
use App\Models\EducationForm;
use App\Models\EducationLevel;
use App\Models\ExaminationType;
use App\Models\Faculty;
use App\Models\User;
use Tests\TestCase;

102
tests/Feature/admin/catalog/direction/SubjectTypeTest.php
View File

@ -1,102 +0,0 @@
<?php
namespace Tests\Feature\admin\catalog\direction;
use App\Models\Subject;
use App\Models\SubjectType;
use App\Models\User;
use Tests\TestCase;
class SubjectTypeTest extends TestCase
{
private User $user;
private SubjectType $type;
private array $data;
protected function setUp(): void
{
parent::setUp();
$this->type = SubjectType::factory()->create();
$this->data = SubjectType::factory()->make()->only([
'name',
'description',
'position',
'slug',
]);
$this->user = User::factory()->create([
'name' => 'admin',
'email' => 'test@example.com',
'password' => 123456
]);
}
public function testIndexSubjectTypesPage(): void
{
$response = $this->actingAs($this->user)
->withSession(['banned' => false])
->get(route('subject_types.index'));
$response->assertOk();
}
public function testCreateSubjectTypePage(): void
{
$response = $this->actingAs($this->user)
->withSession(['banned' => false])
->get(route('subject_types.create'));
$response->assertOk();
}
public function testStoreSubjectType(): void
{
$response = $this->actingAs($this->user)
->withSession(['banned' => false])
->post(route('subject_types.store', $this->data));
$response->assertRedirect(route('subject_types.index'));
$this->assertDatabaseHas('subject_types', $this->data);
}
public function testShowSubjectTypePage(): void
{
$response = $this->actingAs($this->user)
->withSession(['banned' => false])
->get(route('subject_types.show', $this->type));
$response->assertOk();
}
public function testEditSubjectTypePage(): void
{
$response = $this->actingAs($this->user)
->withSession(['banned' => false])
->get(route('subject_types.edit', $this->type));
$response->assertOk();
}
public function testUpdateSubjectType(): void
{
$response = $this->actingAs($this->user)
->withSession(['banned' => false])
->patch(route('subject_types.update', $this->type), $this->data);
$response->assertRedirect(route('subject_types.index'));
$this->assertDatabaseHas('subject_types', $this->data);
}
public function testDestroySubjectType(): void
{
$response = $this->actingAs($this->user)
->withSession(['banned' => false])
->delete(route('subject_types.destroy', $this->type));
$response->assertRedirect(route('subject_types.index'));
$this->assertDatabaseMissing('subject_types', $this->type->toArray());
}
}