From c269765c39fe9b248200045b46012cb3a503b50f Mon Sep 17 00:00:00 2001
From: "m.zargarov" <m.zargarov@framework.team>
Date: Mon, 13 May 2024 16:44:00 +0400
Subject: [PATCH] changed views

---
 app/Http/Controllers/ScoreController.php      | 10 +++++++
 app/Services/ScoreService.php                 | 30 +++++++++++++++++++
 .../views/grade-lesson/grades-list.blade.php  | 22 --------------
 resources/views/grade-lesson/show.blade.php   |  1 +
 resources/views/grades/index.blade.php        | 10 +++----
 resources/views/includes/footer.blade.php     |  1 -
 resources/views/includes/header.blade.php     |  1 -
 routes/web.php                                |  2 +-
 8 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 app/Http/Controllers/ScoreController.php
 create mode 100644 app/Services/ScoreService.php
 delete mode 100644 resources/views/grade-lesson/grades-list.blade.php

diff --git a/app/Http/Controllers/ScoreController.php b/app/Http/Controllers/ScoreController.php
new file mode 100644
index 0000000..d4fd3f4
--- /dev/null
+++ b/app/Http/Controllers/ScoreController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class ScoreController extends Controller
+{
+    //
+}
diff --git a/app/Services/ScoreService.php b/app/Services/ScoreService.php
new file mode 100644
index 0000000..f0119f3
--- /dev/null
+++ b/app/Services/ScoreService.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\Lesson;
+use Illuminate\Database\Eloquent\Model;
+
+class ScoreService implements ServiceInterface
+{
+
+    public function getAll(?Lesson $lesson = null)
+    {
+        return $lesson->grade->students;
+    }
+
+    public function create(array $data): Model
+    {
+
+    }
+
+    public function update(Model $model, array $data): Model
+    {
+        // TODO: Implement update() method.
+    }
+
+    public function delete(Model $model)
+    {
+        // TODO: Implement delete() method.
+    }
+}
diff --git a/resources/views/grade-lesson/grades-list.blade.php b/resources/views/grade-lesson/grades-list.blade.php
deleted file mode 100644
index 3c59b88..0000000
--- a/resources/views/grade-lesson/grades-list.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-    <div class="container col-md-4">
-        <div class="row justify-content-center">
-            <div class="card mt-4">
-                <div class="card-header">{{__('Классы')}}</div>
-                <div class="card-body">
-                    @if (count($grades))
-                        <div class="list-group">
-                            @foreach ($grades as $grade)
-                                <a href="{{ route('grades.lessons.index', $grade) }}" class="list-group-item list-group-item-action d-flex justify-content-center">{{ $grade->name }}</a>
-                            @endforeach
-                        </div>
-                    @else
-                        <p>Классы отсутствуют</p>
-                    @endif
-                </div>
-            </div>
-        </div>
-    </div>
-@endsection
diff --git a/resources/views/grade-lesson/show.blade.php b/resources/views/grade-lesson/show.blade.php
index 55a6306..722d92c 100644
--- a/resources/views/grade-lesson/show.blade.php
+++ b/resources/views/grade-lesson/show.blade.php
@@ -20,6 +20,7 @@
                     </div>
                 </div>
                 <div class="card-footer">
+                    <a href="{{ route('lessons.students.index', $lesson) }}" class="btn btn-success">Оценки</a>
                     <a href="{{ route('grades.lessons.edit', [$grade, $lesson]) }}" class="btn btn-primary">Редактировать</a>
                 </div>
             </div>
diff --git a/resources/views/grades/index.blade.php b/resources/views/grades/index.blade.php
index a2dffb7..8cfb03a 100644
--- a/resources/views/grades/index.blade.php
+++ b/resources/views/grades/index.blade.php
@@ -36,16 +36,16 @@
                                                class="btn btn-block col-8">{{ $grade->name }}</a>
                                         </div>
                                     </td>
+                                    <td>
+                                        <div>
+                                            <a href="{{ route('grades.lessons.index', $grade) }}" class="btn btn-primary">Занятия</a>
+                                        </div>
+                                    </td>
                                     <td>
                                         <div>
                                             <a href="{{ route('grades.edit', $grade) }}" class="btn btn-warning">Редактировать</a>
                                         </div>
                                     </td>
-{{--                                    <td>--}}
-{{--                                        <div>--}}
-{{--                                            <a href="{{ route('journals.index', $grade) }}" class="btn btn-primary">Журнал</a>--}}
-{{--                                        </div>--}}
-{{--                                    </td>--}}
                                     <td>
                                         <form action="{{ route('grades.destroy', $grade) }}" method="POST"
                                               style="display: inline-block;">
diff --git a/resources/views/includes/footer.blade.php b/resources/views/includes/footer.blade.php
index 016be12..780e7f8 100644
--- a/resources/views/includes/footer.blade.php
+++ b/resources/views/includes/footer.blade.php
@@ -3,7 +3,6 @@
         <ul class="nav justify-content-center pb-3 mb-3">
             <li class="nav-item"><a href="{{ route('grades.index') }}" class="nav-link px-2 text-muted">Классы</a></li>
             <li class="nav-item"><a href="{{ route('subjects.index') }}" class="nav-link px-2 text-muted">Предметы</a></li>
-            <li class="nav-item"><a href="{{ route('grades.lessons.grades-list') }}" class="nav-link px-2 text-muted">Занятия</a></li>
             <li class="nav-item"><a href="{{ route('students.index') }}" class="nav-link px-2 text-muted">Студенты</a></li>
             <li class="nav-item"><a href="{{ route('teachers.index') }}" class="nav-link px-2 text-muted">Учителя</a></li>
         </ul>
diff --git a/resources/views/includes/header.blade.php b/resources/views/includes/header.blade.php
index 31e0472..38aa664 100644
--- a/resources/views/includes/header.blade.php
+++ b/resources/views/includes/header.blade.php
@@ -3,7 +3,6 @@
         <ul class="nav nav-pills">
             <li class="nav-item"><a href="{{ route('grades.index') }}" class="nav-link @if(request()->is('grades*')) active @endif" aria-current="page">Классы</a></li>
             <li class="nav-item"><a href="{{ route('subjects.index') }}" class="nav-link @if(request()->is('subjects*')) active @endif">Предметы</a>
-            <li class="nav-item"><a href="{{ route('grades.lessons.grades-list') }}" class="nav-link @if(request()->is('grades/{grade}/lessons*')) active @endif">Занятия</a></li>
             <li class="nav-item"><a href="{{ route('students.index') }}" class="nav-link @if(request()->is('students*')) active @endif">Ученики</a></li>
             <li class="nav-item"><a href="{{ route('teachers.index') }}" class="nav-link @if(request()->is('teachers*')) active @endif">Учителя</a></li>
         </ul>
diff --git a/routes/web.php b/routes/web.php
index fd37d1c..c426a20 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -25,4 +25,4 @@ Route::resources([
 Route::resource('teachers.subjects', SubjectTeacherController::class)->except('index');
 Route::resource('teachers.subjects.grades', GradeTeacherController::class)->except('index', 'show');
 Route::resource('grades.subjects', GradeSubjectController::class)->except('index', 'show');
-Route::get('lessons/grade-list', [LessonController::class, 'gradeList'])->name('grades.lessons.grades-list');
+Route::resource('lessons.students', ScoreController::class)->except('show');