mirror of
https://github.com/robonen/education-project.git
synced 2026-03-20 02:44:31 +00:00
Модуль Задания(fix some bugs)
This commit is contained in:
@@ -49,7 +49,7 @@ class TaskFileController extends Controller
|
|||||||
'extension' => $ext,
|
'extension' => $ext,
|
||||||
'task_id' => $taskId,
|
'task_id' => $taskId,
|
||||||
'url' => $path,
|
'url' => $path,
|
||||||
'user_id' => '2',
|
'user_id' => 2,
|
||||||
'review' => $review,
|
'review' => $review,
|
||||||
$file,
|
$file,
|
||||||
$request->name . $ext
|
$request->name . $ext
|
||||||
|
|||||||
@@ -59,21 +59,14 @@ class TeacherController extends Controller
|
|||||||
return response()->json(collect($classes)->unique(), 200);
|
return response()->json(collect($classes)->unique(), 200);
|
||||||
}
|
}
|
||||||
|
|
||||||
// public function getUncheckedTask(Teacher $teacher, SchoolClass $class) {
|
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']);
|
$temp = [];
|
||||||
// $answers = [];
|
$tasks = $teacher->tasks->where('class_id', '=', $class->id);
|
||||||
// $test = new Task();
|
foreach ($tasks as $task) {
|
||||||
// foreach ($studentsId as $studentId) {
|
$answers = Task::find($task->id)->answers->where('checked', '=', false);
|
||||||
// foreach ($tasksId as $taskId) {
|
array_push($temp, $answers);
|
||||||
//
|
}
|
||||||
// AnswerToTask::where([
|
return response()->json($temp, 200);
|
||||||
// ['task_id', '=', $taskId->id],
|
}
|
||||||
// ['student_id', '=', $studentId->id],
|
|
||||||
// ['checked', '=', 0]
|
|
||||||
// ])->get();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// return $answers;
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,15 +19,15 @@ class Task extends Model
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function class() {
|
public function class() {
|
||||||
$this->belongsTo(SchoolClass::class);
|
return $this->belongsTo(SchoolClass::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tasks() {
|
public function tasks() {
|
||||||
$this->hasMany(Task::class);
|
return $this->hasMany(Task::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function answers() {
|
public function answers() {
|
||||||
$this->hasMany(AnswerToTask::class);
|
return $this->hasMany(AnswerToTask::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class CreateTaskFilesTable extends Migration
|
|||||||
|
|
||||||
$table->foreign('task_id')->references('id')->on('tasks')
|
$table->foreign('task_id')->references('id')->on('tasks')
|
||||||
->onDelete('cascade');
|
->onDelete('cascade');
|
||||||
$table->foreign('user_id')->references('id')->on('tasks')
|
$table->foreign('user_id')->references('id')->on('users')
|
||||||
->onDelete('cascade');
|
->onDelete('cascade');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user