общий код

2026-03-20 02:44:31 +00:00 · 2020-12-03 23:33:04 +07:00
parent 54732a9f6a
commit 4a8e802c03
44 changed files with 880 additions and 277 deletions
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -1,9 +1,9 @@
 <?php

-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Auth;

+use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\LoginRequest;
-use Illuminate\Http\Request;

 class LoginController extends Controller
 {
--- a/app/Http/Controllers/Auth/LogoutController.php
+++ b/app/Http/Controllers/Auth/LogoutController.php
@@ -1,7 +1,8 @@
 <?php

-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Auth;

+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;

 class LogoutController extends Controller
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -1,7 +1,8 @@
 <?php

-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Auth;

+use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\RegisterRequest;

 use App\Models\HeadTeacher;
--- a/app/Http/Controllers/BankTaskController.php
+++ b/app/Http/Controllers/BankTaskController.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\BankTaskRequest;
+use App\Models\BankTask;
+use App\Models\Subject;
+use App\Models\Teacher;
+use App\Models\Theme;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Models\BankTaskFile;
+use Illuminate\Support\Facades\DB;
+
+class BankTaskController extends Controller
+{
+    /**
+     * Получение списка всех заданий из банка заданий
+     *
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function index(Request $request, BankTask $tasks)
+    {
+        $count = 10;
+        $tasks = $tasks->newQuery();
+
+        if ($request->has('name')) {
+            $tasks->where('name', 'like', $request->input('name').'%');
+        }
+        if ($request->has('subject_id')) {
+            $tasks->where('subject_id', $request->input('subject_id'));
+        }
+        if ($request->has('theme_id')) {
+            $tasks->where('theme_id', $request->input('theme_id'));
+        }
+
+        if ($request->has('author')) {
+            $tasks->where('author', 'like', $request->input('author').'%');
+        }
+
+        if ($request->has('count')) {
+            $temp = (int)$request->count;
+            if ($temp>0 && $temp<= 100) {
+                $count = $temp;
+            }
+        }
+
+        return response()->json($tasks->orderByDesc('updated_at')->paginate($count), 200);
+    }
+
+    /**
+     * Получение задания
+     *
+     * @param BankTask $banktask
+     * @return JsonResponse
+     */
+    public function show(BankTask $banktask)
+    {
+
+        return response()->json([
+            'task' => $banktask,
+            'files' => BankTaskFile::where('banktask_id', '=', $banktask->id )->get(['id','name', 'type', 'url'])
+        ], 200);
+
+    }
+
+    /**
+     * Создание задания
+     *
+     * @param BankTaskRequest $request
+     * @return JsonResponse
+     */
+    public function store(BankTaskRequest $request)
+    {
+        if (!Subject::find((int)$request->input('subject_id')) ) {
+            return response()->json('Not exist subject', 404);
+        }
+        $banktask = BankTask::create($request->all()); //добавить auth()->user() после добавления регистрации
+        return response()->json($banktask, 200);
+    }
+
+    /**
+     * Обновление задания
+     *
+     * @param Request $request
+     * @param BankTask $banktask
+     * @return JsonResponse
+     */
+    public function update(BankTask $banktask, Request $request)
+    {
+        $request->validate([
+            'theme_id' => 'nullable|integer|gt:0',
+            'subject_id' => 'integer|gt:0',
+        ]);
+        if ($request->has('subject_id') && !Subject::find((int)$request->input('subject_id'))) {
+            return response()->json('Not exist subject', 404);
+        }
+        $banktask->update($request->all());
+        return response()->json($banktask, 200);
+    }
+
+    /**
+     * Удаление задания
+     *
+     * @param BankTask $banktask
+     * @return JsonResponse
+     * @throws \Exception
+     */
+    public function delete(BankTask $banktask)
+    {
+        $banktask->delete();
+        return response()->json('', 204);
+    }
+
+}
--- a/app/Http/Controllers/BankTaskFileController.php
+++ b/app/Http/Controllers/BankTaskFileController.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\BankTask;
+use http\Env\Response;
+use Illuminate\Http\Request;
+use App\Models\BankTaskFile;
+use Illuminate\Support\Facades\Storage;
+
+
+class BankTaskFileController extends Controller
+{
+    private $image_ext = ['jpg', 'jpeg', 'png', 'gif'];
+    private $file_ext = ['doc', 'docx', 'pdf', 'odt', 'mp3', 'ogg', 'mpga', 'mp4', 'mpeg', 'ppt', 'pptx'];
+
+    public function store(BankTask $banktask, Request $request)
+    {
+        $banktaskId = $banktask->id;
+        $max_size = (int)ini_get('upload_max_filesize') * 1000;
+        $all_ext = implode(',', $this->allExtensions());
+
+        $this->validate($request, [
+            'name' => 'required',
+            'file' => 'required|file|mimes:' . $all_ext . '|max:' . $max_size
+        ]);
+
+        $file = $request->file('file');
+        $ext = $file->getClientOriginalExtension();
+        $type = $this->getType($ext);
+
+        if (Storage::putFileAs('public/banktask/' . $banktaskId . '/' . $type . '/', $file, $request->name)) {
+            BankTaskFile::create([
+                'name' => $request->name,
+                'type' => $type,
+                'extension' => $ext,
+                'banktask_id' => $banktaskId,
+                'url' => '/storage/banktask' . '/' . $banktaskId . '/' . $type . '/' . $request->name, $file, $request->name . $ext
+            ]);
+            return true;
+        }
+        return false;
+    }
+
+    public function showFiles(BankTask $banktask)
+    {
+
+        $banktaskId = $banktask->id;
+        $files = BankTaskFile::where('task_id', '=', $banktaskId)->get();
+
+        return response()->json($files, 200);
+
+    }
+
+    public function download(BankTaskFile $file)
+    {
+        return Storage::download('/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name);
+    }
+
+    public function update(BankTaskFile $file, Request $request)
+    {
+
+        $request->validate([
+            'name' => 'required'
+        ]);
+        $old_filename = '/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name;
+        $new_filename = '/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $request->name;
+
+        if (Storage::disk('local')->exists($old_filename)) {
+            if (Storage::disk('local')->move($old_filename, $new_filename)) {
+                $file->name = $request->name;
+                $file->url = '/storage/banktask/' . $file->banktask_id . '/' . $request->type . '/' . $file->name;
+                return response()->json([$file->save(), $file]);
+            }
+        }
+
+        return response()->json(false, 404);
+    }
+
+    public function delete(BankTaskFile $file) {
+        echo $file;
+        if (Storage::disk('local')->exists('/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name )) {
+            if (Storage::disk('local')->delete('/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name)) {
+                return response()->json($file->delete());
+            }
+        }
+        return response()->json(['BankTaskFile not found'], 404);
+    }
+
+
+    private function getType($ext)
+    {
+        if (in_array(strtolower($ext), $this->image_ext)) {
+            return 'image';
+        }
+
+        if (in_array(strtolower($ext), $this->file_ext)) {
+            return 'file';
+        }
+    }
+
+    private function allExtensions()
+    {
+        return array_merge($this->image_ext, $this->file_ext);
+    }
+
+
+
+}
--- a/app/Http/Controllers/SchoolClassController.php
+++ b/app/Http/Controllers/SchoolClassController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers;
 use App\Http\Requests\SchoolClassRequest;
 use App\Models\SchoolClass;
 use App\Models\Teacher;
-use Illuminate\Http\JsonResponse;
+use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;

 class SchoolClassController extends Controller
@@ -13,63 +13,50 @@ class SchoolClassController extends Controller
    /**
     * Получение списка всех классов
     *
-     * @return JsonResponse
     */
    public function index()
    {
        return response()->json(SchoolClass::all(), 200);
    }

-    /**
-     * Получение класса
-     *
-     * @param SchoolClass $class
-     * @return JsonResponse
-     */
-    public function show(SchoolClass $class)
+    public function show(SchoolClass $schoolClass)
    {
-        return response()->json($class, 200);
+        return response()->json($schoolClass, 200);
    }

-    /**
-     * @param SchoolClassRequest $request
-     * @return JsonResponse
-     */
    public function store(SchoolClassRequest $request)
    {
-        $teacher = Teacher::find($request->get('teacher_id'));
-        if ($teacher) {
-            $schoolClass = $teacher->schoolClass()->create($request->all());
-        } else {
-            $schoolClass = SchoolClass::create($request->all());
+        try {
+            $class = SchoolClass::create($request->all());
+        } catch (QueryException $e) {
+            return response()->json(['message' => 'Уже существует'], 400);
        }
-        return response()->json(SchoolClass::find($schoolClass->id), 201);
+        return response()->json(SchoolClass::find($class->id), 201);
    }

-    /**
-     * Обновление класса
-     *
-     * @param SchoolClassRequest $request
-     * @param SchoolClass $class
-     * @return JsonResponse
-     */
-    public function update(SchoolClassRequest $request, SchoolClass $class)
+    public function update(SchoolClass $class, SchoolClassRequest $request)
    {
-        $class->update($request->all());
+        try {
+            $class->update($request->all());
+        } catch (QueryException $e) {
+            return response()->json(['message' => 'Уже существует'], 400);
+        }
        return response()->json($class, 200);
    }

-
-    /**
-     * Удаление класса
-     *
-     * @param SchoolClass $class
-     * @return JsonResponse
-     * @throws \Exception
-     */
-    public function delete(SchoolClass $class)
+    public function destroy(SchoolClass $class)
    {
        $class->delete();
-        return response()->json('ok', 200);
+        return response()->json('', 204);
    }
+
+    //добавление, изменение классного руководителя
+    public function addClassroomTeacher(SchoolClass $class, Request $request)
+    {
+        $teacher = Teacher::findOrfail((int)$request->input('teacher_id'));
+        $class->classroom_teacher = $teacher->id;
+        $class->save();
+        return response()->json(SchoolClass::find($class->id), 200);
+    }
+
 }
--- a/app/Http/Controllers/StudentController.php
+++ b/app/Http/Controllers/StudentController.php
@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Http\Requests\StudentRequest;
-use App\Models\Student;
-use Illuminate\Http\JsonResponse;
-
-class StudentController extends Controller
-{
-    /**
-     * Получение списка всех учителей
-     *
-     * @param StudentRequest $request
-     * @return JsonResponse
-     */
-    public function index(StudentRequest $request)
-    {
-        return response()->json(Student::all(), 200);
-    }
-
-    /**
-     * Получение одного учителя
-     *
-     * @param Student $student
-     * @param StudentRequest $request
-     * @return JsonResponse
-     */
-    public function show(Student $student, StudentRequest $request)
-    {
-        return response()->json($student, 200);
-    }
-
-    /**
-     * Обновление учителя
-     *
-     * @param StudentRequest $request
-     * @param Student $student
-     * @return JsonResponse
-     */
-    public function update(StudentRequest $request, Student $student)
-    {
-        $student->update($request->all());
-        return response()->json($student, 200);
-    }
-}
--- a/app/Http/Controllers/SubjectController.php
+++ b/app/Http/Controllers/SubjectController.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Http\Controllers;
+
+
+use App\Http\Requests\SubjectRequest;
+use App\Models\Subject;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class SubjectController extends Controller
+{
+    /**
+     * Получение списка всех предметов
+     *
+     * @return JsonResponse
+     */
+    public function index()
+    {
+        return response()->json(Subject::all()->sortBy('name'), 200);
+    }
+
+    /**
+     * Получение предмета
+     *
+     * @param Subject $subject
+     * @return JsonResponse
+     */
+    public function show(Subject $subject)
+    {
+        return response()->json($subject, 200);
+    }
+
+    /**
+     * Создание предмета
+     *
+     * @param SubjectRequest $request
+     * @return JsonResponse
+     */
+    public function store(SubjectRequest $request)
+    {
+        $subject = Subject::create($request->all());
+        return response()->json($subject, 200);
+    }
+
+    /**
+     * Обновление предмета
+     *
+     * @param SubjectRequest $request
+     * @param Subject $subject
+     * @return JsonResponse
+     */
+    public function update(Subject $subject, SubjectRequest $request)
+    {
+        $subject->update($request->all());
+        return response()->json($subject, 200);
+    }
+
+    /**
+     * Удаление предмета
+     *
+     * @param Subject $subject
+     * @return JsonResponse
+     * @throws \Exception
+     */
+    public function destroy(Subject $subject)
+    {
+        $subject->delete();
+        return response()->json('', 204);
+
+    }
+}
+
--- a/app/Http/Controllers/ThemeController.php
+++ b/app/Http/Controllers/ThemeController.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Http\Controllers;
+
+
+use App\Http\Requests\ThemeRequest;
+use App\Models\Theme;
+use http\Env\Response;
+use Illuminate\Database\QueryException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ThemeController extends Controller
+{
+    /**
+     * Получение списка всех тем
+     *
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function index(Request $request)
+    {
+        return response()->json(Theme::all()->sortBy($request->input('sort_by')), 200);
+    }
+
+    /**
+     * Получение темы
+     *
+     * @param Theme $theme
+     * @return JsonResponse
+     */
+    public function show(Theme $theme)
+    {
+        return response()->json($theme, 200);
+    }
+
+    /**
+     * Создание темы
+     *
+     * @param ThemeRequest $request
+     * @return JsonResponse
+     */
+    public function store(ThemeRequest $request)
+    {
+        $theme = Theme::create($request->all());
+        return response()->json($theme, 200);
+    }
+
+    /**
+     * Обновление темы
+     *
+     * @param Request $request
+     * @param Theme $theme
+     * @return JsonResponse
+     */
+    public function update(Theme $theme, Request $request)
+    {
+        try {
+            $theme->update($request->all());
+        } catch (QueryException $e) {
+            return response()->json('Value can not null', 400);
+        }
+        return response()->json($theme, 200);
+    }
+
+    /**
+     * Удаление темы
+     *
+     * @param Theme $theme
+     * @return JsonResponse
+     * @throws \Exception
+     */
+    public function destroy(Theme $theme)
+    {
+        $theme->delete();
+        return response()->json('', 204);
+
+    }
+}
--- a/app/Http/Controllers/Users/HeadTeacherController.php
+++ b/app/Http/Controllers/Users/HeadTeacherController.php
@@ -1,19 +1,21 @@
 <?php

-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Users;

-use App\Http\Requests\HeadTeacherRequest;
+use App\Http\Controllers\Controller;
 use App\Models\HeadTeacher;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 class HeadTeacherController extends Controller
 {
    /**
     * Получение списка всех завучей
     *
+     * @param Request $request
     * @return JsonResponse
     */
-    public function index()
+    public function index(Request $request)
    {
        return response()->json(HeadTeacher::all(), 200);
    }
@@ -22,6 +24,7 @@ class HeadTeacherController extends Controller
     * Получение одного завуча
     *
     * @param HeadTeacher $headteacher
+     * @param Request $request
     * @return JsonResponse
     */
    public function show(HeadTeacher $headteacher)
@@ -32,11 +35,11 @@ class HeadTeacherController extends Controller
    /**
     * Обновление завуча
     *
-     * @param HeadTeacherRequest $request
+     * @param Request $request
     * @param HeadTeacher $headteacher
     * @return JsonResponse
     */
-    public function update(HeadTeacherRequest $request, HeadTeacher $headteacher)
+    public function update(Request $request, HeadTeacher $headteacher)
    {
        $headteacher->update($request->all());
        return response()->json($headteacher, 200);
--- a/app/Http/Controllers/Users/ParenttController.php
+++ b/app/Http/Controllers/Users/ParenttController.php
@@ -1,19 +1,21 @@
 <?php

-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Users;

-use App\Http\Requests\ParentRequest;
+use App\Http\Controllers\Controller;
 use App\Models\Parentt;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;

 class ParenttController extends Controller
 {
    /**
     * Получение списка всех учителей
     *
+     * @param Request $request
     * @return JsonResponse
     */
-    public function index()
+    public function index(Request $request)
    {
        return response()->json(Parentt::all(), 200);
    }
@@ -21,7 +23,8 @@ class ParenttController extends Controller
    /**
     * Получение одного учителя
     *
-     * @param Parentt $parent
+     * @param Parentt $student
+     * @param Request $request
     * @return JsonResponse
     */
    public function show(Parentt $parent)
@@ -32,11 +35,11 @@ class ParenttController extends Controller
    /**
     * Обновление учителя
     *
-     * @param ParentRequest $request
+     * @param Request $request
     * @param Parentt $parent
     * @return JsonResponse
     */
-    public function update(ParentRequest $request, Parentt $parent)
+    public function update(Request $request, Parentt $parent)
    {
        $parent->update($request->all());
        return response()->json($parent, 200);
--- a/app/Http/Controllers/Users/StudentController.php
+++ b/app/Http/Controllers/Users/StudentController.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Http\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\StudentRequest;
+use App\Models\SchoolClass;
+use App\Models\Student;
+use Illuminate\Http\JsonResponse;
+
+class StudentController extends Controller
+{
+    /**
+     * Получение списка всех учеников
+     *
+     * @return JsonResponse
+     */
+    public function index()
+    {
+        return response()->json(Student::all(), 200);
+    }
+
+    /**
+     * Получение одного ученика
+     *
+     * @param Student $student
+     * @return JsonResponse
+     */
+    public function show(Student $student)
+    {
+        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);
+    }*/
+
+    /**
+     * Обновление ученика
+     *
+     * @param StudentRequest $request
+     * @param Student $student
+     * @return JsonResponse
+     */
+    public function update(StudentRequest $request, Student $student)
+    {
+        $prev_class = $student->schoolClass;
+        if ($prev_class) {
+            $prev_class->count_students -= 1;
+            $prev_class->save();
+        }
+
+        $new_class = SchoolClass::findOrfail((int)$request->input('class_id'));
+        $student->update($request->all());
+
+        $new_class->count_students++;
+        $new_class->save();
+        return response()->json(collect($student)->except('school_class'), 200);
+    }
+}
--- a/app/Http/Controllers/Users/TeacherController.php
+++ b/app/Http/Controllers/Users/TeacherController.php
@@ -1,9 +1,8 @@
 <?php

-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Users;

-use App\Http\Requests\TeacherRequest;
-use App\Models\SchoolClass;
+use App\Http\Controllers\Controller;
 use App\Models\Teacher;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -13,10 +12,10 @@ class TeacherController extends Controller
    /**
     * Получение списка всех учителей
     *
-     * @param TeacherRequest $request
+     * @param Request $request
     * @return JsonResponse
     */
-    public function index()
+    public function index(Request $request)
    {
        return response()->json(Teacher::all(), 200);
    }
@@ -25,10 +24,10 @@ class TeacherController extends Controller
     * Получение одного учителя
     *
     * @param Teacher $teacher
-     * @param TeacherRequest $request
+     * @param Request $request
     * @return JsonResponse
     */
-    public function show(Teacher $teacher)
+    public function show(Teacher $teacher, Request $request)
    {
        return response()->json($teacher, 200);
    }
@@ -36,11 +35,11 @@ class TeacherController extends Controller
    /**
     * Обновление учителя
     *
-     * @param TeacherRequest $request
+     * @param Request $request
     * @param Teacher $teacher
     * @return JsonResponse
     */
-    public function update(TeacherRequest $request, Teacher $teacher)
+    public function update(Request $request, Teacher $teacher)
    {
        $teacher->update($request->all());
        return response()->json($teacher, 200);