Merge branch 'develop_fix_expenses' into 'develop'

Fixed the date shift by making date-only strings stay in the user timezone...

See merge request root/alrahma_sunday_school!5

app/Config/Routes.php

@@ -405,6 +405,8 @@ $routes->get('teacher/progress/submit', 'ClassProgressController::create', ['fil
 $routes->post('teacher/progress/store', 'ClassProgressController::store', ['filter' => 'auth:teacher,teacher_assistant']);
 $routes->get('teacher/progress/history', 'ClassProgressController::history', ['filter' => 'auth:teacher,teacher_assistant']);
 $routes->get('teacher/progress/view/(:num)', 'ClassProgressController::view/$1', ['filter' => 'auth:teacher,teacher_assistant']);
+$routes->get('teacher/progress/edit/(:num)', 'ClassProgressController::edit/$1', ['filter' => 'auth:teacher,teacher_assistant']);
+$routes->post('teacher/progress/update/(:num)', 'ClassProgressController::update/$1', ['filter' => 'auth:teacher,teacher_assistant']);
 $routes->get('teacher/progress/attachment/(:num)', 'ClassProgressController::attachment/$1', ['filter' => 'auth:teacher,teacher_assistant']);
 $routes->get('teacher/progress/attachment-file/(:num)', 'ClassProgressController::attachmentFile/$1', ['filter' => 'auth:teacher,teacher_assistant']);
 $routes->get('parent/progress', 'ParentProgressController::index', ['filter' => 'auth:parent']);

app/Controllers/AdminProgressController.php

@@ -111,6 +111,23 @@ class AdminProgressController extends BaseController
         );
         $sectionStats = $this->buildSectionSubmissionStats($rows, $activeDatesSet, $expectedDays);
         $sectionSubjectCounts = $this->buildSectionSubjectCounts($rows);
+        $lowProgressSectionIds = [];
+        if ($expectedDays > 0) {
+            foreach ($filteredSections as $section) {
+                $sectionId = (int) ($section['class_section_id'] ?? 0);
+                if ($sectionId === 0) {
+                    continue;
+                }
+                $stat = $sectionStats[$sectionId] ?? null;
+                $percent = $stat['percent'] ?? 0;
+                if ($stat === null) {
+                    $percent = 0;
+                }
+                if ($percent < 50) {
+                    $lowProgressSectionIds[] = $sectionId;
+                }
+            }
+        }
 
         return view('admin/class_progress_list', [
             'reportGroupsBySection' => $reportGroupsBySection,
@@ -121,6 +138,7 @@ class AdminProgressController extends BaseController
             'sectionStats' => $sectionStats,
             'sectionSubjectCounts' => $sectionSubjectCounts,
             'expectedDays' => $expectedDays,
+            'lowProgressSectionIds' => $lowProgressSectionIds,
         ]);
     }
 
@@ -414,13 +432,11 @@ class AdminProgressController extends BaseController
         $allowedSubjects = array_values(array_filter($allowedSubjects));
 
         $counts = [];
-        $latestWeekBySection = [];
         $sectionClassMap = [];
         foreach ($rows as $row) {
             $sectionId = (int) ($row['class_section_id'] ?? 0);
             $subject = (string) ($row['subject'] ?? '');
-            $weekStart = (string) ($row['week_start'] ?? '');
-            if ($sectionId === 0 || $subject === '' || $weekStart === '') {
+            if ($sectionId === 0 || $subject === '') {
                 continue;
             }
             if (! empty($allowedSubjects) && ! in_array($subject, $allowedSubjects, true)) {
@@ -429,45 +445,41 @@ class AdminProgressController extends BaseController
             if (! isset($sectionClassMap[$sectionId])) {
                 $sectionClassMap[$sectionId] = $this->classSectionModel->getClassId($sectionId);
             }
-            if (
-                ! isset($latestWeekBySection[$sectionId])
-                || $weekStart > $latestWeekBySection[$sectionId]
-            ) {
-                $latestWeekBySection[$sectionId] = $weekStart;
-            }
         }
 
-        $curriculumChapters = $this->buildCurriculumChapterMap(array_values(array_filter($sectionClassMap)));
+        $curriculumUnits = $this->buildCurriculumUnitMap(array_values(array_filter($sectionClassMap)));
 
         foreach ($rows as $row) {
             $sectionId = (int) ($row['class_section_id'] ?? 0);
             $subject = (string) ($row['subject'] ?? '');
-            $weekStart = (string) ($row['week_start'] ?? '');
-            if ($sectionId === 0 || $subject === '' || $weekStart === '') {
+            if ($sectionId === 0 || $subject === '') {
                 continue;
             }
             if (! empty($allowedSubjects) && ! in_array($subject, $allowedSubjects, true)) {
                 continue;
             }
-            if (empty($latestWeekBySection[$sectionId]) || $weekStart !== $latestWeekBySection[$sectionId]) {
-                continue;
-            }
             $subjectSlug = $this->resolveSubjectSlug($subject);
             $classId = $sectionClassMap[$sectionId] ?? null;
-            $chapterSet = [];
-            if ($classId && $subjectSlug && ! empty($curriculumChapters[$classId][$subjectSlug])) {
-                $chapterSet = $curriculumChapters[$classId][$subjectSlug];
+            $chapterToUnit = [];
+            if ($classId && $subjectSlug && ! empty($curriculumUnits[$classId][$subjectSlug]['chapter_to_unit'])) {
+                $chapterToUnit = $curriculumUnits[$classId][$subjectSlug]['chapter_to_unit'];
+            }
+            $unitKeys = $this->extractUnitKeys((string) ($row['unit_title'] ?? ''), $chapterToUnit);
+            foreach ($unitKeys as $unitKey) {
+                $key = $subjectSlug . '|' . $unitKey;
+                $counts[$sectionId][$key] = true;
             }
-            $counts[$sectionId] = ($counts[$sectionId] ?? 0) + $this->countChapterSegments(
-                (string) ($row['unit_title'] ?? ''),
-                $chapterSet
-            );
         }
 
-        return $counts;
+        $totals = [];
+        foreach ($counts as $sectionId => $unitSet) {
+            $totals[$sectionId] = count($unitSet);
+        }
+
+        return $totals;
     }
 
-    protected function buildCurriculumChapterMap(array $classIds): array
+    protected function buildCurriculumUnitMap(array $classIds): array
     {
         $classIds = array_values(array_filter(array_map('intval', $classIds)));
         if (empty($classIds)) {
@@ -483,10 +495,15 @@ class AdminProgressController extends BaseController
             $classId = (int) ($row['class_id'] ?? 0);
             $subject = (string) ($row['subject'] ?? '');
             $chapter = trim((string) ($row['chapter_name'] ?? ''));
+            $unitNumber = $row['unit_number'] ?? null;
             if ($classId === 0 || $subject === '' || $chapter === '') {
                 continue;
             }
-            $map[$classId][$subject][$chapter] = true;
+            if ($unitNumber === null || $unitNumber === '') {
+                continue;
+            }
+            $unitKey = (string) $unitNumber;
+            $map[$classId][$subject]['chapter_to_unit'][$chapter] = $unitKey;
         }
 
         return $map;
@@ -504,46 +521,93 @@ class AdminProgressController extends BaseController
         return null;
     }
 
-    protected function countChapterSegments(string $unitTitle, array $chapterSet): int
+    protected function countUnitSegments(string $unitTitle, array $chapterToUnit): int
     {
         $unitTitle = trim($unitTitle);
         if ($unitTitle === '') {
-            return 1;
+            return 0;
         }
         $parts = array_filter(array_map('trim', explode(';', $unitTitle)), static fn ($part) => $part !== '');
         if (! $parts) {
-            return 1;
+            return 0;
         }
 
-        $count = 0;
         $seen = [];
         foreach ($parts as $part) {
-            $chapter = $this->extractChapterFromSegment($part);
-            $key = $chapter !== '' ? $chapter : $part;
-            if (! empty($chapterSet) && $chapter !== '' && empty($chapterSet[$chapter])) {
+            [$unitPart, $chapterPart] = $this->splitUnitChapterSegment($part);
+            $key = $this->resolveUnitKey($unitPart, $chapterPart, $chapterToUnit);
+            if ($key === '') {
                 $key = $part;
             }
             if (isset($seen[$key])) {
                 continue;
             }
             $seen[$key] = true;
-            $count++;
         }
 
-        return $count > 0 ? $count : 1;
+        return count($seen);
     }
 
-    protected function extractChapterFromSegment(string $segment): string
+    protected function splitUnitChapterSegment(string $segment): array
     {
         $segment = trim($segment);
         if ($segment === '') {
-            return '';
+            return ['', ''];
         }
         $pos = strrpos($segment, '/');
         if ($pos === false) {
-            return $segment;
+            return [$segment, ''];
         }
-        return trim(substr($segment, $pos + 1));
+        $unitPart = trim(substr($segment, 0, $pos));
+        $chapterPart = trim(substr($segment, $pos + 1));
+        return [$unitPart, $chapterPart];
+    }
+
+    protected function extractUnitKeys(string $unitTitle, array $chapterToUnit): array
+    {
+        $unitTitle = trim($unitTitle);
+        if ($unitTitle === '') {
+            return [];
+        }
+        $parts = array_filter(array_map('trim', explode(';', $unitTitle)), static fn ($part) => $part !== '');
+        if (! $parts) {
+            return [];
+        }
+
+        $keys = [];
+        foreach ($parts as $part) {
+            [$unitPart, $chapterPart] = $this->splitUnitChapterSegment($part);
+            $key = $this->resolveUnitKey($unitPart, $chapterPart, $chapterToUnit);
+            if ($key === '') {
+                continue;
+            }
+            $keys[$key] = true;
+        }
+
+        return array_keys($keys);
+    }
+
+    protected function resolveUnitKey(string $unitPart, string $chapterPart, array $chapterToUnit): string
+    {
+        if ($chapterPart !== '' && ! empty($chapterToUnit[$chapterPart])) {
+            return (string) $chapterToUnit[$chapterPart];
+        }
+        if (empty($chapterToUnit)) {
+            if (preg_match('/\bunit\s*(\d+)\b/i', $unitPart, $matches)) {
+                return (string) $matches[1];
+            }
+            return '';
+        }
+        if (preg_match('/\bunit\s*(\d+)\b/i', $unitPart, $matches)) {
+            return (string) $matches[1];
+        }
+        if ($unitPart !== '') {
+            return $unitPart;
+        }
+        if ($chapterPart !== '') {
+            return $chapterPart;
+        }
+        return '';
     }
 
     protected function buildSectionStat(int $submitted, int $expectedDays): array

app/Controllers/ClassProgressController.php

@@ -98,6 +98,10 @@ class ClassProgressController extends BaseController
             return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
         }
 
+        if (! $this->hasIslamicUnitSelection()) {
+            return redirect()->back()->withInput()->with('error', 'Please select at least one Islamic Studies unit.');
+        }
+
         $attachmentErrors = $this->validateAttachmentFiles($subjectSections);
         if (! empty($attachmentErrors)) {
             return redirect()->back()->withInput()->with('errors', $attachmentErrors);
@@ -119,6 +123,32 @@ class ClassProgressController extends BaseController
             return redirect()->back()->withInput()->with('error', 'No class assignment found for this report.');
         }
 
+        $confirmOverwrite = (bool) $this->request->getPost('confirm_overwrite');
+        $existingReports = $this->reportModel
+            ->select('id')
+            ->where('class_section_id', $classSectionId)
+            ->where('week_start', $weekStart)
+            ->where('teacher_id', $teacherId)
+            ->findAll();
+
+        if (! $confirmOverwrite && ! empty($existingReports)) {
+            return redirect()->back()
+                ->withInput()
+                ->with('warning', 'A progress report already exists for this week, are you sure you want to override it?')
+                ->with('confirm_overwrite', true);
+        }
+
+        if ($confirmOverwrite && ! empty($existingReports)) {
+            $existingIds = array_values(array_filter(array_map(
+                static fn (array $row): int => (int) ($row['id'] ?? 0),
+                $existingReports
+            )));
+            if (! empty($existingIds)) {
+                $this->attachmentModel->whereIn('report_id', $existingIds)->delete();
+                $this->reportModel->whereIn('id', $existingIds)->delete();
+            }
+        }
+
         $status = self::DEFAULT_STATUS;
 
         $reportsCreated = 0;
@@ -276,6 +306,231 @@ class ClassProgressController extends BaseController
         ]);
     }
 
