diff --git a/app/Http/Controllers/TaskFileController.php b/app/Http/Controllers/TaskFileController.php index 565533f..642efe6 100644 --- a/app/Http/Controllers/TaskFileController.php +++ b/app/Http/Controllers/TaskFileController.php @@ -49,7 +49,7 @@ class TaskFileController extends Controller 'extension' => $ext, 'task_id' => $taskId, 'url' => $path, - 'user_id' => '2', + 'user_id' => 2, 'review' => $review, $file, $request->name . $ext diff --git a/app/Http/Controllers/Users/TeacherController.php b/app/Http/Controllers/Users/TeacherController.php index 389f57d..ceac3ae 100644 --- a/app/Http/Controllers/Users/TeacherController.php +++ b/app/Http/Controllers/Users/TeacherController.php @@ -59,21 +59,14 @@ class TeacherController extends Controller return response()->json(collect($classes)->unique(), 200); } -// public function getUncheckedTask(Teacher $teacher, SchoolClass $class) { -// $studentsId = Student::where('class_id', '=', $class->id)->get(['id']); -// $tasksId = Task::where('teacher_id', '=', $teacher->id)->get(['id']); -// $answers = []; -// $test = new Task(); -// foreach ($studentsId as $studentId) { -// foreach ($tasksId as $taskId) { -// -// AnswerToTask::where([ -// ['task_id', '=', $taskId->id], -// ['student_id', '=', $studentId->id], -// ['checked', '=', 0] -// ])->get(); -// } -// } -// return $answers; -// } + public function getUncheckedTask(Teacher $teacher, SchoolClass $class) { + + $temp = []; + $tasks = $teacher->tasks->where('class_id', '=', $class->id); + foreach ($tasks as $task) { + $answers = Task::find($task->id)->answers->where('checked', '=', false); + array_push($temp, $answers); + } + return response()->json($temp, 200); + } } diff --git a/app/Models/Task.php b/app/Models/Task.php index 225de74..2704c68 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -19,15 +19,15 @@ class Task extends Model } public function class() { - $this->belongsTo(SchoolClass::class); + return $this->belongsTo(SchoolClass::class); } public function tasks() { - $this->hasMany(Task::class); + return $this->hasMany(Task::class); } public function answers() { - $this->hasMany(AnswerToTask::class); + return $this->hasMany(AnswerToTask::class); } } diff --git a/database/migrations/2020_12_08_122859_create_task_files_table.php b/database/migrations/2020_12_08_122859_create_task_files_table.php index 74906af..5ff4916 100644 --- a/database/migrations/2020_12_08_122859_create_task_files_table.php +++ b/database/migrations/2020_12_08_122859_create_task_files_table.php @@ -25,7 +25,7 @@ class CreateTaskFilesTable extends Migration $table->foreign('task_id')->references('id')->on('tasks') ->onDelete('cascade'); - $table->foreign('user_id')->references('id')->on('tasks') + $table->foreign('user_id')->references('id')->on('users') ->onDelete('cascade'); }); }