fix teacher and parent routes

2026-04-24 02:12:01 -04:00
parent 5128c74892
commit 7216cb2885
36 changed files with 1575 additions and 49 deletions
@@ -52,12 +52,12 @@ class ParentAttendanceReportCalendarService
            $rows = DB::table('calendar_events')
                ->select('date')
                ->where('no_school', 1)
-                ->groupStart()
-                ->where('school_year', $schoolYear)
-                ->orWhere('school_year IS NULL', null, false)
-                ->groupEnd()
-                ->where('date >=', $rangeStartStr)
-                ->where('date <=', $rangeEndStr)
+                ->where(function ($query) use ($schoolYear) {
+                    $query->where('school_year', $schoolYear)
+                        ->orWhereNull('school_year');
+                })
+                ->where('date', '>=', $rangeStartStr)
+                ->where('date', '<=', $rangeEndStr)
                ->get()
                ->toArray();