From 1765cf44d088d76d9477b7c16eeedf77add60f0f Mon Sep 17 00:00:00 2001
From: nikden13 <denisovnik99@mail.ru>
Date: Wed, 9 Dec 2020 13:42:28 +0700
Subject: [PATCH] =?UTF-8?q?index=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/TimetableController.php | 22 +++++++++++++++++---
 app/Models/Subject.php                       |  5 +++++
 app/Models/Timetable.php                     |  5 +++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/TimetableController.php b/app/Http/Controllers/TimetableController.php
index dcae219..1496f43 100644
--- a/app/Http/Controllers/TimetableController.php
+++ b/app/Http/Controllers/TimetableController.php
@@ -21,14 +21,30 @@ class TimetableController extends Controller
         ]);
         $builder = Timetable::all()->sortBy('timeStart');
         $timetables = (new TimetableFilter($builder, $request))->apply()->values();
-        $arrayTimetables = [];
+        $filterTimetables = collect([]);
+        foreach ($timetables as $timetable) {
+            $subject = $timetable->subject->name;
+            $teacher = $timetable->teacher->only('name', 'surname', 'patronymic');
+            $class = $timetable->schoolClass->only('number', 'letter');
+            $filterTimetables->push([
+                'id' => $timetable['id'],
+                'date' => $timetable['date'],
+                'time_start' => $timetable['time_start'],
+                'time_end' => $timetable['time_end'],
+                'classroom' => $timetable['classroom'],
+                'subject' => $subject,
+                'teacher' => $teacher,
+                'class' => $class,
+            ]);
+        }
+        $dateTimetables = [];
         for ($i = 0; $i < 6; $i++) {
             $date = Carbon::parse($request->input('date'))
                 ->addDays($i)
                 ->format('Y-m-d');
-            array_push($arrayTimetables, [$date => $timetables->where('date', $date)->values()]);
+            array_push($dateTimetables, [$date => $filterTimetables->where('date', $date)->values()]);
         }
-        return response()->json($arrayTimetables, 200);
+        return response()->json($dateTimetables, 200);
     }
 
      //Получение урока
diff --git a/app/Models/Subject.php b/app/Models/Subject.php
index 18755ad..e9f7798 100644
--- a/app/Models/Subject.php
+++ b/app/Models/Subject.php
@@ -13,6 +13,11 @@ class Subject extends Model
         'name',
     ];
 
+    protected $hidden = [
+        'created_at',
+        'updated_at',
+    ];
+
     public function banktasks()
     {
         return $this->hasMany(BankTask::class);
diff --git a/app/Models/Timetable.php b/app/Models/Timetable.php
index e4d13ef..24c21c3 100644
--- a/app/Models/Timetable.php
+++ b/app/Models/Timetable.php
@@ -13,6 +13,11 @@ class Timetable extends Model
         'updated_at',
     ];
 
+    protected $hidden = [
+        'created_at',
+        'updated_at',
+    ];
+
     public function teacher()
     {
         return $this->belongsTo(Teacher::class);