+    public function edit($id)
+    {
+        $teacherId = (int) session()->get('user_id');
+        $row = $this->reportModel
+            ->select('class_progress_reports.*, cs.class_section_name')
+            ->join('classSection cs', 'cs.class_section_id = class_progress_reports.class_section_id', 'left')
+            ->where('class_progress_reports.id', (int) $id)
+            ->first();
+
+        if (! $row) {
+            throw new PageNotFoundException('Progress report not found.');
+        }
+
+        [$semester, $schoolYear] = $this->resolveCurrentTerm();
+        $allowedTeacherIds = $this->resolveAssignedTeacherIds((int) $row['class_section_id'], $semester, $schoolYear);
+        if (empty($allowedTeacherIds)) {
+            if ($teacherId !== (int) $row['teacher_id']) {
+                throw new PageNotFoundException('Progress report not found.');
+            }
+            $allowedTeacherIds = [(int) $row['teacher_id']];
+        } elseif (! in_array($teacherId, $allowedTeacherIds, true)) {
+            throw new PageNotFoundException('Progress report not found.');
+        }
+
+        $weeklyReports = $this->reportModel
+            ->select('class_progress_reports.*')
+            ->whereIn('teacher_id', $allowedTeacherIds)
+            ->where('class_section_id', $row['class_section_id'])
+            ->where('week_start', $row['week_start'])
+            ->orderBy('subject', 'ASC')
+            ->findAll();
+
+        $reportMap = [];
+        foreach ($weeklyReports as $report) {
+            $subject = (string) ($report['subject'] ?? '');
+            if ($subject === '') {
+                continue;
+            }
+            $reportMap[$subject] = $report;
+        }
+
+        $subjectReports = [];
+        foreach (self::SUBJECT_SECTIONS as $slug => $section) {
+            $subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
+            $report = $reportMap[$subjectName] ?? null;
+            if (! $report) {
+                continue;
+            }
+            $parsed = $this->parseUnitChapterSummary((string) ($report['unit_title'] ?? ''));
+            $subjectReports[$slug] = [
+                'report_id' => (int) ($report['id'] ?? 0),
+                'covered' => $report['covered'] ?? '',
+                'homework' => $report['homework'] ?? '',
+                'unit_title' => $report['unit_title'] ?? '',
+                'unit_values' => $parsed['units'],
+                'chapter_values' => $parsed['chapters'],
+            ];
+        }
+
+        $assignments = $this->loadTeacherSections($teacherId);
+        $classId = null;
+        $classSectionName = $row['class_section_name'] ?? '';
+        foreach ($assignments as $assignment) {
+            if ((int) ($assignment['class_section_id'] ?? 0) === (int) $row['class_section_id']) {
+                $classId = $assignment['class_id'] ?? null;
+                $classSectionName = $assignment['class_section_name'] ?? $classSectionName;
+                break;
+            }
+        }
+
+        $subjectCurriculum = [];
+        if ($classId) {
+            foreach (self::SUBJECT_SECTIONS as $slug => $section) {
+                $subjectCurriculum[$slug] = $this->curriculumModel->getOptionsForClass((int) $classId, $slug);
+            }
+        }
+
+        return view('teacher/class_progress_submit', [
+            'subjectSections' => self::SUBJECT_SECTIONS,
+            'subjectCurriculum' => $subjectCurriculum,
+            'classSectionId' => $row['class_section_id'],
+            'classSectionName' => $classSectionName,
+            'classId' => $classId,
+            'sundayOptions' => [$row['week_start']],
+            'defaultWeekStart' => $row['week_start'],
+            'existingWeekEnd' => $row['week_end'],
+            'existingReports' => $subjectReports,
+            'isEdit' => true,
+            'formAction' => base_url('teacher/progress/update/' . (int) $row['id']),
+            'submitLabel' => 'Update Progress',
+        ]);
+    }
+
+    public function update($id)
+    {
+        $teacherId = (int) session()->get('user_id');
+        $row = $this->reportModel->find((int) $id);
+        if (! $row) {
+            throw new PageNotFoundException('Progress report not found.');
+        }
+
+        [$semester, $schoolYear] = $this->resolveCurrentTerm();
+        $allowedTeacherIds = $this->resolveAssignedTeacherIds((int) $row['class_section_id'], $semester, $schoolYear);
+        if (empty($allowedTeacherIds)) {
+            if ($teacherId !== (int) $row['teacher_id']) {
+                throw new PageNotFoundException('Progress report not found.');
+            }
+            $allowedTeacherIds = [(int) $row['teacher_id']];
+        } elseif (! in_array($teacherId, $allowedTeacherIds, true)) {
+            throw new PageNotFoundException('Progress report not found.');
+        }
+
+        $subjectSections = self::SUBJECT_SECTIONS;
+        $rules = [
+            'class_section_id' => 'required|integer',
+            'week_start' => 'required|valid_date[Y-m-d]',
+            'week_end' => 'required|valid_date[Y-m-d]',
+        ];
+        foreach ($subjectSections as $slug => $section) {
+            $rules["covered_$slug"] = 'required|string';
+            $rules["homework_$slug"] = 'permit_empty|string';
+            $rules["unit_{$slug}.*"] = 'permit_empty|string|max_length[120]';
+            $rules["chapter_{$slug}.*"] = 'permit_empty|string|max_length[120]';
+        }
+
+        if (! $this->validate($rules)) {
+            return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
+        }
+
+        if (! $this->hasIslamicUnitSelection()) {
+            return redirect()->back()->withInput()->with('error', 'Please select at least one Islamic Studies unit.');
+        }
+
+        $attachmentErrors = $this->validateAttachmentFiles($subjectSections);
+        if (! empty($attachmentErrors)) {
+            return redirect()->back()->withInput()->with('errors', $attachmentErrors);
+        }
+
+        $weekStart = (string) $this->request->getPost('week_start');
+        $weekEnd = (string) $this->request->getPost('week_end');
+        if ($weekStart && ! $weekEnd) {
+            $weekEnd = $this->buildWeekEndFromStart($weekStart);
+        }
+        if ($weekStart && $weekEnd && strtotime($weekEnd) < strtotime($weekStart)) {
+            return redirect()->back()->withInput()->with('error', 'Week end must be the same as or after the week start.');
+        }
+
+        $classSectionId = (int) ($row['class_section_id'] ?? 0);
+        if ($classSectionId === 0) {
+            return redirect()->back()->withInput()->with('error', 'No class assignment found for this report.');
+        }
+
+        $weeklyReports = $this->reportModel
+            ->select('class_progress_reports.*')
+            ->whereIn('teacher_id', $allowedTeacherIds)
+            ->where('class_section_id', $classSectionId)
+            ->where('week_start', $row['week_start'])
+            ->orderBy('subject', 'ASC')
+            ->findAll();
+
+        $reportMap = [];
+        foreach ($weeklyReports as $report) {
+            $subject = (string) ($report['subject'] ?? '');
+            if ($subject === '') {
+                continue;
+            }
+            $reportMap[$subject] = $report;
+        }
+
+        $reportsUpdated = 0;
+        $flagsInput = $this->request->getPost('flags');
+        foreach ($subjectSections as $slug => $section) {
+            $covered = trim((string) $this->request->getPost("covered_$slug"));
+            if ($covered === '') {
+                continue;
+            }
+            $homework = trim((string) $this->request->getPost("homework_$slug"));
+            $unitTitle = $this->buildUnitChapterSummary($slug);
+            $subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
+            $existing = $reportMap[$subjectName] ?? null;
+            if ($unitTitle === null && $existing) {
+                $unitTitle = $existing['unit_title'] ?? null;
+            }
+
+            $data = [
+                'class_section_id' => $classSectionId,
+                'week_start' => $weekStart,
+                'week_end' => $weekEnd,
+                'subject' => $subjectName,
+                'unit_title' => $unitTitle,
+                'covered' => $covered,
+                'homework' => $homework ?: null,
+            ];
+            if ($flagsInput !== null) {
+                $data['flags_json'] = $this->normalizeFlags($flagsInput);
+            }
+
+            if ($existing) {
+                $this->reportModel->update((int) $existing['id'], $data);
+                $reportId = (int) $existing['id'];
+            } else {
+                $data['teacher_id'] = $teacherId;
+                $data['status'] = self::DEFAULT_STATUS;
+                $reportId = (int) $this->reportModel->insert($data, true);
+            }
+
+            $attachmentField = "attachment_$slug";
+            $attachments = $this->request->getFileMultiple($attachmentField) ?? [];
+            $storedAttachments = $this->storeAttachments($reportId, $attachments);
+            if (! empty($storedAttachments)) {
+                $this->attachmentModel->insertBatch($storedAttachments);
+                if (empty($existing['attachment_path'] ?? '')) {
+                    $this->reportModel->update($reportId, ['attachment_path' => $storedAttachments[0]['file_path']]);
+                }
+            }
+            $reportsUpdated++;
+        }
+
+        if ($reportsUpdated === 0) {
+            return redirect()->back()->withInput()->with('error', 'Please provide progress for at least one subject.');
+        }
+
+        return redirect()->to('teacher/progress/history')->with('success', 'Progress reports updated.');
+    }
+
     public function attachment($id)
     {
         $row = $this->reportModel->find((int)$id);
@@ -447,6 +702,45 @@ class ClassProgressController extends BaseController
         return mb_strlen($summary) > 120 ? mb_substr($summary, 0, 120) : $summary;
     }
 
