1
0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00

Merge branch 'task' into timetable

# Conflicts:
#	app/Http/Controllers/Users/StudentController.php
#	app/Models/Teacher.php
#	composer.lock
#	routes/api.php
This commit is contained in:
ashen-1-dev
2020-12-16 20:43:13 +07:00
24 changed files with 562 additions and 56 deletions

View File

@@ -3,6 +3,10 @@
namespace App\Http\Controllers\Users;
use App\Http\Controllers\Controller;
use App\Models\AnswerToTask;
use App\Models\SchoolClass;
use App\Models\Student;
use App\Models\Task;
use App\Models\Teacher;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -73,4 +77,15 @@ class TeacherController extends Controller
}
return response()->json(collect($classes)->unique(), 200);
}
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);
}
}