add school year model

2026-06-07 00:52:01 -04:00
parent a192ed433d
commit 6866aedf42
36 changed files with 4771 additions and 88 deletions
@@ -17,10 +17,10 @@ class TeacherSubmissionReportService
    ) {
    }

-    public function report(): array
+    public function report(array $filters = []): array
    {
-        $semester = $this->shared->getSemester();
-        $schoolYear = $this->shared->getSchoolYear();
+        $semester = $this->shared->getSemester($filters['semester'] ?? null);
+        $schoolYear = $this->shared->getSchoolYear($filters['school_year'] ?? null);

        $assignmentRows = DB::table('teacher_class as tc')
            ->select([
@@ -230,6 +230,8 @@ class TeacherSubmissionReportService
            'rows' => $rows,
            'semester' => $semester,
            'schoolYear' => $schoolYear,
+            'currentSemester' => $this->shared->getSemester(),
+            'currentSchoolYear' => $this->shared->getSchoolYear(),
            'notificationHistory' => $historyMap,
            'summary' => $summary,
        ];