Merge branch 'task' into journal

# Conflicts:
#	app/Http/Controllers/Users/StudentController.php
#	app/Models/SchoolClass.php
#	app/Models/Teacher.php
#	composer.json
#	composer.lock
#	database/migrations/2020_12_03_104028_create_bank_task_files_table.php
#	routes/api.php

app/Http/Controllers/Users/StudentController.php

@@ -31,6 +31,18 @@ class StudentController extends Controller
         return response()->json($student, 200);
     }
 
+    /**
+     * Создание ученика
+     *
+     * @param StudentRequest $request
+     * @return JsonResponse
+     */
+    /*public function store(StudentRequest $request)
+    {
+        $student = Student::creat($request->all());
+        return response()->json($student, 200);
+    }*/
+
     /**
      * Обновление ученика
      *
@@ -54,11 +66,7 @@ class StudentController extends Controller
         return response()->json(collect($student)->except('school_class'), 200);
     }
 
-    public function destroy(Student $student)
-    {
-        $user = $student->user;
-        $user->delete();
-        return response()->json(null, 204);
+    public function getAnswers(Student $student) {
+        return AnswerToTask::where('student_id', '=', $student->id)->get();
     }
-
 }

app/Http/Controllers/Users/TeacherController.php

@@ -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;
@@ -89,4 +93,15 @@ class TeacherController extends Controller
 
         return response()->json($classes->unique()->values(), 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);
+    }
 }