klllst/CourseWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prod #7

Merged
klllst merged 40 commits from feature/task-7 into master 2024-06-16 12:25:52 +04:00
Conversation 0 Commits 40 Files Changed 167 +219 -5
15 changed files with 219 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 622b359e1f - Show all commits

1
app/Http/Controllers/GradeController.php
View File

@ -48,6 +48,7 @@ class GradeController extends Controller
{
return view('grades.show', [
'grade' => $grade,
'subjects' => $grade->subjects,
]);
}

51
app/Http/Controllers/GradeSubjectController.php Normal file
View File

@ -0,0 +1,51 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\GradeSubjectPostRequest;
use App\Models\Grade;
use App\Models\Subject;
use App\Services\ServiceInterface;
use Illuminate\Http\RedirectResponse;
use Illuminate\View\View;
class GradeSubjectController extends Controller
{
public function __construct(
protected ServiceInterface $service,
) {
}
public function create(Grade $grade): View
{
return view('grade-subject.create', [
'grade' => $grade,
'subjects' => $this->service->getAllSubjects(),
]);
}
public function store(GradeSubjectPostRequest $request, Grade $grade): RedirectResponse
{
return redirect()->route('grades.show', $this->service->create($request->validated(), $grade));
}
public function edit(Grade $grade, Subject $subject): View
{
return view('grade-subject.edit', [
'grade' => $grade,
'updateSubject' => $subject,
'subjects' => $this->service->getAllSubjects(),
]);
}
public function update(GradeSubjectPostRequest $request, Grade $grade, Subject $subject): RedirectResponse
{
return redirect()->route('grades.show',
$this->service->update($grade, $request->validated(), $subject));
}
public function destroy(Grade $grade, Subject $subject): RedirectResponse
{
return redirect()->route('grades.show', $this->service->delete($grade, $subject));
}
}

28
app/Http/Requests/GradeSubjectPostRequest.php Normal file
View File

@ -0,0 +1,28 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class GradeSubjectPostRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'subject_id' => 'required|exists:subjects,id',
];
}
}

8
app/Providers/ModelServiceProvider.php
View File

