1
0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00

Журнал(fixed some issues)

This commit is contained in:
ashen-1-dev
2020-12-16 20:38:32 +07:00
parent be8af67c61
commit 622170c647
4 changed files with 30 additions and 9 deletions

View File

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
use App\Models\Teacher;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use App\Models\Subject;
class TeacherController extends Controller
{
@@ -48,10 +49,26 @@ 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);
}
}