Правки после слияния

app/Http/Controllers/JournalController.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Filters\JournalFilter;
+use App\Http\Requests\JournalRequest;
+use App\Models\Journal;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+
+class JournalController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function index(Request $request)
+    {
+        $journal = (new JournalFilter(Journal::all(), $request))->apply()->values();
+        return response()->json($journal, 200);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
+//    public function create()
+//    {
+//        //
+//    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param JournalRequest $request
+     * @return JsonResponse
+     */
+    public function store(JournalRequest $request)
+    {
+        if ($request->has('date'))
+            $date = Carbon::createFromTimestamp($request->get('date')/1000)->floorDays();
+        else
+            $date = Carbon::now()->floorDays();
+
+
+        $exist = Journal::where('updated_at', $date)
+            ->where('student_id', $request->get('student_id'))
+            ->where('subject_id', $request->get('subject_id'))
+            ->get();
+
+        if ($exist->isNotEmpty())
+            return response()->json('Оценка на эту дату уже выставлена', 200);
+
+        $data = array_merge(['updated_at' => $date], $request->all());
+
+        $journal = Journal::create($data);
+        return response()->json($journal, 200);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param int $journal
+     * @return JsonResponse
+     */
+    public function show(int $journal)
+    {
+        return response()->json(Journal::find($journal), 200);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param Journal $journal
+     * @return Response
+     */
+//    public function edit(Journal $journal)
+//    {
+//        //
+//    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param JournalRequest $request
+     * @param Journal $journal
+     * @return JsonResponse
+     */
+    public function update(Request  $request, int $journal)
+    {
+        $j = Journal::find($journal);
+        $j->score = $request->get('score');
+        $j->comment = $request->get('comment');
+        $j->timestamps = false;
+        $j->save();
+        return response()->json(['id' => $j->id], 200);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param Journal $journal
+     * @return JsonResponse
+     */
+    public function destroy(Journal $journal)
+    {
+        $journal->delete();
+        return response()->json(null, 200);
+    }
+}

app/Http/Controllers/News/NewsController.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers\News;
+use App\Http\Controllers\Controller;
+use App\Models\NewsFile;
+use Illuminate\Http\Request;
+use App\Models\News;
+
+class NewsController extends Controller
+{
+    public function index(Request $request) {
+        $count = 5;
+        $news = new News;
+        if ($request->has('count')) {
+            $temp = (int)$request->count;
+            if ($temp>0 && $temp<= 100) {
+                $count = $temp;
+            }
+        }
+
+        return response()->json($news->orderByDesc('created_at')->paginate($count), 200);
+
+    }
+
+    public function store(Request $request) {
+        // Добавить проверку, после добавление авторизации
+        $request->validate([
+            'title' => 'required|min:5',
+            'description' => 'required',
+                           ]);
+        $news = News::create($request->all());
+
+        return response()->json($news, 201);
+    }
+
+    public function show(News $news) {
+
+        return response()->json([
+            $news,
+            'photo_id' => NewsFile::where('news_id', '=', $news->id)->get(['id'])
+                                    ], 200);
+    }
+
+    public function edit(News $news, Request $request) {
+        $request->validate([
+            'title' => 'required|min:5',
+            'description' => 'required'
+                           ]);
+        $news->update($request->all());
+
+        return response()->json($news, 200);
+
+    }
+
+    public function delete(News $news) {
+        $news->delete();
+
+        return response()->json(true, 204);
+    }
+}

app/Http/Controllers/News/NewsFileController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Http\Controllers\News;
+
+use App\Models\NewsFile;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Storage;
+use App\Models\News;
+
+
+class NewsFileController 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(News $news, Request $request)
+    {
+        $newsId = $news->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/news/' . $newsId . '/' . $type . '/', $file, $request->name)) {
+            NewsFile::create([
+                                     'name' => $request->name,
+                                     'type' => $type,
+                                     'extension' => $ext,
+                                     'news_id' => $newsId,
+                                      $file,
+                                      $request->name . $ext
+                                 ]);
+            $news->photo_uri = '/storage/news' . '/' . $newsId . '/' . $type . '/' . $request->name;
+            $news->save();
+            return true;
+        }
+        return false;
+    }
+
+
+
+
+
+    public function delete(NewsFile $file) {
+
+        if (Storage::disk('local')->exists('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
+            if (Storage::disk('local')->delete('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
+                return response()->json($file->delete(), 204);
+            }
+        }
+        return response()->json(['News 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);
+    }
+
+
+
+}

app/Http/Controllers/SchoolClassController.php

@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use App\Filters\JournalFilter;
 use App\Http\Requests\SchoolClassRequest;
 use App\Models\SchoolClass;
 use App\Models\Teacher;
+use Carbon\Carbon;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 
@@ -65,11 +67,26 @@ class SchoolClassController extends Controller
         $students = $class->students;
         $studentsOnlyFIO = [];
         foreach ($students as $student) {
-             array_push($studentsOnlyFIO, $student->only('id', 'name', 'surname', 'patronymic'));
+            array_push($studentsOnlyFIO, $student->only('id', 'name', 'surname', 'patronymic'));
         }
         return response()->json($studentsOnlyFIO, 200);
     }
 
+    public function getStudentsJournal(SchoolClass $class, Request $request)
+    {
+        $students = $class->students;
+        $allStudents = [];
+
+        foreach ($students as $student)
+        {
+            $cpys = clone $student;
+            $cpys->scores = (new JournalFilter($student->scores, $request))->apply()->values();
+            $allStudents[] = $cpys;
+        }
+
+        return response()->json($allStudents, 200);
+    }
+
     //получение всех предметов для класса
     public function getSubjects(SchoolClass $class)
     {

app/Http/Controllers/TimetableController.php

@@ -45,6 +45,7 @@ class TimetableController extends Controller
                 'class' => $class,
             ]);
         }
+
         $dateTimetables = [];
         //if (!$filterTimetables->isEmpty()) {
             for ($i = 0; $i < 6; $i++) {
@@ -53,9 +54,8 @@ class TimetableController extends Controller
                     ->addDays($i)
                     ->format('Y-m-d');
                 array_push($dateTimetables, [$date => $filterTimetables->where('date', $date)->values()]);
-            }
-
-        //}
+        //    }
+        }
         return response()->json($dateTimetables, 200);
     }
 

