merge prod to main

2026-05-16 13:44:12 -04:00
parent 663c0cdbda
commit b32fb853f6
901 changed files with 11241 additions and 1340 deletions
@@ -28,6 +28,8 @@ use App\Models\ScoreCommentModel;
 use App\Models\SemesterScoreModel;
 use App\Models\TeacherClassModel;
 use App\Models\TeacherSubmissionNotificationHistoryModel;
+use App\Models\ExamDraftModel;
+use App\Models\HomeworkModel;
 use App\Services\SemesterRangeService;

 use CodeIgniter\Events\Events;
@@ -416,8 +418,10 @@ class AdministratorController extends BaseController
        $totalStudents = (int) (
            $this->db->table('student_class')
                ->select('COUNT(DISTINCT student_class.student_id) AS cnt')
+                ->join('students', 'students.id = student_class.student_id', 'inner')
                ->where('student_class.school_year', $this->schoolYear)
                ->where('student_class.class_section_id IS NOT NULL', null, false)
+                ->where('students.is_active', 1)
                ->get()
                ->getRow('cnt')
            ?? 0
@@ -694,15 +698,26 @@ class AdministratorController extends BaseController

    public function teacherSubmissionsReport()
    {
-        $semester = (string)($this->semester ?? '');
-        $schoolYear = (string)($this->schoolYear ?? '');
+        $semester = (string)($this->configModel->getConfig('semester') ?? $this->semester ?? '');
+        $schoolYear = (string)($this->configModel->getConfig('school_year') ?? $this->schoolYear ?? '');
+        $semesterResolver = new SemesterRangeService($this->configModel);
+        $semesterNorm = $semesterResolver->normalizeSemester($semester);
+        $semesterFilter = $semesterNorm !== '' ? $semesterNorm : $semester;
+        $semesterCandidates = $this->buildSemesterCandidates($semesterFilter);
+        $lowProgressRaw = (string) $this->request->getGet('low_progress_sections');
+        $lowProgressSectionIds = array_values(array_unique(array_filter(array_map(
+            'intval',
+            preg_split('/\s*,\s*/', $lowProgressRaw, -1, PREG_SPLIT_NO_EMPTY)
+        ))));

        $scoreComments = new ScoreCommentModel();
        $semesterScores = new SemesterScoreModel();
        $attendanceDays = new AttendanceDayModel();
+        $examDrafts = new ExamDraftModel();
+        $homeworkModel = new HomeworkModel();
        $historyModel = new TeacherSubmissionNotificationHistoryModel();

-        $assignmentRows = $this->db->table('teacher_class tc')
+        $assignmentQuery = $this->db->table('teacher_class tc')
            ->select([
                'tc.class_section_id',
                'cs.class_section_name',
@@ -713,11 +728,97 @@ class AdministratorController extends BaseController
            ])
            ->join('classSection cs', 'cs.class_section_id = tc.class_section_id', 'left')
            ->join('users u', 'u.id = tc.teacher_id', 'left')
-            ->where('tc.school_year', $schoolYear)
-            ->where('tc.semester', $semester)
-            ->orderBy('cs.class_section_name', 'ASC')
-            ->get()
-            ->getResultArray();
+            ->orderBy('cs.class_section_name', 'ASC');
+
+        $filteredQuery = clone $assignmentQuery;
+        if ($schoolYear !== '') {
+            $filteredQuery = $filteredQuery->where('tc.school_year', $schoolYear);
+        }
+        if (!empty($semesterCandidates)) {
+            $filteredQuery = $filteredQuery->whereIn('tc.semester', $semesterCandidates);
+        }
+
+        $assignmentRows = $filteredQuery->get()->getResultArray();
+        if (empty($assignmentRows) && ($schoolYear !== '' || $semester !== '')) {
+            $assignmentRows = $assignmentQuery->get()->getResultArray();
+        }
+
+        $studentCounts = $this->studentClassModel->getStudentCountsBySection($schoolYear !== '' ? $schoolYear : null);
+        $sectionRows = $this->classSectionModel
+            ->select('class_section_id, class_section_name')
+            ->orderBy('class_section_name', 'ASC')
+            ->findAll();
+        $sectionMap = [];
+        foreach ($sectionRows as $sectionRow) {
+            $sectionId = (int) ($sectionRow['class_section_id'] ?? 0);
+            if ($sectionId <= 0) {
+                continue;
+            }
+            if (empty($studentCounts[$sectionId])) {
+                continue;
+            }
+            $sectionMap[$sectionId] = $sectionRow['class_section_name'] ?? "Section {$sectionId}";
+        }
+        $sectionIds = array_keys($sectionMap);
+
+        [$progressExpectedWeeks, $progressSubmittedBySection] = $this->buildClassProgressStats($sectionIds);
+        $examDraftCounts = [];
+        $examDraftDeadline = $this->resolveTeacherDashboardExamDraftDeadline($semester, $schoolYear);
+        $examDraftDeadlineConfig = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        $examDraftDeadlineFormatted = '';
+        if ($examDraftDeadlineConfig !== '') {
+            $parsedUi = $this->parseExamDraftDeadlineConfigValue();
+            $examDraftDeadlineFormatted = $parsedUi !== null ? $parsedUi->format('M j, Y') : '';
+        }
+        $homeworkCounts = [];
+        if (! empty($sectionIds)) {
+            $draftBuilder = $examDrafts
+                ->select('class_section_id')
+                ->whereIn('class_section_id', $sectionIds);
+            if ($schoolYear !== '') {
+                $draftBuilder->where('school_year', $schoolYear);
+            }
+            if (!empty($semesterCandidates)) {
+                $draftBuilder->whereIn('semester', $semesterCandidates);
+            }
+            if ($this->db->fieldExists('is_legacy', 'exam_drafts')) {
+                $draftBuilder->where('is_legacy', 0);
+            }
+            $draftRows = $draftBuilder->findAll();
+            foreach ($draftRows as $draft) {
+                $sectionId = (int) ($draft['class_section_id'] ?? 0);
+                if ($sectionId <= 0) {
+                    continue;
+                }
+                $examDraftCounts[$sectionId] = ($examDraftCounts[$sectionId] ?? 0) + 1;
+            }
+
+            $homeworkBuilder = $homeworkModel
+                ->select('class_section_id, homework_index')
+                ->whereIn('class_section_id', $sectionIds);
+            if ($schoolYear !== '') {
+                $homeworkBuilder->where('school_year', $schoolYear);
+            }
+            if (!empty($semesterCandidates)) {
+                $homeworkBuilder->whereIn('semester', $semesterCandidates);
+            }
+            $homeworkRows = $homeworkBuilder
+                ->where('score IS NOT NULL', null, false)
+                ->where('score !=', '')
+                ->groupBy('class_section_id, homework_index')
+                ->findAll();
+            foreach ($homeworkRows as $row) {
+                $sectionId = (int) ($row['class_section_id'] ?? 0);
+                if ($sectionId <= 0) {
+                    continue;
+                }
+                $homeworkCounts[$sectionId] = ($homeworkCounts[$sectionId] ?? 0) + 1;
+            }
+        }
+
+        if (empty($lowProgressSectionIds)) {
+            $lowProgressSectionIds = $this->resolveLowProgressSectionIds($sectionIds);
+        }

        $teachersBySection = [];
        foreach ($assignmentRows as $assignment) {
@@ -743,7 +844,7 @@ class AdministratorController extends BaseController
            $entry = &$teachersBySection[$sectionId];
            if (!isset($entry)) {
                $entry = [
-                    'class_section' => $assignment['class_section_name'] ?? "Section {$sectionId}",
+                    'class_section' => $assignment['class_section_name'] ?? ($sectionMap[$sectionId] ?? "Section {$sectionId}"),
                    'teachers' => [],
                ];
            }
@@ -763,35 +864,49 @@ class AdministratorController extends BaseController
        $missingItemCount = 0;
        $allTeacherIds = [];
        $allClassSectionIds = [];
-        foreach ($teachersBySection as $classSectionId => $section) {
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreField = $examTerm === 'final' ? 'final_exam_score' : 'midterm_exam_score';
+
+        foreach ($sectionMap as $classSectionId => $sectionName) {
            $classSectionId = (int)$classSectionId;
            if ($classSectionId <= 0) {
                continue;
            }

-            $studentEntries = $this->studentClassModel
+            $studentQuery = $this->studentClassModel
                ->select('student_id')
                ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
-                ->where('school_year', $schoolYear)
-                ->findAll();
+                ->where('school_year', $schoolYear);
+            if (!empty($semesterCandidates)) {
+                $studentQuery->whereIn('semester', $semesterCandidates);
+            }
+            $studentEntries = $studentQuery->findAll();
+            if (empty($studentEntries)) {
+                $studentEntries = $this->studentClassModel
+                    ->select('student_id')
+                    ->where('class_section_id', $classSectionId)
+                    ->where('school_year', $schoolYear)
+                    ->findAll();
+            }
            $studentIds = array_filter(array_map(static fn($entry) => (int)($entry['student_id'] ?? 0), $studentEntries));
            $expected = count($studentIds);

            $midtermStudents = [];
            $participationStudents = [];
            if ($classSectionId > 0) {
-                $scoreRecords = $semesterScores
+                $scoreQuery = $semesterScores
                    ->where('class_section_id', $classSectionId)
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->findAll();
+                    ->where('school_year', $schoolYear);
+                if (!empty($semesterCandidates)) {
+                    $scoreQuery->whereIn('semester', $semesterCandidates);
+                }
+                $scoreRecords = $scoreQuery->findAll();
                foreach ($scoreRecords as $score) {
                    $sid = (int)($score['student_id'] ?? 0);
                    if ($sid <= 0 || ($expected > 0 && !in_array($sid, $studentIds, true))) {
                        continue;
                    }
-                    $midtermValue = trim((string)($score['midterm_exam_score'] ?? ''));
+                    $midtermValue = trim((string)($score[$examScoreField] ?? ''));
                    if ($midtermValue !== '') {
                        $midtermStudents[$sid] = true;
                    }
@@ -805,13 +920,15 @@ class AdministratorController extends BaseController
            $midtermCommentStudents = [];
            $ptapCommentStudents = [];
            if (!empty($studentIds)) {
-                $comments = $scoreComments
+                $commentQuery = $scoreComments
                    ->select('student_id, score_type, comment')
                    ->whereIn('student_id', $studentIds)
-                    ->where('semester', $semester)
                    ->where('school_year', $schoolYear)
-                    ->whereIn('score_type', ['midterm', 'ptap'])
-                    ->findAll();
+                    ->whereIn('score_type', [$examTerm, 'ptap']);
+                if (!empty($semesterCandidates)) {
+                    $commentQuery->whereIn('semester', $semesterCandidates);
+                }
+                $comments = $commentQuery->findAll();
                foreach ($comments as $comment) {
                    $sid = (int)($comment['student_id'] ?? 0);
                    if ($sid <= 0) {
@@ -822,7 +939,7 @@ class AdministratorController extends BaseController
                        continue;
                    }
                    $type = strtolower(trim((string)($comment['score_type'] ?? '')));
-                    if ($type === 'midterm') {
+                    if ($type === $examTerm) {
                        $midtermCommentStudents[$sid] = true;
                    }
                    if ($type === 'ptap') {
@@ -831,14 +948,17 @@ class AdministratorController extends BaseController
                }
            }

-            $attendanceRow = $attendanceDays
+            $attendanceQuery = $attendanceDays
                ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
                ->where('school_year', $schoolYear)
-                ->where('date', $today)
-                ->first();
+                ->where('date', $today);
+            if (!empty($semesterCandidates)) {
+                $attendanceQuery->whereIn('semester', $semesterCandidates);
+            }
+            $attendanceRow = $attendanceQuery->first();
            $attendanceSubmitted = $attendanceRow && in_array(strtolower((string)($attendanceRow['status'] ?? '')), ['submitted', 'published', 'finalized'], true);

+            $section = $teachersBySection[$classSectionId] ?? ['teachers' => []];
            $teacherList = $section['teachers'] ?? [];
            if (!empty($teacherList)) {
                usort($teacherList, function ($a, $b) {
@@ -859,18 +979,27 @@ class AdministratorController extends BaseController
            $participationStatus = $this->submissionStatus(count($participationStudents), $expected);
            $ptapCommentStatus = $this->submissionStatus(count($ptapCommentStudents), $expected);
            $attendanceStatus = $this->attendanceStatus($attendanceSubmitted);
+            $progressSubmitted = (int) ($progressSubmittedBySection[$classSectionId] ?? 0);
+            $classProgressStatus = $this->progressStatus($progressSubmitted, $progressExpectedWeeks);
+            $draftSubmitted = (int) ($examDraftCounts[$classSectionId] ?? 0);
+            $examDraftStatus = $this->draftStatus($draftSubmitted, $examDraftDeadline);
+            $homeworkSubmitted = (int) ($homeworkCounts[$classSectionId] ?? 0);
+            $homeworkStatus = $this->homeworkStatus($homeworkSubmitted);
            $statusDetails = [
                'midterm_score_status' => $midtermScoreStatus,
                'midterm_comment_status' => $midtermCommentStatus,
                'participation_status' => $participationStatus,
                'ptap_comment_status' => $ptapCommentStatus,
+                'class_progress_status' => $classProgressStatus,
+                'exam_draft_status' => $examDraftStatus,
+                'homework_status' => $homeworkStatus,
            ];
-            $missingItemsForSection = $this->buildMissingItems($statusDetails);
+            $missingItemsForSection = $this->buildMissingItems($statusDetails, $semester);
            $missingItemCount += count($missingItemsForSection);
            $totalStatuses += count($statusDetails);

            $rows[] = [
-                'class_section' => $section['class_section'] ?? "Section {$classSectionId}",
+                'class_section' => $sectionMap[$classSectionId] ?? ($section['class_section'] ?? "Section {$classSectionId}"),
                'class_section_id' => $classSectionId,
                'teachers' => $teacherList,
                'midterm_score_status' => $midtermScoreStatus,
@@ -878,6 +1007,9 @@ class AdministratorController extends BaseController
                'participation_status' => $participationStatus,
                'ptap_comment_status' => $ptapCommentStatus,
                'attendance_status' => $attendanceStatus,
+                'class_progress_status' => $classProgressStatus,
+                'exam_draft_status' => $examDraftStatus,
+                'homework_status' => $homeworkStatus,
                'missing_items' => $missingItemsForSection,
                'student_count' => $expected,
            ];
@@ -939,15 +1071,183 @@ class AdministratorController extends BaseController
            'schoolYear' => $schoolYear,
            'notificationHistory' => $historyMap,
            'summary' => $summary,
+            'lowProgressSectionIds' => $lowProgressSectionIds,
+            'examDraftDeadlineConfig' => $examDraftDeadlineConfig,
+            'examDraftDeadlineFormatted' => $examDraftDeadlineFormatted,
        ]);
    }

+    private function resolveLowProgressSectionIds(array $sectionIds): array
+    {
+        [$expectedWeeks, $submittedBySection] = $this->buildClassProgressStats($sectionIds);
+        if ($expectedWeeks <= 0) {
+            return [];
+        }
+
+        $lowProgressSectionIds = [];
+        foreach ($sectionIds as $sectionId) {
+            $submitted = (int) ($submittedBySection[$sectionId] ?? 0);
+            $percent = ($submitted / $expectedWeeks) * 100;
+            if ($percent < 50) {
+                $lowProgressSectionIds[] = $sectionId;
+            }
+        }
+
+        return $lowProgressSectionIds;
+    }
+
+    private function buildClassProgressStats(array $sectionIds): array
+    {
+        $sectionIds = array_values(array_unique(array_filter(array_map('intval', $sectionIds))));
+        if (empty($sectionIds)) {
+            return [0, []];
+        }
+
+        $semesterResolver = new SemesterRangeService($this->configModel);
+        $schoolYear = (string)($this->configModel->getConfig('school_year') ?? '');
+        $semester = (string)($this->configModel->getConfig('semester') ?? '');
+        $schoolYearForRange = $schoolYear !== '' ? $schoolYear : (string)($this->configModel->getConfig('school_year') ?? '');
+        [$rangeStart, $rangeEnd] = $semesterResolver->getSchoolYearRange($schoolYearForRange);
+        $semesterNorm = $semesterResolver->normalizeSemester($semester);
+        if ($semesterNorm !== '' && $schoolYearForRange !== '') {
+            $semRange = $semesterResolver->getSemesterRange($schoolYearForRange, $semesterNorm);
+            if ($semRange) {
+                [$rangeStart, $rangeEnd] = $semRange;
+            }
+        }
+
+        $dateList = [];
+        try {
+            $start = new \DateTimeImmutable($rangeStart);
+            $end = new \DateTimeImmutable($rangeEnd);
+            $cursor = $start;
+            $w = (int) $cursor->format('w');
+            if ($w !== 0) {
+                $cursor = $cursor->modify('next sunday');
+            }
+            while ($cursor <= $end) {
+                $dateList[] = $cursor->format('Y-m-d');
+                $cursor = $cursor->modify('+7 days');
+            }
+        } catch (\Throwable $e) {
+            $dateList = [];
+        }
+
+        $noSchoolDays = [];
+        $events = [];
+        try {
+            $calendarModel = new \App\Models\CalendarModel();
+            $events = $calendarModel->getEvents();
+        } catch (\Throwable $e) {
+            $events = [];
+        }
+        foreach ($events as $event) {
+            $d = substr((string) ($event['date'] ?? ''), 0, 10);
+            if ($d === '' || empty($event['no_school'])) {
+                continue;
+            }
+            if ($d < $rangeStart || $d > $rangeEnd) {
+                continue;
+            }
+            $eventYear = trim((string) ($event['school_year'] ?? ''));
+            if ($schoolYearForRange !== '' && $eventYear !== '' && $eventYear !== $schoolYearForRange) {
+                continue;
+            }
+            $noSchoolDays[$d] = true;
+        }
+
+        $anchorSundayYmd = '';
+        try {
+            $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
+            $tzObj = new \DateTimeZone($tzName ?: 'UTC');
+        } catch (\Throwable $e) {
+            try {
+                $tzObj = new \DateTimeZone(user_timezone() ?: 'UTC');
+            } catch (\Throwable $e2) {
+                $tzObj = new \DateTimeZone('UTC');
+            }
+        }
+        try {
+            $nowDate = new \DateTime('now', $tzObj);
+        } catch (\Throwable $e) {
+            $nowDate = new \DateTime('now');
+        }
+        $weekday = (int) $nowDate->format('w');
+        $anchorSundayYmd = $weekday === 0
+            ? $nowDate->format('Y-m-d')
+            : $nowDate->modify('next sunday')->format('Y-m-d');
+
+        $activeDatesSet = [];
+        if (! empty($dateList) && $anchorSundayYmd !== '') {
+            foreach ($dateList as $d) {
+                if ($d <= $anchorSundayYmd && empty($noSchoolDays[$d])) {
+                    $activeDatesSet[$d] = true;
+                }
+            }
+        }
+        $expectedWeeks = count($activeDatesSet);
+        if ($expectedWeeks === 0) {
+            return [0, []];
+        }
+
+        $builder = $this->db->table('class_progress_reports')
+            ->select('class_section_id, week_start')
+            ->whereIn('class_section_id', $sectionIds);
+        if (! empty($activeDatesSet)) {
+            $builder->whereIn('week_start', array_keys($activeDatesSet));
+        }
+        $rows = $builder->get()->getResultArray();
+
+        $submittedBySection = [];
+        foreach ($rows as $row) {
+            $sectionId = (int) ($row['class_section_id'] ?? 0);
+            $weekStart = (string) ($row['week_start'] ?? '');
+            if ($sectionId === 0 || $weekStart === '' || empty($activeDatesSet[$weekStart])) {
+                continue;
+            }
+            $submittedBySection[$sectionId][$weekStart] = true;
+        }
+
+        $counts = [];
+        foreach ($sectionIds as $sectionId) {
+            $counts[$sectionId] = isset($submittedBySection[$sectionId])
+                ? count($submittedBySection[$sectionId])
+                : 0;
+        }
+
+        return [$expectedWeeks, $counts];
+    }
+
    public function sendTeacherSubmissionNotifications()
    {$notify = $this->request->getPost('notify');
        if (!is_array($notify)) {
            return redirect()->back()->with('info', 'Select at least one teacher to notify.');
        }
+        $semester = (string)($this->configModel->getConfig('semester') ?? $this->semester ?? '');
        $missingItemsPayload = $this->request->getPost('missing_items') ?? [];
+        $homeworkNotifyAll = (bool) $this->request->getPost('homework_notify_all');
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreLabel = $examTerm === 'final' ? 'final scores' : 'midterm scores';
+        $examCommentLabel = $examTerm === 'final' ? 'final comments' : 'midterm comments';
+        $forcedItems = [];
+        if ($this->request->getPost('notify_midterm_score')) {
+            $forcedItems[] = $examScoreLabel;
+        }
+        if ($this->request->getPost('notify_midterm_comment')) {
+            $forcedItems[] = $examCommentLabel;
+        }
+        if ($this->request->getPost('notify_participation')) {
+            $forcedItems[] = 'participation';
+        }
+        if ($this->request->getPost('notify_ptap_comment')) {
+            $forcedItems[] = 'PTAP comments';
+        }
+        if ($this->request->getPost('notify_class_progress')) {
+            $forcedItems[] = 'class progress';
+        }
+        if ($this->request->getPost('notify_exam_draft')) {
+            $forcedItems[] = 'exam draft';
+        }

        $targets = [];
        foreach ($notify as $sectionIdRaw => $teachers) {
@@ -1004,6 +1304,10 @@ class AdministratorController extends BaseController

        $historyModel = new TeacherSubmissionNotificationHistoryModel();
        $scoreUrl = site_url('/');
+        $progressUrl = site_url('teacher/progress/history');
+        $examDraftUrl = site_url('teacher/exam-drafts');
+        $homeworkUrl = site_url('teacher/addHomework');
+        $examDraftDeadlineEmailHtml = $this->buildExamDraftDeadlineEmailHtml();
        $sentCount = 0;
        $failCount = 0;

@@ -1019,6 +1323,13 @@ class AdministratorController extends BaseController
            $subject = "Reminder: Complete submissions for {$sectionName}";
            $missingPayload = $missingItemsPayload[$classSectionId][$teacherId] ?? '';
            $missingItems = $this->parseMissingItemsPayload((string)$missingPayload);
+            $selectedItems = $forcedItems;
+            if ($homeworkNotifyAll && !in_array('homework', $selectedItems, true)) {
+                $selectedItems[] = 'homework';
+            }
+            if (!empty($selectedItems)) {
+                $missingItems = array_values(array_unique($selectedItems));
+            }
            if (!empty($missingItems)) {
                $missingText = htmlspecialchars(
                    $this->formatMissingItemsText($missingItems),
@@ -1031,10 +1342,46 @@ class AdministratorController extends BaseController
            }

            $subject = "Reminder: Complete submissions for {$sectionName}";
+            $progressNote = '';
+            if (in_array('class progress', $missingItems, true)) {
+                $progressNote = "<p>Class progress submissions can be updated at <a href=\"{$progressUrl}\">Teacher Progress History</a>.</p>";
+            }
+            $examDraftNote = '';
+            if (in_array('exam draft', $missingItems, true)) {
+                $semesterLabel = strtolower(trim((string) $semester));
+                if ($semesterLabel === 'fall') {
+                    $draftLabel = 'midterm exam draft';
+                } elseif ($semesterLabel === 'spring') {
+                    $draftLabel = 'final exam draft';
+                } else {
+                    $draftLabel = 'exam draft';
+                }
+                $examDraftNote = "<p>" . ucfirst($draftLabel) . " submissions can be updated at <a href=\"{$examDraftUrl}\">Teacher Exam Drafts</a>.</p>"
+                    . $examDraftDeadlineEmailHtml;
+            }
+            $homeworkNote = '';
+            if (in_array('homework', $missingItems, true)) {
+                $homeworkNote = "<p>Homework scores can be submitted at <a href=\"{$homeworkUrl}\">Teacher Homework</a>.</p>";
+            }
+            $hasScoreItems = (bool) array_intersect($missingItems, [
+                'midterm scores',
+                'midterm comments',
+                'final scores',
+                'final comments',
+                'participation',
+                'PTAP comments',
+                'homework',
+            ]);
+            $nonScoreOnly = ! empty($missingItems) && ! $hasScoreItems;
            $body = "<p>Dear {$teacherName},</p>"
-                . "<p>Administration is gently reminding you to wrap up any remaining score submissions and/or comments for {$sectionName}.</p>"
+                . "<p>Administration is gently reminding you to wrap up any remaining "
+                . ($nonScoreOnly ? "submissions for {$sectionName}." : "score submissions, comments, and related items for {$sectionName}.")
+                . "</p>"
                . $missingNote
-                . "<p>Visit <a href=\"{$scoreUrl}\">Teacher Score Submission</a> to address any remaining items.</p>"
+                . $progressNote
+                . $examDraftNote
+                . $homeworkNote
+                . ($nonScoreOnly ? '' : "<p>Visit <a href=\"{$scoreUrl}\">Teacher Score Submission</a> to address any remaining items.</p>")
                . "<p>Thank you,<br>Al Rahma Administration</p>";

            $email = $teacher['email'] ?? '';
@@ -1096,6 +1443,170 @@ class AdministratorController extends BaseController
        ];
    }

+    private function progressStatus(int $submitted, int $expected): array
+    {
+        if ($expected <= 0) {
+            return [
+                'label' => 'N/A',
+                'badge' => 'bg-secondary',
+                'detail' => '',
+                'completed' => true,
+            ];
+        }
+        $completed = $submitted >= $expected;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => "{$submitted}/{$expected}",
+            'completed' => $completed,
+        ];
+    }
+
+    private function homeworkStatus(int $submitted): array
+    {
+        $completed = $submitted > 0;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => $completed ? (string) $submitted : '0',
+            'completed' => $completed,
+        ];
+    }
+
+    private function draftStatus(int $submitted, ?\DateTimeImmutable $deadline): array
+    {
+        if ($deadline !== null) {
+            $today = new \DateTimeImmutable('today');
+            if ($today < $deadline) {
+                return [
+                    'label' => 'Pending',
+                    'badge' => 'bg-secondary',
+                    'detail' => 'Not due',
+                    'completed' => true,
+                ];
+            }
+        }
+        $completed = $submitted > 0;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => $completed ? (string) $submitted : '0',
+            'completed' => $completed,
+        ];
+    }
+
+    /**
+     * Exam draft due date for the teacher submissions dashboard: prefers the configuration key
+     * `exam_draft_deadline` (same as automated reminders); otherwise fall/spring exam deadlines.
+     */
+    private function resolveTeacherDashboardExamDraftDeadline(string $semester, string $schoolYear): ?\DateTimeImmutable
+    {
+        $fromExamDraftKey = $this->parseExamDraftDeadlineConfigValue();
+        if ($fromExamDraftKey !== null) {
+            return $fromExamDraftKey;
+        }
+
+        return $this->resolveExamDraftDeadline($semester, $schoolYear);
+    }
+
+    /**
+     * Parses the `exam_draft_deadline` configuration value using the application timezone (midnight that calendar day).
+     */
+    private function parseExamDraftDeadlineConfigValue(): ?\DateTimeImmutable
+    {
+        $raw = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        if ($raw === '') {
+            return null;
+        }
+        $tz = new \DateTimeZone(config('App')->appTimezone ?? 'UTC');
+        try {
+            $deadline = new \DateTimeImmutable($raw, $tz);
+        } catch (\Throwable $e) {
+            return null;
+        }
+
+        return $deadline->setTime(0, 0, 0);
+    }
+
+    /**
+     * HTML snippet for reminder emails when exam draft is included (deadline from exam_draft_deadline config).
+     */
+    private function buildExamDraftDeadlineEmailHtml(): string
+    {
+        $raw = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        if ($raw === '') {
+            return '';
+        }
+        $parsed = $this->parseExamDraftDeadlineConfigValue();
+        $display = $parsed !== null
+            ? htmlspecialchars($parsed->format('l, F j, Y'), ENT_QUOTES, 'UTF-8')
+            : htmlspecialchars($raw, ENT_QUOTES, 'UTF-8');
+        $rawEsc = htmlspecialchars($raw, ENT_QUOTES, 'UTF-8');
+
+        return '<p><strong>Exam draft submission deadline</strong> (<code>exam_draft_deadline</code>): '
+            . "<strong>{$display}</strong>"
+            . ($parsed !== null && $rawEsc !== $display ? " <span style=\"color:#555;\">(configured value: {$rawEsc})</span>" : '')
+            . '.</p>';
+    }
+
+    private function resolveExamDraftDeadline(string $semester, string $schoolYear): ?\DateTimeImmutable
+    {
+        $semesterKey = strtolower(trim($semester));
+        if ($semesterKey === 'fall') {
+            $deadlineValue = (string)($this->configModel->getConfig('fall_exam_deadline') ?? '');
+        } elseif ($semesterKey === 'spring') {
+            $deadlineValue = (string)($this->configModel->getConfig('spring_exam_deadline') ?? '');
+        } else {
+            return null;
+        }
+        $deadlineValue = trim($deadlineValue);
+        if ($deadlineValue === '') {
+            return null;
+        }
+        try {
+            $deadline = new \DateTimeImmutable($deadlineValue);
+        } catch (\Throwable $e) {
+            return null;
+        }
+        if ($schoolYear !== '' && preg_match('/^\d{4}-\d{4}$/', $schoolYear)) {
+            $deadlineYear = $deadline->format('Y');
+            if ($deadlineYear === '1970') {
+                return null;
+            }
+        }
+        return $deadline->setTime(0, 0, 0);
+    }
+
+    private function resolveExamTermLabel(string $semester): string
+    {
+        $semesterKey = strtolower(trim($semester));
+        if ($semesterKey === '') {
+            return 'midterm';
+        }
+        if (str_contains($semesterKey, 'spring')) {
+            return 'final';
+        }
+        if (str_contains($semesterKey, 'fall')) {
+            return 'midterm';
+        }
+        return 'midterm';
+    }
+
+    private function buildSemesterCandidates(string $semester): array
+    {
+        $semester = trim((string) $semester);
+        if ($semester === '') {
+            return [];
+        }
+        $candidates = [
+            $semester,
+            strtolower($semester),
+            strtoupper($semester),
+            ucfirst(strtolower($semester)),
+        ];
+        $candidates = array_values(array_unique(array_filter($candidates, static fn ($v) => $v !== '')));
+        return $candidates;
+    }
    private function attendanceStatus(bool $submitted): array
    {
        return [
@@ -1105,14 +1616,20 @@ class AdministratorController extends BaseController
        ];
    }

-    private function buildMissingItems(array $statusMap): array
+    private function buildMissingItems(array $statusMap, string $semester): array
    {
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreLabel = $examTerm === 'final' ? 'final scores' : 'midterm scores';
+        $examCommentLabel = $examTerm === 'final' ? 'final comments' : 'midterm comments';
        $labels = [
-            'midterm_score_status' => 'midterm scores',
-            'midterm_comment_status' => 'midterm comments',
+            'midterm_score_status' => $examScoreLabel,
+            'midterm_comment_status' => $examCommentLabel,
            'participation_status' => 'participation',
            'ptap_comment_status' => 'PTAP comments',
            'attendance_status' => 'attendance',
+            'class_progress_status' => 'class progress',
+            'exam_draft_status' => 'exam draft',
+            'homework_status' => 'homework',
        ];

        $items = [];