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);