@ -3,11 +3,13 @@
namespace App\Providers;
use App\Http\Controllers\GradeController;
use App\Http\Controllers\GradeSubjectController;
use App\Http\Controllers\StudentController;
use App\Http\Controllers\SubjectController;
use App\Http\Controllers\SubjectTeacherController;
use App\Http\Controllers\TeacherController;
use App\Services\GradeService;
use App\Services\GradeSubjectService;
use App\Services\ServiceInterface;
use App\Services\StudentService;
use App\Services\SubjectService;
@ -51,6 +53,12 @@ class ModelServiceProvider extends ServiceProvider
->give(function () {
return new SubjectTeacherService();
});
$this->app->when(GradeSubjectController::class)
->needs(ServiceInterface::class)
->give(function () {
return new GradeSubjectService();
});
}
/**

44
app/Services/GradeSubjectService.php Normal file
View File

@ -0,0 +1,44 @@
<?php
namespace App\Services;
use App\Models\Grade;
use App\Models\Subject;
use App\Models\Teacher;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
class GradeSubjectService implements ServiceInterface
{
public function getAll(?Grade $grade = null): Collection
{
return $grade->subjects;
}
public function getAllSubjects(): Collection
{
return Subject::all();
}
public function create(array $data, ?Model $model = null): Grade
{
$model->subjects()->syncWithoutDetaching($data['subject_id']);
return $model;
}
public function update(Model $model, array $data, ?Model $subject = null): Grade
{
$model->subjects()->detach($subject->id);
$model->subjects()->attach($data['subject_id']);
return $model;
}
public function delete(Model $model, ?Model $subject = null): Grade
{
$model->subjects()->detach($subject);
return $model;
}
}

5
resources/views/grade-subject/create.blade.php Normal file
View File

@ -0,0 +1,5 @@
@extends('layouts.app')
@section('content')
@include('grade-subject.form', ['route' => route('grades.subjects.store', $grade), 'method' => 'POST'])
@endsection

8
resources/views/grade-subject/edit.blade.php Normal file
View File

@ -0,0 +1,8 @@
@extends('layouts.app')
@section('content')
@include('grade-subject.form', [
'route' => route('grades.subjects.update',
['grade' => $grade, 'subject' => $updateSubject]
), 'method' => 'PUT'])
@endsection

24
resources/views/grade-subject/form.blade.php Normal file
View File

@ -0,0 +1,24 @@
<div class="container col-md-6">
<div class="row justify-content-center">
<div class="card mt-4">
<div class="card-body">
<form action="{{ $route }}" method="POST">
@csrf
@method($method)
<div class="mb-3">
<label for="subject_id" class="form-label">Предмет:</label>
<select id="subject_id" name="subject_id" class="form-select" required>
<option value="">Выберите предмет</option>
@foreach($subjects as $subject)
<option value="{{ $subject->id }}" {{ isset($updateSubject) && $updateSubject->id == $subject->id ? 'selected' : '' }}>
{{ $subject->name }}
</option>
@endforeach
</select>
</div>
<button type="submit" class="btn btn-success">Подтвердить</button>
</form>
</div>
</div>
</div>
</div>

2
resources/views/grades/index.blade.php
View File

@ -62,7 +62,7 @@
<p>Классы отсутствуют</p>
@endif
</div>
<div class="card-body">
<div class="card-footer">
<a href="{{ route('grades.create') }}" class="btn btn-success">Добавить</a>
</div>
<div class="card-footer">{{ $grades->links() }}</div>

43
resources/views/grades/show.blade.php
View File

@ -14,6 +14,49 @@
<a href="{{ route('grades.edit', $grade) }}" class="btn btn-primary">Редактировать</a>
</div>
</div>
<div class="card mt-4">
<div class="card-header">
{{__('Журнал предметов')}}
</div>
<div class="card-body">
@if(count($subjects))
<table class="table table-striped">
<thead>
<th>Название</th>
<th>&nbsp;</th>
</thead>
<tbody>
@foreach ($subjects as $subject)
<tr>
<td class="table-text">
<div>
{{ $subject->name }}
</div>
</td>
<td>
<div>
<a href="{{ route('grades.subjects.edit', [$grade, $subject]) }}" class="btn btn-warning">Редактировать</a>
</div>
</td>
<td>
<form action="{{ route('grades.subjects.destroy', [$grade, $subject]) }}" method="POST" style="display: inline-block;">
@csrf
@method('DELETE')
<button type="submit" class="btn btn-danger">Удалить</button>
</form>
</td>
</tr>
@endforeach
</tbody>
</table>
@else
<p>У класса отсутствуют предметы</p>
@endif
</div>
<div class="card-footer">
<a href="{{ route('grades.subjects.create', $grade) }}" class="btn btn-success">Добавить</a>
</div>
</div>
</div>
</div>
@endsection

2
resources/views/students/index.blade.php
View File

@ -54,7 +54,7 @@
<p>Ученики остутствуют</p>
@endif
</div>
<div class="card-body">
<div class="card-footer">
<a href="{{ route('students.create') }}" class="btn btn-success">Добавить</a>
</div>
<div class="card-footer">{{ $students->links() }}</div>

2
resources/views/subjects/index.blade.php
View File

@ -54,7 +54,7 @@
<p>Предметы отсутствуют</p>
@endif
</div>
<div class="card-body">
<div class="card-footer">
<a href="{{ route('subjects.create') }}" class="btn btn-success">Добавить</a>
</div>
<div class="card-footer">{{ $subjects->links() }}</div>

2
resources/views/teachers/index.blade.php
View File

@ -54,7 +54,7 @@
<p>Учителя отсутствуют</p>
@endif
</div>
<div class="card-body">
<div class="card-footer">
<a href="{{ route('teachers.create') }}" class="btn btn-success">Добавить</a>
</div>
<div class="card-footer">{{ $teachers->links() }}</div>

2
resources/views/teachers/show.blade.php
View File

@ -58,7 +58,7 @@
<p>У учителя отсутствуют предметы</p>
@endif
</div>
<div class="card-body">
<div class="card-footer">
<a href="{{ route('teachers.subjects.create', $teacher) }}" class="btn btn-success">Добавить</a>
</div>
</div>

2
routes/web.php
View File

@ -1,6 +1,7 @@
<?php
use App\Http\Controllers\GradeController;
use App\Http\Controllers\GradeSubjectController;
use App\Http\Controllers\StudentController;
use App\Http\Controllers\SubjectController;
use App\Http\Controllers\SubjectTeacherController;
@ -19,3 +20,4 @@ Route::resources([
]);
Route::resource('teachers.subjects', SubjectTeacherController::class)->except('index', 'show');
Route::resource('grades.subjects', GradeSubjectController::class)->except('index', 'show');