novy/aplikasi-ketertiban
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: jadwal sertakan nama guru (join teachers+users)

Browse Source
This commit is contained in:
Novy San87
2026-08-06 11:00:11 +07:00
parent e4d3bc19bb
commit 8d10ca3edf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/ParentStudentController.php
+4 -1
View File
@@ -46,13 +46,15 @@ class ParentStudentController extends Controller
$rows = $db->table('schedules as s') $rows = $db->table('schedules as s')
->join('classes as c', 'c.id', '=', 's.class_id') ->join('classes as c', 'c.id', '=', 's.class_id')
->join('subjects as sub', 'sub.id', '=', 's.subject_id') ->join('subjects as sub', 'sub.id', '=', 's.subject_id')
->leftJoin('teachers as t', 't.id', '=', 's.teacher_id')
->leftJoin('users as u', 'u.id', '=', 't.user_id')
->where('c.name', $student->class_name) ->where('c.name', $student->class_name)
->where('s.academic_year_id', $yearId) ->where('s.academic_year_id', $yearId)
->where('s.semester_id', $semesterId) ->where('s.semester_id', $semesterId)
->where('s.is_active', 1) ->where('s.is_active', 1)
->orderBy('s.day_of_week') ->orderBy('s.day_of_week')
->orderBy('s.start_time') ->orderBy('s.start_time')
->get(['s.day_of_week', 's.start_time', 's.end_time', 'sub.name as subject']); ->get(['s.day_of_week', 's.start_time', 's.end_time', 'sub.name as subject', 'u.name as teacher']);
$days = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday']; $days = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
$grouped = []; $grouped = [];
@@ -61,6 +63,7 @@ class ParentStudentController extends Controller
'start' => substr($r->start_time, 0, 5), 'start' => substr($r->start_time, 0, 5),
'end' => substr($r->end_time, 0, 5), 'end' => substr($r->end_time, 0, 5),
'subject' => $r->subject, 'subject' => $r->subject,
'teacher' => $r->teacher,
]); ]);
if ($items->isNotEmpty()) { if ($items->isNotEmpty()) {
$grouped[] = [ $grouped[] = [