+    protected function hasIslamicUnitSelection(): bool
+    {
+        $unitValues = array_map('trim', (array) $this->request->getPost('unit_islamic'));
+        foreach ($unitValues as $value) {
+            if ($value !== '') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected function parseUnitChapterSummary(string $summary): array
+    {
+        $summary = trim($summary);
+        if ($summary === '') {
+            return ['units' => [], 'chapters' => []];
+        }
+
+        $units = [];
+        $chapters = [];
+        $segments = preg_split('/\s*;\s*/', $summary, -1, PREG_SPLIT_NO_EMPTY);
+        foreach ($segments as $segment) {
+            $segment = trim($segment);
+            if ($segment === '') {
+                continue;
+            }
+            $parts = preg_split('/\s*\/\s*/', $segment, 2);
+            if (count($parts) === 2) {
+                $units[] = trim($parts[0]);
+                $chapters[] = trim($parts[1]);
+            } else {
+                $units[] = $segment;
+                $chapters[] = '';
+            }
+        }
+
+        return ['units' => $units, 'chapters' => $chapters];
+    }
+
     protected function buildSundayOptions(int $count = 12): array
     {
         $range = $this->resolveProgressDateRange();

app/Controllers/ParentProgressController.php

@@ -29,18 +29,12 @@ class ParentProgressController extends BaseController
 
     public function index()
     {
-        $sectionIds = $this->getParentSectionIds();
-        $sectionOptions = $this->buildSectionOptions($sectionIds);
+        $students = $this->getParentStudents();
+        $sectionIds = array_values(array_unique(array_filter(array_map(
+            static fn (array $student): int => (int) ($student['class_section_id'] ?? 0),
+            $students
+        ))));
         $subjectSections = ClassProgressController::SUBJECT_SECTIONS;
-        $selectedSectionId = (int) $this->request->getGet('class_section_id');
-        $validSectionIds = array_keys($sectionOptions);
-
-        if ($selectedSectionId === 0 && ! empty($validSectionIds)) {
-            $selectedSectionId = $validSectionIds[0];
-        }
-        if ($selectedSectionId && ! in_array($selectedSectionId, $validSectionIds, true)) {
-            $selectedSectionId = $validSectionIds[0] ?? null;
-        }
 
         $rows = [];
         if (! empty($sectionIds)) {
@@ -50,23 +44,32 @@ class ParentProgressController extends BaseController
                 ->join('users u', 'u.id = class_progress_reports.teacher_id', 'left')
                 ->whereIn('class_progress_reports.class_section_id', $sectionIds);
 
-            if ($selectedSectionId) {
-                $builder->where('class_progress_reports.class_section_id', $selectedSectionId);
-            }
-
             $rows = $builder
                 ->orderBy('week_start', 'DESC')
                 ->findAll();
         }
 
-        $reportGroups = $this->groupReportsByWeek($rows);
+        $studentReportGroups = [];
+        foreach ($students as $student) {
+            $studentId = (int) ($student['student_id'] ?? 0);
+            if ($studentId === 0) {
+                continue;
+            }
+            $classSectionId = (int) ($student['class_section_id'] ?? 0);
+            $studentRows = $classSectionId
+                ? array_values(array_filter(
+                    $rows,
+                    static fn (array $row): bool => (int) ($row['class_section_id'] ?? 0) === $classSectionId
+                ))
+                : [];
+            $studentReportGroups[$studentId] = $this->groupReportsByWeek($studentRows);
+        }
 
         return view('parent/class_progress_list', [
-            'reportGroups' => $reportGroups,
+            'students' => $students,
+            'studentReportGroups' => $studentReportGroups,
             'subjectSections' => $subjectSections,
-            'classSectionOptions' => $sectionOptions,
-            'selectedSectionId' => $selectedSectionId,
-            'hasSections' => ! empty($sectionIds),
+            'hasStudents' => ! empty($students),
         ]);
     }
 
@@ -198,20 +201,53 @@ class ParentProgressController extends BaseController
         return $options;
     }
 
+    protected function getParentStudents(): array
+    {
+        $parentId = (int) session()->get('user_id');
+        if ($parentId === 0) {
+            return [];
+        }
+
+        $rows = $this->db->table('enrollments e')
+            ->select('e.student_id, e.class_section_id, e.updated_at, e.created_at, s.firstname, s.lastname, cs.class_section_name')
+            ->join('students s', 's.id = e.student_id')
+            ->join('classSection cs', 'cs.class_section_id = e.class_section_id', 'left')
+            ->where('e.parent_id', $parentId)
+            ->where('e.is_withdrawn', 0)
+            ->orderBy('e.updated_at', 'DESC')
+            ->orderBy('e.created_at', 'DESC')
+            ->get()
+            ->getResultArray();
+
+        $students = [];
+        foreach ($rows as $row) {
+            $studentId = (int) ($row['student_id'] ?? 0);
+            if ($studentId === 0 || isset($students[$studentId])) {
+                continue;
+            }
+            $students[$studentId] = $row;
+        }
+
+        return array_values($students);
+    }
+
     protected function groupReportsByWeek(array $rows): array
     {
         $reportGroups = [];
         foreach ($rows as $row) {
             $row['status_label'] = ClassProgressController::STATUS_OPTIONS[$row['status']] ?? 'Unknown';
-            $key = $row['week_start'] ?? '';
-            if ($key === '') {
+            $weekStart = $row['week_start'] ?? '';
+            $sectionId = (int) ($row['class_section_id'] ?? 0);
+            if ($weekStart === '' || $sectionId === 0) {
                 continue;
             }
+            $key = $weekStart . ':' . $sectionId;
             if (! isset($reportGroups[$key])) {
                 $reportGroups[$key] = [
                     'week_start' => $row['week_start'] ?? '',
                     'week_end' => $row['week_end'] ?? '',
                     'class_section_name' => $row['class_section_name'] ?? '',
+                    'class_section_id' => $sectionId,
                     'reports' => [],
                 ];
             }

app/Controllers/View/AdministratorController.php

@@ -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;
@@ -696,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',
@@ -715,11 +728,91 @@ 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->resolveExamDraftDeadline($semester, $schoolYear);
+        $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) {
@@ -745,7 +838,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' => [],
                 ];
             }
@@ -765,35 +858,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;
                     }
@@ -807,13 +914,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) {
@@ -824,7 +933,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') {
@@ -833,14 +942,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) {
@@ -861,18 +973,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,
@@ -880,6 +1001,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,
             ];
@@ -941,15 +1065,181 @@ class AdministratorController extends BaseController
             'schoolYear' => $schoolYear,
             'notificationHistory' => $historyMap,
             'summary' => $summary,
+            'lowProgressSectionIds' => $lowProgressSectionIds,
         ]);
     }
 
