From d6778d145514ea4c8ec49e778ed8a132af3e65de Mon Sep 17 00:00:00 2001 From: "m.zargarov" Date: Wed, 8 May 2024 13:34:54 +0400 Subject: [PATCH] added routes desciption to Lesson --- app/Enums/TypeLesson.php | 2 +- app/Http/Controllers/LessonController.php | 6 +++++- app/Models/Lesson.php | 7 ++++--- .../migrations/2024_05_07_123620_create_lessons_table.php | 1 + routes/web.php | 2 ++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/Enums/TypeLesson.php b/app/Enums/TypeLesson.php index ebbbe42..545bcb6 100644 --- a/app/Enums/TypeLesson.php +++ b/app/Enums/TypeLesson.php @@ -4,7 +4,7 @@ namespace App\Enums; enum TypeLesson: string { - case Homework = "Домашнее задание"; + case Homework = "Домашняя работа"; case Classwork = "Работа в классе"; case TestClass = "Самостоятельная работа"; case ExamClass = "Контрольная работа"; diff --git a/app/Http/Controllers/LessonController.php b/app/Http/Controllers/LessonController.php index 665d07d..e0ca795 100644 --- a/app/Http/Controllers/LessonController.php +++ b/app/Http/Controllers/LessonController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Enums\TypeLesson; use App\Http\Requests\LessonPostRequest; use App\Models\Lesson; use App\Services\ServiceInterface; @@ -31,7 +32,9 @@ class LessonController extends Controller */ public function create(): View { - return view('lessons.create'); + return view('lessons.create', [ + 'types' => TypeLesson::cases(), + ]); } /** @@ -62,6 +65,7 @@ class LessonController extends Controller { return view('lessons.edit', [ 'lesson' => $lesson, + 'types' => TypeLesson::cases(), ]); } diff --git a/app/Models/Lesson.php b/app/Models/Lesson.php index 045cc87..a1061b9 100644 --- a/app/Models/Lesson.php +++ b/app/Models/Lesson.php @@ -14,6 +14,7 @@ class Lesson extends Model protected $fillable = [ 'name', 'type', + 'description', 'lesson_date', 'grade_id', 'teacher_id', @@ -25,17 +26,17 @@ class Lesson extends Model return $this->hasMany(Score::class); } - public function grades(): BelongsTo + public function grade(): BelongsTo { return $this->belongsTo(Grade::class); } - public function teachers(): BelongsTo + public function teacher(): BelongsTo { return $this->belongsTo(Teacher::class); } - public function subjects(): BelongsTo + public function subject(): BelongsTo { return $this->belongsTo(Subject::class); } diff --git a/database/migrations/2024_05_07_123620_create_lessons_table.php b/database/migrations/2024_05_07_123620_create_lessons_table.php index 62797e7..d281de2 100644 --- a/database/migrations/2024_05_07_123620_create_lessons_table.php +++ b/database/migrations/2024_05_07_123620_create_lessons_table.php @@ -14,6 +14,7 @@ return new class extends Migration Schema::create('lessons', function (Blueprint $table) { $table->id(); $table->string('name'); + $table->string('description')->nullable(); $table->string('type'); $table->date('lesson_date'); $table->foreignId('grade_id')->constrained('grades')->onDelete('cascade'); diff --git a/routes/web.php b/routes/web.php index 59933d2..a8c97ba 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,6 +3,7 @@ use App\Http\Controllers\GradeController; use App\Http\Controllers\GradeSubjectController; use App\Http\Controllers\GradeTeacherController; +use App\Http\Controllers\LessonController; use App\Http\Controllers\StudentController; use App\Http\Controllers\SubjectController; use App\Http\Controllers\SubjectTeacherController; @@ -18,6 +19,7 @@ Route::resources([ 'subjects' => SubjectController::class, 'students' => StudentController::class, 'teachers' => TeacherController::class, + 'lessons' => LessonController::class, ]); Route::resource('teachers.subjects', SubjectTeacherController::class)->except('index');