app/Http/Controllers/Users/StudentController.php

@@ -7,6 +7,7 @@ use App\Http\Requests\StudentRequest;
 use App\Models\SchoolClass;
 use App\Models\Student;
 use Illuminate\Http\JsonResponse;
+use App\Models\AnswerToTask;
 
 class StudentController extends Controller
 {
@@ -31,6 +32,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,6 +67,7 @@ class StudentController extends Controller
         return response()->json(collect($student)->except('school_class'), 200);
     }
 
+
     public function destroy(Student $student)
     {
         $user = $student->user;
@@ -61,4 +75,9 @@ class StudentController extends Controller
         return response()->json(null, 204);
     }
 
+
+    public function getAnswers(Student $student) {
+        return AnswerToTask::where('student_id', '=', $student->id)->get();
+    }
+
 }

app/Http/Controllers/Users/TeacherController.php

@@ -10,7 +10,7 @@ use App\Models\Task;
 use App\Models\Teacher;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Response;
+use App\Models\Subject;
 
 class TeacherController extends Controller
 {
@@ -71,11 +71,27 @@ class TeacherController extends Controller
     public function getClasses(Teacher $teacher)
     {
         $timetables = $teacher->timetables;
-        $classes = [];
+        $classes = collect([]);
         foreach ($timetables as $timetable) {
-            array_push($classes, $timetable->schoolClass->only('id','number','letter'));
+            $subjects = collect([]);
+            $class = $timetable->schoolClass->only('id','number','letter');
+            $forClassTimetables = $timetables->where('class_id', $class['id']);
+
+            foreach ($forClassTimetables as $forClassTimetable) {
+                $subjects->push(Subject::find($forClassTimetable['subject_id']));
+            }
+            $subjects = $subjects->unique()->values();
+
+            $classes->push([
+                               'id' => $class['id'],
+                               'number' => $class['number'],
+                               'letter' => $class['letter'],
+                               'subjects' => $subjects,
+                           ]);
+
         }
-        return response()->json(collect($classes)->unique(), 200);
+
+        return response()->json($classes->unique()->values(), 200);
     }
 
     public function getUncheckedTask(Teacher $teacher, SchoolClass $class) {