+    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) {
@@ -1006,6 +1296,9 @@ 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');
         $sentCount = 0;
         $failCount = 0;
 
@@ -1021,6 +1314,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),
@@ -1033,10 +1333,45 @@ 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>";
+            }
+            $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'] ?? '';
@@ -1098,6 +1433,116 @@ 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,
+        ];
+    }
+
+    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 [
@@ -1107,14 +1552,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 = [];

app/Controllers/View/AssignmentController.php

@@ -119,7 +119,12 @@ class AssignmentController extends BaseController
         }
 
         $students = [];
+        $seenStudentIds = [];
         foreach ($studentClasses as $studentClass) {
+            $sid = (int)($studentClass['student_id'] ?? 0);
+            if ($sid <= 0 || isset($seenStudentIds[$sid])) {
+                continue;
+            }
             if ($sectionSemester === '' && !empty($studentClass['semester'])) {
                 $sectionSemester = (string)$studentClass['semester'];
             }
@@ -149,6 +154,7 @@ class AssignmentController extends BaseController
                 'tuition_paid'        => esc($student['tuition_paid'] ? 'Yes' : 'No'),
                 'school_id'           => esc($student['school_id']),
             ];
+            $seenStudentIds[$sid] = true;
         }
 
         $sectionSemesterDisplay = $sectionSemester !== '' ? $sectionSemester : ((string)($this->semester ?? ''));

app/Controllers/View/AttendanceController.php

@@ -1004,9 +1004,13 @@ public function showUpdateAttendanceForm()
             }
 
             $hasRoster = false;
