fix close year and ignore not active students

2026-08-20 17:27:28 -04:00
parent 2b0206e7f2
commit 127098b87c
4 changed files with 346 additions and 98 deletions
@@ -540,7 +540,7 @@ class AdministratorController extends BaseController

    public function teacherSubmissionsReport()
    {
-        $semester = (string) (getSemester() ?? $this->semester ?? '');
+        $semester = (string) ($this->semester !== '' ? $this->semester : (getSemester() ?? $this->semester ?? ''));
        $schoolYear = trim((string) ($this->request->getGet('school_year') ?? ''));
        if ($schoolYear === '') {
            $schoolYear = $this->currentSchoolYearName((string) ($this->schoolYear ?? ''));
@@ -561,7 +561,7 @@ class AdministratorController extends BaseController
    {
        $result = service('teacherSubmissionReport')->sendNotifications(
            (array) $this->request->getPost(),
-            (string) (getSemester() ?? $this->semester ?? ''),
+            (string) ($this->semester !== '' ? $this->semester : (getSemester() ?? '')),
            (int) (session()->get('user_id') ?? 0)
        );