+            $seenStudents = [];
 
             foreach ($students as $sc) {
                 $studentId = (int)$sc['student_id'];
+                if ($studentId <= 0 || isset($seenStudents[$studentId])) {
+                    continue;
+                }
                 $student   = $this->studentModel
                     ->select('id, firstname, lastname, school_id')
                     ->find($studentId);
@@ -1014,6 +1018,7 @@ public function showUpdateAttendanceForm()
 
                 $studentsBySection[$secCode][] = $student;
                 $hasRoster = true;
+                $seenStudents[$studentId] = true;
 
                 // Attendance history
                 $qb = $this->attendanceDataModel

app/Controllers/View/ExamDraftController.php

@@ -240,23 +240,23 @@ class ExamDraftController extends BaseController
         // Group legacy uploads (admin-uploaded finalized exams) by class_section for separate tab
         $legacyByClass = [];
         if ($this->hasIsLegacyColumn) {
-            // Keep all submissions visible; additionally surface legacy items in a separate tab
-            $drafts = $allDrafts;
-
+            // Keep legacy items out of the main submissions list; show them in the legacy tab only.
+            $drafts = [];
             foreach ($allDrafts as $d) {
                 $isLegacy = !empty($d['is_legacy']);
-                if (!$isLegacy) {
+                if ($isLegacy) {
+                    $cid = (int)($d['class_section_id'] ?? 0);
+                    if (!isset($legacyByClass[$cid])) {
+                        $legacyByClass[$cid] = [
+                            'class_section_id' => $cid,
+                            'class_section_name' => $d['class_section_name'] ?? 'Class ' . $cid,
+                            'items' => [],
+                        ];
+                    }
+                    $legacyByClass[$cid]['items'][] = $d;
                     continue;
                 }
-                $cid = (int)($d['class_section_id'] ?? 0);
-                if (!isset($legacyByClass[$cid])) {
-                    $legacyByClass[$cid] = [
-                        'class_section_id' => $cid,
-                        'class_section_name' => $d['class_section_name'] ?? 'Class ' . $cid,
-                        'items' => [],
-                    ];
-                }
-                $legacyByClass[$cid]['items'][] = $d;
+                $drafts[] = $d;
             }
         } else {
             // Column missing: keep behavior simple and avoid legacy tab
@@ -284,13 +284,17 @@ class ExamDraftController extends BaseController
             return redirect()->to('/login');
         }
 
-        $classSectionId = (int) ($this->request->getPost('class_section_id') ?? 0);
+        $classSectionIds = $this->request->getPost('class_section_ids');
+        if (!is_array($classSectionIds)) {
+            $classSectionIds = [$classSectionIds];
+        }
+        $classSectionIds = array_values(array_filter(array_map('intval', $classSectionIds)));
         $schoolYear = trim((string) ($this->request->getPost('school_year') ?? $this->schoolYear));
         $semester = trim((string) ($this->request->getPost('semester') ?? $this->semester));
         $examType = trim((string) $this->request->getPost('exam_type'));
 
-        if ($classSectionId <= 0) {
-            return redirect()->back()->withInput()->with('error', 'Select a class section.');
+        if (empty($classSectionIds)) {
+            return redirect()->back()->withInput()->with('error', 'Select at least one class section.');
         }
         if ($schoolYear === '') {
             return redirect()->back()->withInput()->with('error', 'School year is required.');
@@ -309,9 +313,17 @@ class ExamDraftController extends BaseController
             return redirect()->back()->withInput()->with('error', 'File type not allowed or upload failed.');
         }
 
-        $payload = [
+        $pdfName = null;
+        if (strtolower($file->getClientExtension()) === 'pdf') {
+            $pdfName = $stored;
+        } else {
+            $pdfName = $this->convertDocToPdf(
+                $this->fullUploadPath(self::FINAL_UPLOAD_DIR, $stored),
+                self::FINAL_UPLOAD_DIR
+            );
+        }
+        $basePayload = [
             'teacher_id' => $adminId, // store under admin user since legacy uploads are admin-only
-            'class_section_id' => $classSectionId,
             'semester' => ucfirst(strtolower($semester)),
             'school_year' => $schoolYear,
             'exam_type' => $examType === '' ? null : $examType,
@@ -325,23 +337,22 @@ class ExamDraftController extends BaseController
             'version' => 1,
         ];
         if ($this->hasIsLegacyColumn) {
-            $payload['is_legacy'] = 1;
-        }
-
-        $pdfName = null;
-        if (strtolower($file->getClientExtension()) === 'pdf') {
-            $pdfName = $stored;
-        } else {
-            $pdfName = $this->convertDocToPdf(
-                $this->fullUploadPath(self::FINAL_UPLOAD_DIR, $stored),
-                self::FINAL_UPLOAD_DIR
-            );
+            $basePayload['is_legacy'] = 1;
         }
         if ($pdfName !== null && $this->hasFinalPdfColumn) {
-            $payload['final_pdf_file'] = $pdfName;
+            $basePayload['final_pdf_file'] = $pdfName;
         }
 
-        if ($this->examDraftModel->insert($payload)) {
+        $saved = 0;
+        foreach ($classSectionIds as $classSectionId) {
+            $payload = $basePayload;
+            $payload['class_section_id'] = $classSectionId;
+            if ($this->examDraftModel->insert($payload)) {
+                $saved++;
+            }
+        }
+
+        if ($saved > 0) {
             return redirect()->to('/administrator/exam-drafts')->with('success', 'Old exam uploaded successfully.');
         }
 

app/Controllers/View/GradingController.php

@@ -278,7 +278,7 @@ class GradingController extends Controller
         $semEsc = $this->db->escape($semester);
         $yrEsc  = $this->db->escape($schoolYear);
 
-        $rows = $this->buildGradingRows($semEsc, $yrEsc, $schoolYear);
+        $rows = $this->buildGradingRows($semEsc, $yrEsc, $schoolYear, $semester);
 
         // Preload quiz/homework/project/participation/midterm score counts to distinguish true zeros from empty scores
         $quizCounts = [];
@@ -424,7 +424,7 @@ class GradingController extends Controller
                 }
             }
             // Reload rows after refresh
-            $rows = $this->buildGradingRows($semEsc, $yrEsc, $schoolYear);
+            $rows = $this->buildGradingRows($semEsc, $yrEsc, $schoolYear, $semester);
         }
 
         // Build structures keyed by BUSINESS section id
@@ -1577,7 +1577,7 @@ class GradingController extends Controller
      * @param string $schoolYear Raw school year value for filtering student_class
      * @return array
      */
-    private function buildGradingRows(string $semEsc, string $yrEsc, string $schoolYear): array
+    private function buildGradingRows(string $semEsc, string $yrEsc, string $schoolYear, string $semesterRaw): array
     {
         $builder = $this->db->table('student_class sc')
             ->select([
@@ -1605,6 +1605,7 @@ class GradingController extends Controller
                 'ss_b.class_section_id        AS matched_biz_csid',
                 'ss_p.class_section_id        AS matched_pk_csid'
             ])
+            ->distinct()
             ->join('`classSection` cs', 'cs.class_section_id = sc.class_section_id', 'left')
             ->join('students s', 's.id = sc.student_id', 'inner')
             ->join(

app/Controllers/View/HomeworkController.php

@@ -482,6 +482,7 @@ class HomeworkController extends Controller
         // Step 1: Get student IDs from student_class table
         $studentClassRows = $this->studentClassModel
             ->select('student_id')
+            ->distinct()
             ->where('class_section_id', $classSectionId)
             ->where('school_year', $schoolYear)
             ->findAll();
@@ -534,10 +535,7 @@ class HomeworkController extends Controller
     private function getStudentsWithHomeworkScores($classSectionId, $homeworkHeaders, $semester, $schoolYear)
     {
         $semVariants = $this->getSemesterVariants($semester);
-        $studentClasses = $this->studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
+        $studentClasses = $this->studentClassModel->getClassStudents($classSectionId, $schoolYear, null);
         $students = [];
 
         foreach ($studentClasses as $sc) {

app/Controllers/View/ProjectController.php

@@ -438,6 +438,7 @@ class ProjectController extends Controller
         // Step 1: Get student IDs from student_class table
         $studentClassRows = $studentClassModel
             ->select('student_id')
+            ->distinct()
             ->where('class_section_id', $classSectionId)
             ->where('school_year', $schoolYear)
             ->findAll();
@@ -494,10 +495,7 @@ class ProjectController extends Controller
         $studentModel = new StudentModel();
         $projectModel = new ProjectModel();
 
-        $studentClasses = $studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
+        $studentClasses = $studentClassModel->getClassStudents($classSectionId, $this->schoolYear, null);
         $students = [];
 
         foreach ($studentClasses as $sc) {

app/Controllers/View/ScorePredictor.php

@@ -81,10 +81,10 @@ class ScorePredictor extends Controller
         s.school_id,
         s.firstname,
         s.lastname,
-        fall.semester_score as fall_score,
-        spring.semester_score as spring_score');
-        // Also select class section for per-class trophy decision
-        $builder->select('sc.class_section_id as class_section_id');
+        MAX(fall.semester_score) as fall_score,
+        MAX(spring.semester_score) as spring_score');
+        // Reduce duplication from restored students while keeping a stable class section.
+        $builder->select('MAX(sc.class_section_id) as class_section_id');
         $yearEsc = $this->db->escape($selectedYear);
         $builder->join('student_class sc', 'sc.student_id = s.id AND sc.school_year = ' . $yearEsc, 'left');
         $builder->join('classSection cs', 'cs.class_section_id = sc.class_section_id', 'left');

app/Views/admin/class_progress_list.php

@@ -25,6 +25,23 @@
         <h3 class="mb-0">Class Progress Reports</h3>
         <div class="text-muted">Filter by week, class, and status</div>
       </div>
+      <div>
+        <?php
+          $lowProgressSectionIds = $lowProgressSectionIds ?? [];
+          $lowProgressQuery = implode(',', $lowProgressSectionIds);
+          $lowProgressUrl = base_url('administrator/teacher-submissions');
+          if ($lowProgressQuery !== '') {
+            $lowProgressUrl .= '?low_progress_sections=' . rawurlencode($lowProgressQuery);
+          }
+        ?>
+        <a
+          class="btn btn-sm btn-outline-warning <?= empty($lowProgressSectionIds) ? 'disabled' : '' ?>"
+          href="<?= esc($lowProgressUrl) ?>"
+          <?= empty($lowProgressSectionIds) ? 'tabindex="-1" aria-disabled="true"' : '' ?>
+        >
+          Teachers &lt; 50%
+        </a>
+      </div>
     </div>
   </div>
 
@@ -115,7 +132,7 @@
                 $submissionLabel = $expectedDays > 0
                   ? ('Submitted: ' . (int) $stat['submitted'] . ' / ' . (int) $expectedDays . ' (' . $percentLabel . ')')
                   : 'Submitted: N/A';
-                $subjectLabel = 'Subjects: ' . $subjectCount;
+                $subjectLabel = 'Units: ' . $subjectCount;
               ?>
               <div class="accordion-item mb-2">
                 <h2 class="accordion-header" id="<?= esc($headingId) ?>">
@@ -151,12 +168,33 @@
                                   $weekLabel .= ' – ' . date('M d, Y', strtotime($group['week_end']));
                                 }
                                 $reports = $group['reports'] ?? [];
-                                $teacherName = '';
+                                $teacherCounts = [];
+                                $teacherLatest = [];
                                 foreach ($reports as $report) {
-                                  if (! empty($report['teacher_name'])) {
-                                    $teacherName = $report['teacher_name'];
-                                    break;
+                                  $name = trim((string) ($report['teacher_name'] ?? ''));
+                                  if ($name === '') {
+                                    continue;
                                   }
+                                  $teacherCounts[$name] = ($teacherCounts[$name] ?? 0) + 1;
+                                  $stamp = (string) ($report['updated_at'] ?? $report['created_at'] ?? '');
+                                  if ($stamp !== '' && (!isset($teacherLatest[$name]) || $stamp > $teacherLatest[$name])) {
+                                    $teacherLatest[$name] = $stamp;
+                                  }
+                                }
+                                $teacherLabel = '-';
+                                if (!empty($teacherCounts)) {
+                                  $bestName = '';
+                                  $bestCount = -1;
+                                  $bestStamp = '';
+                                  foreach ($teacherCounts as $name => $count) {
+                                    $stamp = $teacherLatest[$name] ?? '';
+                                    if ($count > $bestCount || ($count === $bestCount && $stamp > $bestStamp)) {
+                                      $bestName = $name;
+                                      $bestCount = $count;
+                                      $bestStamp = $stamp;
+                                    }
+                                  }
+                                  $teacherLabel = $bestName ?: '-';
                                 }
                                 $exampleId = $reports ? reset($reports)['id'] : null;
                               ?>
@@ -181,7 +219,7 @@
                                     <?php endforeach; ?>
                                   </div>
                                 </td>
-                                <td><?= esc($teacherName ?: '-') ?></td>
+                                <td><?= esc($teacherLabel) ?></td>
                                 <td class="text-end">
                                   <?php if ($exampleId): ?>
                                     <a class="btn btn-sm btn-outline-primary" href="<?= base_url('admin/progress/view/' . $exampleId) ?>">View</a>

app/Views/administrator/daily_attendance.php

@@ -696,7 +696,17 @@
                   </tr>
                 </thead>
                 <tbody>
-                  <?php foreach ($studentsBySection[$sectionKey] as $student): ?>
+                  <?php
+                    $uniqueStudents = [];
+                    foreach ($studentsBySection[$sectionKey] as $student) {
+                      $sid = (int)($student['id'] ?? 0);
+                      if ($sid <= 0 || isset($uniqueStudents[$sid])) {
+                        continue;
+                      }
+                      $uniqueStudents[$sid] = $student;
+                    }
+                  ?>
+                  <?php foreach ($uniqueStudents as $student): ?>
                     <?php
                     $sid      = (int)$student['id'];
                     $entryMap = $recAt($__attendanceData[$sectionKey][$sid] ?? []);

app/Views/administrator/exam_drafts.php

@@ -182,13 +182,13 @@
                     <form method="post" action="<?= base_url('/administrator/exam-drafts/upload-legacy') ?>" enctype="multipart/form-data" class="row g-3">
                         <?= csrf_field() ?>
                         <div class="col-md-4">
-                            <label class="form-label small">Class Section</label>
-                            <select name="class_section_id" class="form-select" required>
-                                <option value="">Select class</option>
+                            <label class="form-label small">Class Sections</label>
+                            <select name="class_section_ids[]" class="form-select" multiple required>
                                 <?php foreach ($classSections as $cs): ?>
                                     <option value="<?= esc($cs['class_section_id']) ?>"><?= esc($cs['class_section_name']) ?></option>
                                 <?php endforeach; ?>
                             </select>
+                            <div class="form-text">Hold Ctrl (Windows) or Command (Mac) to select multiple sections.</div>
                         </div>
                         <div class="col-md-2">
                             <label class="form-label small">School Year</label>

app/Views/administrator/teacher_submissions.php

@@ -21,6 +21,28 @@
       $totalItems = max(0, (int)($summary['total_items'] ?? 0));
     ?>
     <div class="card-body">
+      <?php
+        $termExamLabel = (isset($semester) && strtolower((string) $semester) === 'spring') ? 'Final' : 'Midterm';
+      ?>
+      <?php if (session()->getFlashdata('success')): ?>
+        <div class="alert alert-success">
+          <?= esc(session()->getFlashdata('success')) ?>
+        </div>
+      <?php elseif (session()->getFlashdata('warning')): ?>
+        <div class="alert alert-warning">
+          <?= esc(session()->getFlashdata('warning')) ?>
+        </div>
+      <?php elseif (session()->getFlashdata('info')): ?>
+        <div class="alert alert-info">
+          <?= esc(session()->getFlashdata('info')) ?>
+        </div>
+      <?php endif; ?>
+      <?php $lowProgressSectionIds = $lowProgressSectionIds ?? []; ?>
+      <?php if (!empty($lowProgressSectionIds)): ?>
+        <div class="alert alert-warning">
+          Showing teachers for class sections with progress submissions below 50%.
+        </div>
+      <?php endif; ?>
       <div class="border rounded-3 p-3 mb-4 bg-light">
         <div class="d-flex flex-wrap gap-4 align-items-center">
           <div>
@@ -56,17 +78,63 @@
           >
             <thead class="table-light">
               <tr>
-                <th>Class Section</th>
-                <th>Teacher</th>
-                <th class="text-center">Midterm Score</th>
-                <th class="text-center">Midterm Comment</th>
-                <th class="text-center">Participation</th>
-                <th class="text-center">PTAP Comment</th>
+                <th>Class-Section</th>
+                <th>Teachers Name</th>
+                <th class="text-center">
+                  <?= esc($termExamLabel) ?> Score
+                  <div class="form-check d-inline-flex align-items-center gap-1 ms-2">
+                    <input class="form-check-input" type="checkbox" name="notify_midterm_score" id="notifyMidtermScore" value="1">
+                    <label class="form-check-label small" for="notifyMidtermScore">Include</label>
+                  </div>
+                </th>
+                <th class="text-center">
+                  <?= esc($termExamLabel) ?> Comment
+                  <div class="form-check d-inline-flex align-items-center gap-1 ms-2">
+                    <input class="form-check-input" type="checkbox" name="notify_midterm_comment" id="notifyMidtermComment" value="1">
+                    <label class="form-check-label small" for="notifyMidtermComment">Include</label>
+                  </div>
+                </th>
+                <th class="text-center">
+                  Participation
+                  <div class="form-check d-inline-flex align-items-center gap-1 ms-2">
+                    <input class="form-check-input" type="checkbox" name="notify_participation" id="notifyParticipation" value="1">
+                    <label class="form-check-label small" for="notifyParticipation">Include</label>
+                  </div>
+                </th>
+                <th class="text-center">
+                  PTAP Comment
+                  <div class="form-check d-inline-flex align-items-center gap-1 ms-2">
+                    <input class="form-check-input" type="checkbox" name="notify_ptap_comment" id="notifyPtapComment" value="1">
+                    <label class="form-check-label small" for="notifyPtapComment">Include</label>
+                  </div>
+                </th>
+                <th class="text-center">
+                  Class Progress
+                  <div class="form-check d-inline-flex align-items-center gap-1 ms-2">
+                    <input class="form-check-input" type="checkbox" name="notify_class_progress" id="notifyClassProgress" value="1">
+                    <label class="form-check-label small" for="notifyClassProgress">Include</label>
+                  </div>
+                </th>
+                <th class="text-center">
+                  Exam Draft
+                  <div class="form-check d-inline-flex align-items-center gap-1 ms-2">
+                    <input class="form-check-input" type="checkbox" name="notify_exam_draft" id="notifyExamDraft" value="1">
+                    <label class="form-check-label small" for="notifyExamDraft">Include</label>
+                  </div>
+                </th>
+                <th class="text-center">
+                  Homework
+                  <div class="form-check d-inline-flex align-items-center gap-1 ms-2">
+                    <input class="form-check-input" type="checkbox" name="homework_notify_all" id="homeworkNotifyAll" value="1">
+                    <label class="form-check-label small" for="homeworkNotifyAll">Include</label>
+                  </div>
+                </th>
                 <th class="text-center">Notifications</th>
               </tr>
             </thead>
             <tbody>
               <?php if (!empty($rows)): ?>
+                <?php $homeworkToggleRendered = false; ?>
                 <?php foreach ($rows as $row): ?>
                   <tr>
                     <td><?= esc($row['class_section']) ?></td>
@@ -83,7 +151,9 @@
                       'midterm_score_status',
                       'midterm_comment_status',
                       'participation_status',
-                      'ptap_comment_status'
+                      'ptap_comment_status',
+                      'class_progress_status',
+                      'exam_draft_status',
                     ] as $statusKey): ?>
                       <?php $status = $row[$statusKey] ?? ['label' => 'N/A', 'badge' => 'bg-secondary']; ?>
                       <td class="text-center">
@@ -95,6 +165,15 @@
                         <?php endif; ?>
                       </td>
                     <?php endforeach; ?>
+                    <?php $homeworkStatus = $row['homework_status'] ?? ['label' => 'N/A', 'badge' => 'bg-secondary']; ?>
+                    <td class="text-center">
+                      <span class="badge <?= esc($homeworkStatus['badge'] ?? 'bg-secondary') ?>">
+                        <?= esc($homeworkStatus['label'] ?? 'N/A') ?>
+                      </span>
+                      <?php if (!empty($homeworkStatus['detail'])): ?>
+                        <div class="small text-muted"><?= esc($homeworkStatus['detail']) ?></div>
+                      <?php endif; ?>
+                    </td>
                     <td>
                       <?php if (!empty($row['teachers'])): ?>
                         <?php $missingPayload = base64_encode(json_encode($row['missing_items'] ?? [])); ?>

app/Views/parent/class_progress_list.php

@@ -7,79 +7,105 @@
       <div class="text-muted">Review the weekly reports your child’s teachers submit.</div>
     </div>
     <div class="text-end text-muted small">
-      Reports are grouped by Sunday; click any row to read the full details.
+      Reports are grouped by student; click a name to expand weekly details.
     </div>
   </div>
 
-  <?php if (! $hasSections): ?>
+  <?php if (! $hasStudents): ?>
     <div class="alert alert-info">
       We couldn’t find any current enrollment for your account. Once your child is assigned to a Sunday class, their teacher’s progress reports will appear here.
     </div>
   <?php endif; ?>
 
-  <?php if (empty($reportGroups)): ?>
-    <div class="alert alert-secondary">No reports submitted yet.</div>
-  <?php else: ?>
-    <div class="card shadow-sm">
-      <div class="table-responsive">
-        <table class="table table-hover align-middle mb-0">
-          <thead class="table-light">
-            <tr>
-              <th>Week</th>
-              <th>Subjects</th>
-              <th class="text-end">Details</th>
-            </tr>
-          </thead>
-          <tbody>
-            <?php foreach ($reportGroups as $group): ?>
-              <?php
-                $start = $group['week_start'] ?? '';
-                $end = $group['week_end'] ?? '';
-                $weekLabel = $start ? date('M d, Y', strtotime($start)) : '-';
-                if ($end) {
-                  $weekLabel .= ' – ' . date('M d, Y', strtotime($end));
-                }
-                $reports = $group['reports'] ?? [];
-                $exampleReport = $reports ? reset($reports) : null;
-              ?>
-              <tr>
-                <td>
-                  <div class="fw-semibold"><?= esc($weekLabel) ?></div>
-                  <?php if (!empty($group['class_section_name'])): ?>
-                    <div class="text-muted small">Class: <?= esc($group['class_section_name']) ?></div>
-                  <?php endif; ?>
-                </td>
-                <td>
-                  <div class="d-flex flex-column gap-2">
-                    <?php foreach ($subjectSections as $slug => $section): ?>
-                      <?php
-                        $subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
-                        $report = $reports[$subjectName] ?? null;
-                        $statusLabel = $report ? ($report['status_label'] ?? 'Unknown') : 'No submission';
-                        $badgeClass = $report ? 'bg-secondary' : 'bg-light text-muted';
-                      ?>
-                      <div class="border rounded-3 p-2">
-                        <div class="d-flex justify-content-between align-items-center">
-                          <strong class="small mb-0"><?= esc($section['label'] ?? $subjectName) ?></strong>
-                          <span class="badge <?= esc($badgeClass) ?>"><?= esc($statusLabel) ?></span>
-                        </div>
-                        <div class="small text-muted">
-                          <?= $report ? esc($report['unit_title'] ?: '-') : 'No submission' ?>
-                        </div>
-                      </div>
-                    <?php endforeach; ?>
-                  </div>
-                </td>
-                <td class="text-end">
-                  <?php if ($exampleReport): ?>
-                    <a href="<?= base_url('parent/progress/view/' . $exampleReport['id']) ?>" class="btn btn-sm btn-outline-primary">View Weekly Details</a>
-                  <?php endif; ?>
-                </td>
-              </tr>
-            <?php endforeach; ?>
-          </tbody>
-        </table>
-      </div>
+  <?php if (! empty($students)): ?>
+    <div class="accordion" id="parentProgressAccordion">
+      <?php foreach ($students as $index => $student): ?>
+        <?php
+          $studentId = (int) ($student['student_id'] ?? 0);
+          $studentName = trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? ''));
+          $studentName = $studentName !== '' ? $studentName : 'Student';
+          $className = $student['class_section_name'] ?? '';
+          $collapseId = 'student-progress-' . $studentId;
+          $headingId = 'student-progress-heading-' . $studentId;
+          $reportGroups = $studentReportGroups[$studentId] ?? [];
+        ?>
+        <div class="accordion-item">
+          <h2 class="accordion-header" id="<?= esc($headingId) ?>">
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<?= esc($collapseId) ?>" aria-expanded="false" aria-controls="<?= esc($collapseId) ?>">
+              <div class="d-flex flex-column flex-md-row align-items-md-center gap-1 gap-md-3">
+                <span class="fw-semibold"><?= esc($studentName) ?></span>
+                <?php if ($className !== ''): ?>
+                  <span class="text-muted small">Class: <?= esc($className) ?></span>
+                <?php endif; ?>
+              </div>
+            </button>
+          </h2>
+          <div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="<?= esc($headingId) ?>" data-bs-parent="#parentProgressAccordion">
+            <div class="accordion-body">
+              <?php if (empty($reportGroups)): ?>
+                <div class="alert alert-secondary mb-0">No reports submitted yet.</div>
+              <?php else: ?>
+                <div class="table-responsive">
+                  <table class="table table-hover align-middle mb-0">
+                    <thead class="table-light">
+                      <tr>
+                        <th>Week</th>
+                        <th>Subjects</th>
+                        <th class="text-end">Details</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <?php foreach ($reportGroups as $group): ?>
+                        <?php
+                          $start = $group['week_start'] ?? '';
+                          $end = $group['week_end'] ?? '';
+                          $weekLabel = $start ? date('M d, Y', strtotime($start)) : '-';
+                          if ($end) {
+                            $weekLabel .= ' – ' . date('M d, Y', strtotime($end));
+                          }
+                          $reports = $group['reports'] ?? [];
+                          $exampleReport = $reports ? reset($reports) : null;
+                        ?>
+                        <tr>
+                          <td>
+                            <div class="fw-semibold"><?= esc($weekLabel) ?></div>
+                          </td>
+                          <td>
+                            <div class="d-flex flex-column gap-2">
+                              <?php foreach ($subjectSections as $slug => $section): ?>
+                                <?php
+                                  $subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
+                                  $report = $reports[$subjectName] ?? null;
+                                  $statusLabel = $report ? ($report['status_label'] ?? 'Unknown') : 'No submission';
+                                  $badgeClass = $report ? 'bg-secondary' : 'bg-light text-muted';
+                                ?>
+                                <div class="border rounded-3 p-2">
+                                  <div class="d-flex justify-content-between align-items-center">
+                                    <strong class="small mb-0"><?= esc($section['label'] ?? $subjectName) ?></strong>
+                                    <span class="badge <?= esc($badgeClass) ?>"><?= esc($statusLabel) ?></span>
+                                  </div>
+                                  <div class="small text-muted">
+                                    <?= $report ? esc($report['unit_title'] ?: '-') : 'No submission' ?>
+                                  </div>
+                                </div>
+                              <?php endforeach; ?>
+                            </div>
+                          </td>
+                          <td class="text-end">
+                            <?php if ($exampleReport): ?>
+                              <a href="<?= base_url('parent/progress/view/' . $exampleReport['id']) ?>" class="btn btn-sm btn-outline-primary">View Weekly Details</a>
+                            <?php endif; ?>
+                          </td>
+                        </tr>
+                      <?php endforeach; ?>
+                    </tbody>
+                  </table>
+                </div>
+              <?php endif; ?>
+            </div>
+          </div>
+        </div>
+      <?php endforeach; ?>
     </div>
   <?php endif; ?>
 </div>

app/Views/rolepermission/assign_role.php

@@ -250,6 +250,30 @@
             modalInstance.show();
         };
 
+        const renderNameCell = (user) => {
+            const td = document.createElement('td');
+            const fullName = `${user?.firstname ?? ''} ${user?.lastname ?? ''}`.trim();
+            const label = fullName !== '' ? fullName : '—';
+            const roleList = Array.isArray(user?.roles)
+                ? user.roles.map((role) => (role || '').toString().toLowerCase())
+                : [];
+            const isParent = roleList.includes('parent');
+            const uid = Number(user?.id || 0);
+
+            if (isParent && uid > 0) {
+                const link = document.createElement('a');
+                link.href = '#';
+                link.className = 'text-decoration-none';
+                link.setAttribute('data-family-guardian-id', String(uid));
+                link.textContent = label;
+                td.appendChild(link);
+                return td;
+            }
+
+            td.textContent = label;
+            return td;
+        };
+
         const renderTable = () => {
             if (!tableBody) return;
 
@@ -280,9 +304,7 @@
                 accountCell.textContent = user.account_id ?? '';
                 row.appendChild(accountCell);
 
-                const nameCell = document.createElement('td');
-                nameCell.textContent = `${user.firstname ?? ''} ${user.lastname ?? ''}`.trim();
-                row.appendChild(nameCell);
+                row.appendChild(renderNameCell(user));
 
                 const emailCell = document.createElement('td');
                 emailCell.textContent = user.email ?? '';

app/Views/teacher/class_progress_history.php

@@ -90,6 +90,7 @@
                 <td class="text-end">
                   <?php if ($exampleReport): ?>
                     <a href="<?= base_url('teacher/progress/view/' . $exampleReport['id']) ?>" class="btn btn-sm btn-outline-primary">View Weekly Details</a>
+                    <a href="<?= base_url('teacher/progress/edit/' . $exampleReport['id']) ?>" class="btn btn-sm btn-outline-secondary ms-1">Edit</a>
                   <?php endif; ?>
                 </td>
               </tr>

app/Views/teacher/class_progress_submit.php

@@ -1,12 +1,16 @@
 <?= $this->extend('layout/main_layout') ?>
 <?= $this->section('content') ?>
 <?php
+  $isEdit = (bool) ($isEdit ?? false);
+  $formAction = $formAction ?? base_url('teacher/progress/store');
+  $submitLabel = $submitLabel ?? 'Submit Progress';
   $hasClass = !empty($classSectionId);
   $assignedClassName = $classSectionName ?? '';
   $sundayOptions = $sundayOptions ?? [];
   $defaultWeekStart = $defaultWeekStart ?? ($sundayOptions[0] ?? '');
   $weekStartSelected = set_value('week_start', $defaultWeekStart);
-  $weekEndValue = set_value('week_end');
+  $weekEndValue = set_value('week_end', $existingWeekEnd ?? '');
+  $existingReports = $existingReports ?? [];
   if (!$weekEndValue && $weekStartSelected) {
       try {
           $dt = new \DateTime($weekStartSelected);
@@ -31,9 +35,15 @@
   <div class="d-flex flex-wrap align-items-center justify-content-between mb-3">
     <div>
       <h3 class="mb-0">
-        <?= esc($classSectionName ? "Class {$classSectionName} Progress Submission" : 'Class Progress Submission') ?>
+        <?php if ($isEdit): ?>
+          <?= esc($classSectionName ? "Edit {$classSectionName} Progress" : 'Edit Class Progress') ?>
+        <?php else: ?>
+          <?= esc($classSectionName ? "Class {$classSectionName} Progress Submission" : 'Class Progress Submission') ?>
+        <?php endif; ?>
       </h3>
-      <div class="text-muted">Submit weekly progress for a single subject</div>
+      <div class="text-muted">
+        <?= $isEdit ? 'Update your weekly progress submission.' : 'Submit weekly progress for a single subject' ?>
+      </div>
     </div>
     <a href="<?= base_url('teacher/progress/history') ?>" class="btn btn-outline-secondary">My Submissions</a>
   </div>
@@ -41,6 +51,10 @@
   <?php if (session()->getFlashdata('success')): ?>
     <div class="alert alert-success"><?= esc(session()->getFlashdata('success')) ?></div>
   <?php endif; ?>
+  <?php $overwritePrompt = session()->getFlashdata('confirm_overwrite'); ?>
+  <?php if (session()->getFlashdata('warning') && ! $overwritePrompt): ?>
+    <div class="alert alert-warning"><?= esc(session()->getFlashdata('warning')) ?></div>
+  <?php endif; ?>
   <?php if (session()->getFlashdata('error')): ?>
     <div class="alert alert-danger"><?= esc(session()->getFlashdata('error')) ?></div>
   <?php endif; ?>
@@ -54,33 +68,48 @@
     </div>
   <?php endif; ?>
 
-  <form action="<?= base_url('teacher/progress/store') ?>" method="post" enctype="multipart/form-data" class="needs-validation" novalidate>
+  <form action="<?= esc($formAction) ?>" method="post" enctype="multipart/form-data" class="needs-validation" novalidate>
     <?= csrf_field() ?>
     <input type="hidden" name="class_section_id" value="<?= esc($classSectionId ?? '') ?>">
+    <input type="hidden" name="confirm_overwrite" id="confirmOverwriteInput" value="0">
     <div class="row g-3">
       <div class="col">
         <div class="card shadow-sm mb-3">
           <div class="card-header bg-white d-flex flex-wrap align-items-center justify-content-between gap-3">
             <strong class="mb-0">Date Selection</strong>
-            <div class="d-flex align-items-center gap-2">
-                <select id="weekStartSelect" name="week_start" class="form-select form-select-sm" required>
-                <option value="">Select week</option>
-                <?php foreach ($sundayOptions as $sunday): ?>
-                  <?php
-                    try {
-                      $startDt = new \DateTime($sunday);
-                      $displayStart = $startDt->format('M d, Y');
-                    } catch (\Exception $e) {
-                      $displayStart = $sunday;
-                    }
-                  ?>
-                  <option value="<?= esc($sunday) ?>" <?= $sunday === $weekStartSelected ? 'selected' : '' ?>>
-                    <?= esc($displayStart) ?>
-                  </option>
-                <?php endforeach; ?>
-              </select>
-              <div class="invalid-feedback">Week start is required.</div>
-            </div>
+            <?php if ($isEdit): ?>
+              <div class="text-muted small">
+                <?php
+                  try {
+                    $displayStart = (new \DateTime($weekStartSelected))->format('M d, Y');
+                  } catch (\Exception $e) {
+                    $displayStart = $weekStartSelected;
+                  }
+                ?>
+                Week of <?= esc($displayStart ?: 'N/A') ?>
+              </div>
+              <input type="hidden" name="week_start" value="<?= esc($weekStartSelected) ?>">
+            <?php else: ?>
+              <div class="d-flex align-items-center gap-2">
+                  <select id="weekStartSelect" name="week_start" class="form-select form-select-sm" required>
+                  <option value="">Select week</option>
+                  <?php foreach ($sundayOptions as $sunday): ?>
+                    <?php
+                      try {
+                        $startDt = new \DateTime($sunday);
+                        $displayStart = $startDt->format('M d, Y');
+                      } catch (\Exception $e) {
+                        $displayStart = $sunday;
+                      }
+                    ?>
+                    <option value="<?= esc($sunday) ?>" <?= $sunday === $weekStartSelected ? 'selected' : '' ?>>
+                      <?= esc($displayStart) ?>
+                    </option>
+                  <?php endforeach; ?>
+                </select>
+                <div class="invalid-feedback">Week start is required.</div>
+              </div>
+            <?php endif; ?>
           </div>
           <div class="card-body">
             <input type="hidden" name="week_end" id="weekEndInput" value="<?= esc($weekEndValue) ?>" required>
@@ -96,8 +125,10 @@
       ?>
       <?php foreach ($subjectSections as $slug => $section): ?>
         <?php
-          $unitValues = old("unit_$slug") ?? [];
-          $chapterValues = old("chapter_$slug") ?? [];
+          $unitValues = old("unit_$slug") ?? ($existingReports[$slug]['unit_values'] ?? []);
+          $chapterValues = old("chapter_$slug") ?? ($existingReports[$slug]['chapter_values'] ?? []);
+          $coveredValue = old("covered_$slug", $existingReports[$slug]['covered'] ?? '');
+          $homeworkValue = old("homework_$slug", $existingReports[$slug]['homework'] ?? '');
           $rowsCount = max(count($unitValues), count($chapterValues));
         ?>
         <div class="col-lg-6">
@@ -188,11 +219,11 @@
             </div>
             <div class="mb-3">
               <label class="form-label mb-1">What has been covered?</label>
-              <textarea name="covered_<?= esc($slug) ?>" class="form-control" rows="4" required placeholder="What was taught? Key topics, activities, memorization, etc."><?= esc(old("covered_$slug")) ?></textarea>
+              <textarea name="covered_<?= esc($slug) ?>" class="form-control" rows="4" required placeholder="What was taught? Key topics, activities, memorization, etc."><?= esc($coveredValue) ?></textarea>
             </div>
             <div class="mb-3">
               <label class="form-label mb-1">Assigned homework:</label>
-              <textarea name="homework_<?= esc($slug) ?>" class="form-control" rows="3" placeholder="Homework, practice quizzes, review pages"><?= esc(old("homework_$slug")) ?></textarea>
+              <textarea name="homework_<?= esc($slug) ?>" class="form-control" rows="3" placeholder="Homework, practice quizzes, review pages"><?= esc($homeworkValue) ?></textarea>
             </div>
             <div class="mb-3">
               <label class="form-label mb-1">Attachment (optional):</label>
@@ -207,7 +238,7 @@
       <div class="col">
         <div class="card shadow-sm">
           <div class="card-body d-flex flex-column">
-            <button class="btn btn-primary w-100 mt-auto" type="submit" <?= $hasClass ? '' : 'disabled' ?>>Submit Progress</button>
+            <button class="btn btn-primary w-100 mt-auto" type="submit" <?= $hasClass ? '' : 'disabled' ?>><?= esc($submitLabel) ?></button>
             <?php if (! $hasClass): ?>
               <div class="text-muted small mt-2">
                 You are not assigned to a class. Contact the administrator to submit progress.
@@ -224,12 +255,65 @@
 <?= $this->endSection() ?>
 
 <?= $this->section('scripts') ?>
+<?php
+  $submitSuccess = session()->getFlashdata('success');
+  $submitError = session()->getFlashdata('error');
+  $overwriteWarning = session()->getFlashdata('warning');
+  $overwritePrompt = session()->getFlashdata('confirm_overwrite');
+?>
+<?php if ($submitSuccess || $submitError): ?>
+  <div class="modal fade" id="submissionStatusModal" tabindex="-1" aria-labelledby="submissionStatusLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="submissionStatusLabel">
+            <?= $submitSuccess ? 'Submission Successful' : 'Submission Failed' ?>
+          </h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+          <?= esc($submitSuccess ?: $submitError) ?>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-bs-dismiss="modal">OK</button>
+        </div>
+      </div>
+    </div>
+  </div>
+<?php endif; ?>
+<?php if ($overwritePrompt && $overwriteWarning): ?>
+  <div class="modal fade" id="overwriteConfirmModal" tabindex="-1" aria-labelledby="overwriteConfirmLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="overwriteConfirmLabel">Override Existing Report</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+          <?= esc($overwriteWarning) ?>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
+          <button type="button" class="btn btn-primary" id="confirmOverwriteButton">Override</button>
+        </div>
+      </div>
+    </div>
+  </div>
+<?php endif; ?>
 <script>
 (() => {
   'use strict';
   const forms = document.querySelectorAll('.needs-validation');
   Array.from(forms).forEach(form => {
     form.addEventListener('submit', event => {
+      const islamicUnits = form.querySelectorAll('input[name="unit_islamic[]"]');
+      const hasIslamicUnit = Array.from(islamicUnits).some(input => input.value.trim() !== '');
+      if (!hasIslamicUnit) {
+        event.preventDefault();
+        event.stopPropagation();
+        alert('Please select at least one Islamic Studies unit.');
+        return;
+      }
       if (!form.checkValidity()) {
         event.preventDefault();
         event.stopPropagation();
@@ -368,6 +452,33 @@
       hideMenus();
     });
   });
+
+  const statusModalEl = document.getElementById('submissionStatusModal');
+  if (statusModalEl && typeof bootstrap !== 'undefined') {
+    const statusModal = new bootstrap.Modal(statusModalEl);
+    statusModal.show();
+  }
+
+  const overwriteModalEl = document.getElementById('overwriteConfirmModal');
+  if (overwriteModalEl && typeof bootstrap !== 'undefined') {
+    const overwriteModal = new bootstrap.Modal(overwriteModalEl);
+    overwriteModal.show();
+    const confirmButton = document.getElementById('confirmOverwriteButton');
+    const confirmInput = document.getElementById('confirmOverwriteInput');
+    if (confirmButton && confirmInput) {
+      confirmButton.addEventListener('click', () => {
+        confirmInput.value = '1';
+        const form = confirmButton.closest('form') || document.querySelector('form.needs-validation');
+        if (form && typeof form.requestSubmit === 'function') {
+          form.requestSubmit();
+          return;
+        }
+        if (form) {
+          form.submit();
+        }
+      });
+    }
+  }
 })();
 </script>
 <?= $this->endSection() ?>

app/Views/teacher/exam_drafts.php

@@ -137,6 +137,9 @@
                                                     <a href="<?= base_url('exam-drafts/files/teacher/' . $draft['teacher_file']) ?>" target="_blank">
                                                         <?= esc($draft['teacher_filename'] ?? 'Download submitted file') ?>
                                                     </a>
+                                                    <a href="<?= base_url('exam-drafts/files/teacher/' . $draft['teacher_file']) ?>" target="_blank" class="btn btn-sm btn-outline-secondary ms-2">
+                                                        View
+                                                    </a>
                                                 </div>
                                             <?php else: ?>
                                                 <div class="text-muted small">No file uploaded</div>
@@ -152,6 +155,9 @@
                                                     <a href="<?= base_url('exam-drafts/files/final/' . $draft['final_file']) ?>" target="_blank" class="link-success small">
                                                         <?= esc($draft['final_filename'] ?? 'Download final draft') ?>
                                                     </a>
+                                                    <a href="<?= base_url('exam-drafts/files/final/' . $draft['final_file']) ?>" target="_blank" class="btn btn-sm btn-outline-secondary ms-2">
+                                                        View
+                                                    </a>
                                                 </div>
                                             <?php endif; ?>
                                         </td>
@@ -199,6 +205,9 @@
                                                         <a href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" class="btn btn-sm btn-outline-primary">
                                                             Download
                                                         </a>
+                                                        <a href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" class="btn btn-sm btn-outline-secondary ms-2">
+                                                            View
+                                                        </a>
                                                     <?php else: ?>
                                                         <span class="text-muted small">File missing</span>
                                                     <?php endif; ?>