fix events logic

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

See merge request root/alrahma_sunday_school!5

.env

@@ -63,7 +63,7 @@ session.expiration = 43200
 database.default.hostname = 127.0.0.1
 database.default.database = school
 database.default.username = root
-database.default.password = 
+database.default.password = rootpassword
 database.default.DBDriver = MySQLi
 database.default.DBPrefix =
 database.default.port = 3306

app/Commands/SendExamDraftDeadlineReminders.php

@@ -0,0 +1,197 @@
+<?php
+
+namespace App\Commands;
+
+use App\Controllers\View\EmailController;
+use App\Models\ClassSectionModel;
+use App\Models\ConfigurationModel;
+use App\Models\TeacherSubmissionNotificationHistoryModel;
+use App\Models\UserModel;
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use Config\Database;
+
+class SendExamDraftDeadlineReminders extends BaseCommand
+{
+    protected $group = 'Exam Drafts';
+    protected $name = 'exam-drafts:deadline-reminders';
+    protected $description = 'Sends exam draft deadline reminders to teachers who have not submitted drafts.';
+
+    public function run(array $params)
+    {
+        helper('date');
+
+        $configModel = new ConfigurationModel();
+        $schoolYear = (string) ($configModel->getConfig('school_year') ?? '');
+        $semester = (string) ($configModel->getConfig('semester') ?? '');
+        $deadlineValue = trim((string) ($configModel->getConfig('exam_draft_deadline') ?? ''));
+        if ($deadlineValue === '') {
+            CLI::write('exam_draft_deadline is not configured.', 'yellow');
+            return;
+        }
+
+        $tz = new \DateTimeZone(config('App')->appTimezone ?? 'UTC');
+        try {
+            $deadline = new \DateTimeImmutable($deadlineValue, $tz);
+        } catch (\Throwable $e) {
+            CLI::write('Invalid exam_draft_deadline value.', 'red');
+            return;
+        }
+        $deadline = $deadline->setTime(0, 0, 0);
+        $today = new \DateTimeImmutable('now', $tz);
+        $today = $today->setTime(0, 0, 0);
+
+        if ($today > $deadline) {
+            CLI::write('Deadline has passed. No reminders sent.', 'yellow');
+            return;
+        }
+
+        $daysToDeadline = (int) $today->diff($deadline)->format('%r%a');
+        if (!$this->shouldSendOnDay($daysToDeadline)) {
+            CLI::write('No reminder scheduled for today.', 'yellow');
+            return;
+        }
+
+        $db = Database::connect();
+        $teacherClassRows = $db->table('teacher_class')
+            ->select('teacher_id, class_section_id, school_year, semester')
+            ->when($schoolYear !== '', static function ($builder) use ($schoolYear) {
+                return $builder->where('school_year', $schoolYear);
+            })
+            ->when($semester !== '', static function ($builder) use ($semester) {
+                return $builder->where('semester', $semester);
+            })
+            ->get()
+            ->getResultArray();
+
+        if (empty($teacherClassRows)) {
+            CLI::write('No teacher assignments found.', 'yellow');
+            return;
+        }
+
+        $draftTable = 'exam_drafts';
+        $fields = $db->getFieldNames($draftTable);
+        $teacherColumn = in_array('teacher_id', $fields, true) ? 'teacher_id' : 'author_id';
+        $hasStatusColumn = in_array('status', $fields, true);
+        $hasIsLegacyColumn = in_array('is_legacy', $fields, true);
+
+        $draftsQuery = $db->table($draftTable)
+            ->select("{$teacherColumn} AS teacher_id, class_section_id")
+            ->when($schoolYear !== '', static function ($builder) use ($schoolYear) {
+                return $builder->where('school_year', $schoolYear);
+            })
+            ->when($semester !== '', static function ($builder) use ($semester) {
+                return $builder->where('semester', $semester);
+            });
+
+        if ($hasStatusColumn) {
+            $draftsQuery = $draftsQuery->where('status !=', 'legacy');
+        }
+        if ($hasIsLegacyColumn) {
+            $draftsQuery = $draftsQuery->where('is_legacy', 0);
+        }
+
+        $draftRows = $draftsQuery->get()->getResultArray();
+        $submittedMap = [];
+        foreach ($draftRows as $row) {
+            $key = (int) ($row['teacher_id'] ?? 0) . '|' . (int) ($row['class_section_id'] ?? 0);
+            $submittedMap[$key] = true;
+        }
+
+        $missingByTeacher = [];
+        foreach ($teacherClassRows as $row) {
+            $teacherId = (int) ($row['teacher_id'] ?? 0);
+            $classSectionId = (int) ($row['class_section_id'] ?? 0);
+            if ($teacherId <= 0 || $classSectionId <= 0) {
+                continue;
+            }
+            $key = $teacherId . '|' . $classSectionId;
+            if (!isset($submittedMap[$key])) {
+                $missingByTeacher[$teacherId][] = $classSectionId;
+            }
+        }
+
+        if (empty($missingByTeacher)) {
+            CLI::write('All teachers have submitted drafts.', 'green');
+            return;
+        }
+
+        $userModel = new UserModel();
+        $classSectionModel = new ClassSectionModel();
+        $historyModel = new TeacherSubmissionNotificationHistoryModel();
+        $mailer = new EmailController();
+
+        $classSections = $classSectionModel
+            ->select('class_section_id, class_section_name')
+            ->findAll();
+        $classLookup = [];
+        foreach ($classSections as $section) {
+            $classLookup[(int) ($section['class_section_id'] ?? 0)] = $section['class_section_name'] ?? '';
+        }
+
+        $todayStamp = $today->format('Y-m-d');
+        foreach ($missingByTeacher as $teacherId => $sectionIds) {
+            $teacher = $userModel->find($teacherId);
+            $email = $teacher['email'] ?? '';
+            if ($email === '' || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                continue;
+            }
+
+            $alreadySent = $historyModel
+                ->where('teacher_id', $teacherId)
+                ->where('notification_category', 'exam_draft_deadline')
+                ->where('school_year', $schoolYear)
+                ->where('semester', $semester)
+                ->like('sent_at', $todayStamp)
+                ->countAllResults() > 0;
+            if ($alreadySent) {
+                continue;
+            }
+
+            $classNames = array_map(static function ($id) use ($classLookup) {
+                return $classLookup[(int) $id] ?? "Class {$id}";
+            }, $sectionIds);
+            $classList = implode(', ', $classNames);
+            $teacherName = trim(($teacher['firstname'] ?? '') . ' ' . ($teacher['lastname'] ?? ''));
+            if ($teacherName === '') {
+                $teacherName = 'Teacher';
+            }
+
+            $subject = 'Reminder: Exam draft submission deadline';
+            $body = '<p>Dear ' . esc($teacherName) . ',</p>'
+                . '<p>This is a reminder to submit your exam draft(s) for: ' . esc($classList) . '.</p>'
+                . '<p>Deadline: <strong>' . esc($deadline->format('Y-m-d')) . '</strong></p>'
+                . '<p>Please submit your draft at <a href="' . esc(base_url('teacher/exam-drafts')) . '">Teacher Exam Drafts</a>.</p>'
+                . '<p>Thank you.</p>';
+
+            $status = 'failed';
+            if ($mailer->sendEmail($email, $subject, $body, 'notifications')) {
+                $status = 'sent';
+                CLI::write("Sent reminder to {$email}", 'green');
+            }
+
+            $historyModel->insert([
+                'teacher_id' => $teacherId,
+                'class_section_id' => 0,
+                'admin_id' => null,
+                'notification_category' => 'exam_draft_deadline',
+                'message' => strip_tags($body),
+                'status' => $status,
+                'school_year' => $schoolYear,
+                'semester' => $semester,
+                'sent_at' => utc_now(),
+            ]);
+        }
+    }
+
+    private function shouldSendOnDay(int $daysToDeadline): bool
+    {
+        if ($daysToDeadline < 0) {
+            return false;
+        }
+        if ($daysToDeadline <= 4) {
+            return true;
+        }
+        return in_array($daysToDeadline, [28, 21, 14, 7], true);
+    }
+}

app/Config/App.php

@@ -82,7 +82,7 @@ class App extends BaseConfig
     | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
     |
     */
-    public string $permittedURIChars = 'a-z 0-9~%.:_\-';
+    public string $permittedURIChars = 'a-z 0-9~%.:_\-,';
 
     /**
      * --------------------------------------------------------------------------

app/Config/Database.php

@@ -9,43 +9,51 @@ class Database extends Config
     public string $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
     public string $defaultGroup = 'default';
 
-    public array $default = [
+    public array $default = [];
-        'DSN'      => '',
+    public array $tests = [];
-        'hostname' => 'localhost',
-        'username' => 'u280815660_melabidi',
-        'password' => '>tNxlRzP/W8',
-        'database' => 'u280815660_school',
-        'DBDriver' => 'MySQLi',
-        'DBPrefix' => '',
-        'pConnect' => false,
-        'DBDebug'  => (ENVIRONMENT !== 'development'),
-        'charset'  => 'utf8',
-        'DBCollat' => 'utf8_general_ci',
-        'swapPre'  => '',
-        'encrypt'  => false,
-        'compress' => false,
-        'strictOn' => false,
-        'failover' => [],
-        'port'     => 3306,
-    ];
 
-    public array $tests = [
+    public function __construct()
-        'DSN'      => '',
+    {
-        'hostname' => 'localhost',
+        parent::__construct();
-        'username' => 'u280815660_melabidi',
+
-        'password' => '>tNxlRzP/W8',
+        $this->default = [
-        'database' => 'u280815660_school',
+            'DSN'      => '',
-        'DBDriver' => 'MySQLi',
+            'hostname' => env('database.default.hostname'),
-        'DBPrefix' => 'db_',
+            'username' => env('database.default.username'),
-        'pConnect' => false,
+            'password' => env('database.default.password'),
-        'DBDebug'  => true,
+            'database' => env('database.default.database'),
-        'charset'  => 'utf8',
+            'DBDriver' => env('database.default.DBDriver', 'MySQLi'),
-        'DBCollat' => 'utf8_general_ci',
+            'DBPrefix' => '',
-        'swapPre'  => '',
+            'pConnect' => false,
-        'encrypt'  => false,
+            'DBDebug'  => (ENVIRONMENT !== 'development'),
-        'compress' => false,
+            'charset'  => 'utf8',
-        'strictOn' => false,
+            'DBCollat' => 'utf8_general_ci',
-        'failover' => [],
+            'swapPre'  => '',
-        'port'     => 3306,
+            'encrypt'  => false,
-    ];
+            'compress' => false,
+            'strictOn' => false,
+            'failover' => [],
+            'port'     => (int) env('database.default.port', 3306),
+        ];
+
+        $this->tests = [
+            'DSN'      => '',
+            'hostname' => env('database.tests.hostname', env('database.default.hostname')),
+            'username' => env('database.tests.username', env('database.default.username')),
+            'password' => env('database.tests.password', env('database.default.password')),
+            'database' => env('database.tests.database', env('database.default.database')),
+            'DBDriver' => env('database.tests.DBDriver', env('database.default.DBDriver', 'MySQLi')),
+            'DBPrefix' => env('database.tests.DBPrefix', 'db_'),
+            'pConnect' => false,
+            'DBDebug'  => true,
+            'charset'  => 'utf8',
+            'DBCollat' => 'utf8_general_ci',
+            'swapPre'  => '',
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
+            'failover' => [],
+            'port'     => (int) env('database.tests.port', env('database.default.port', 3306)),
+        ];
+    }
 }

app/Config/Routes.php

@@ -230,6 +230,10 @@ $routes->get('reset_password', 'View\UserController::resetPassword');
 
 //$routes->get('/blocked', 'View\UserController::blocked');
 
+$routes->get('confirm_authorized_user', 'View\AuthorizedUsersController::confirm');
+$routes->get('set_authorized_user_password/(:num)', 'View\AuthorizedUsersController::setPassword/$1');
+$routes->post('set_authorized_user_password/(:num)', 'View\AuthorizedUsersController::savePassword/$1');
+
 $routes->post('assign_class_student', 'View\StudentController::assignClassStudent');
 $routes->post('remove_class_student', 'View\StudentController::removeClassStudent');
 $routes->post('administrator/remove_class_student', 'View\StudentController::removeClassStudent'); // alias to avoid 404s
@@ -359,6 +363,7 @@ $routes->get('/teacher/teacher_contactus', 'View\TeacherController::contactusTea
 
 $routes->get('/teacher/exam-drafts', 'View\ExamDraftController::teacherIndex', ['filter' => 'auth:teacher,teacher_assistant,teacher_dashboard,read']);
 $routes->post('/teacher/exam-drafts', 'View\ExamDraftController::teacherStore', ['filter' => 'auth:teacher,teacher_assistant,teacher_dashboard,read']);
+$routes->get('/teacher/exam-drafts/status', 'View\ExamDraftController::teacherStatusFeed', ['filter' => 'auth:teacher,teacher_assistant,teacher_dashboard,read']);
 
 
 
@@ -401,6 +406,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 === '') {
-            if ($sectionId === 0 || $subject === '' || $weekStart === '') {
                 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 === '') {
-            if ($sectionId === 0 || $subject === '' || $weekStart === '') {
                 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 = [];
+            $chapterToUnit = [];
-            if ($classId && $subjectSlug && ! empty($curriculumChapters[$classId][$subjectSlug])) {
+            if ($classId && $subjectSlug && ! empty($curriculumUnits[$classId][$subjectSlug]['chapter_to_unit'])) {
-                $chapterSet = $curriculumChapters[$classId][$subjectSlug];
+                $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);
+            [$unitPart, $chapterPart] = $this->splitUnitChapterSegment($part);
-            $key = $chapter !== '' ? $chapter : $part;
+            $key = $this->resolveUnitKey($unitPart, $chapterPart, $chapterToUnit);
-            if (! empty($chapterSet) && $chapter !== '' && empty($chapterSet[$chapter])) {
+            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/AuthController.php

@@ -469,6 +469,7 @@ class AuthController extends Controller
         // Generate a secure token for the password reset
         helper('text');
         $token = bin2hex(random_bytes(48));
+        $tokenHash = hash('sha256', $token);
 
         // Calculate the expiration time for the token (1 hour from now)
         $expires_at = Time::now()->addHours(1);
@@ -477,7 +478,7 @@ class AuthController extends Controller
         $passwordResetModel = new PasswordResetModel();
         $passwordResetModel->insert([
             'email'      => $email,
-            'token'      => $token,
+            'token'      => $tokenHash,
             'created_at' => Time::now(),
             'expires_at' => $expires_at,
         ]);

app/Controllers/ClassProgressController.php

@@ -28,6 +28,10 @@ class ClassProgressController extends BaseController
             'db_subject' => 'Quran/Arabic',
         ],
     ];
+
+    /** Unit column for teacher custom Islamic / Quran rows; must match teacher form JS. Segment: "Custom / {text}". */
+    public const CUSTOM_UNIT_ROW_LABEL = 'Custom';
+
     protected ClassProgressReportModel $reportModel;
     protected ClassProgressAttachmentModel $attachmentModel;
     protected TeacherClassModel $teacherClassModel;
@@ -98,6 +102,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 +127,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 +310,262 @@ 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);
+            }
+        }
+
+        $sundayOptions = $this->buildSundayOptions();
+        if (!in_array($row['week_start'], $sundayOptions, true)) {
+            array_unshift($sundayOptions, $row['week_start']);
+        }
+
+        return view('teacher/class_progress_submit', [
+            'subjectSections' => self::SUBJECT_SECTIONS,
+            'subjectCurriculum' => $subjectCurriculum,
+            'classSectionId' => $row['class_section_id'],
+            'classSectionName' => $classSectionName,
+            'classId' => $classId,
+            'sundayOptions' => $sundayOptions,
+            '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.');
+        }
+
+        $confirmOverwrite = (bool) $this->request->getPost('confirm_overwrite');
+        if ($weekStart && $weekStart !== (string) ($row['week_start'] ?? '')) {
+            $conflicts = $this->reportModel
+                ->select('id')
+                ->where('class_section_id', $classSectionId)
+                ->where('week_start', $weekStart)
+                ->where('teacher_id', $teacherId)
+                ->findAll();
+            if (! $confirmOverwrite && ! empty($conflicts)) {
+                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($conflicts)) {
+                $conflictIds = array_values(array_filter(array_map(
+                    static fn (array $row): int => (int) ($row['id'] ?? 0),
+                    $conflicts
+                )));
+                if (! empty($conflictIds)) {
+                    $this->attachmentModel->whereIn('report_id', $conflictIds)->delete();
+                    $this->reportModel->whereIn('id', $conflictIds)->delete();
+                }
+            }
+        }
+
+        $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);
@@ -419,6 +709,37 @@ class ClassProgressController extends BaseController
         return $flags ? json_encode($flags) : null;
     }
 
+    /**
+     * Split stored unit_title into curriculum lines vs custom teacher-typed subjects ("Custom / …").
+     * Keep in sync with teacher form, {@see buildUnitChapterSummary()}, and admin views.
+     *
+     * @return array{curriculum: list<string>, custom: list<string>}
+     */
+    public static function splitUnitTitleForDisplay(string $unitTitle): array
+    {
+        $unitTitle = trim($unitTitle);
+        if ($unitTitle === '') {
+            return ['curriculum' => [], 'custom' => []];
+        }
+
+        $segments = preg_split('/\s*;\s*/', $unitTitle, -1, PREG_SPLIT_NO_EMPTY);
+        $curriculum = [];
+        $custom = [];
+        foreach ($segments as $seg) {
+            $seg = trim((string) $seg);
+            if ($seg === '') {
+                continue;
+            }
+            if (preg_match('/^Custom\s*\/\s*(.+)$/iu', $seg, $m)) {
+                $custom[] = trim($m[1]);
+            } else {
+                $curriculum[] = $seg;
+            }
+        }
+
+        return ['curriculum' => $curriculum, 'custom' => $custom];
+    }
+
     protected function buildUnitChapterSummary(string $slug): ?string
     {
         $unitValues = array_map('trim', (array) $this->request->getPost("unit_$slug"));
@@ -431,9 +752,12 @@ class ClassProgressController extends BaseController
             if ($unit === '' && $chapter === '') {
                 continue;
             }
+            if (strcasecmp($unit, self::CUSTOM_UNIT_ROW_LABEL) === 0 && $chapter !== '') {
+                $unit = self::CUSTOM_UNIT_ROW_LABEL;
+            }
             $segment = $unit;
             if ($chapter !== '') {
-                $segment = $segment !== '' ? $segment . ' / ' . $chapter : $chapter;
+                $segment = $segment !== '' ? $unit . ' / ' . $chapter : $chapter;
             }
             if ($segment === '') {
                 continue;
@@ -444,9 +768,64 @@ class ClassProgressController extends BaseController
             return null;
         }
         $summary = implode(' ; ', $parts);
+
         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'));
+        $chapterValues = array_map('trim', (array) $this->request->getPost('chapter_islamic'));
+        $count = max(count($unitValues), count($chapterValues));
+        for ($i = 0; $i < $count; $i++) {
+            $unit = $unitValues[$i] ?? '';
+            $chapter = $chapterValues[$i] ?? '';
+            if ($unit !== '' || $chapter !== '') {
+                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;
+            }
+            if (preg_match('/^Custom\s*\/\s*(.+)$/iu', $segment, $m)) {
+                $units[] = self::CUSTOM_UNIT_ROW_LABEL;
+                $chapters[] = trim($m[1]);
+
+                continue;
+            }
+            $parts = preg_split('/\s*\/\s*/', $segment, 2);
+            if (count($parts) === 2) {
+                $u = trim($parts[0]);
+                if (strcasecmp($u, self::CUSTOM_UNIT_ROW_LABEL) === 0) {
+                    $u = self::CUSTOM_UNIT_ROW_LABEL;
+                }
+                $units[] = $u;
+                $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();
+        $students = $this->getParentStudents();
-        $sectionOptions = $this->buildSectionOptions($sectionIds);
+        $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,
+            'hasStudents' => ! empty($students),
-            'selectedSectionId' => $selectedSectionId,
-            'hasSections' => ! empty($sectionIds),
         ]);
     }
 
@@ -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'] ?? '';
+            $weekStart = $row['week_start'] ?? '';
-            if ($key === '') {
+            $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 ?? '');
+        $semester = (string)($this->configModel->getConfig('semester') ?? $this->semester ?? '');
-        $schoolYear = (string)($this->schoolYear ?? '');
+        $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,97 @@ class AdministratorController extends BaseController
             ])
             ->join('classSection cs', 'cs.class_section_id = tc.class_section_id', 'left')
             ->join('users u', 'u.id = tc.teacher_id', 'left')
-            ->where('tc.school_year', $schoolYear)
+            ->orderBy('cs.class_section_name', 'ASC');
-            ->where('tc.semester', $semester)
+
-            ->orderBy('cs.class_section_name', 'ASC')
+        $filteredQuery = clone $assignmentQuery;
-            ->get()
+        if ($schoolYear !== '') {
-            ->getResultArray();
+            $filteredQuery = $filteredQuery->where('tc.school_year', $schoolYear);
+        }
+        if (!empty($semesterCandidates)) {
+            $filteredQuery = $filteredQuery->whereIn('tc.semester', $semesterCandidates);
+        }
+
+        $assignmentRows = $filteredQuery->get()->getResultArray();
+        if (empty($assignmentRows) && ($schoolYear !== '' || $semester !== '')) {
+            $assignmentRows = $assignmentQuery->get()->getResultArray();
+        }
+
+        $studentCounts = $this->studentClassModel->getStudentCountsBySection($schoolYear !== '' ? $schoolYear : null);
+        $sectionRows = $this->classSectionModel
+            ->select('class_section_id, class_section_name')
+            ->orderBy('class_section_name', 'ASC')
+            ->findAll();
+        $sectionMap = [];
+        foreach ($sectionRows as $sectionRow) {
+            $sectionId = (int) ($sectionRow['class_section_id'] ?? 0);
+            if ($sectionId <= 0) {
+                continue;
+            }
+            if (empty($studentCounts[$sectionId])) {
+                continue;
+            }
+            $sectionMap[$sectionId] = $sectionRow['class_section_name'] ?? "Section {$sectionId}";
+        }
+        $sectionIds = array_keys($sectionMap);
+
+        [$progressExpectedWeeks, $progressSubmittedBySection] = $this->buildClassProgressStats($sectionIds);
+        $examDraftCounts = [];
+        $examDraftDeadline = $this->resolveTeacherDashboardExamDraftDeadline($semester, $schoolYear);
+        $examDraftDeadlineConfig = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        $examDraftDeadlineFormatted = '';
+        if ($examDraftDeadlineConfig !== '') {
+            $parsedUi = $this->parseExamDraftDeadlineConfigValue();
+            $examDraftDeadlineFormatted = $parsedUi !== null ? $parsedUi->format('M j, Y') : '';
+        }
+        $homeworkCounts = [];
+        if (! empty($sectionIds)) {
+            $draftBuilder = $examDrafts
+                ->select('class_section_id')
+                ->whereIn('class_section_id', $sectionIds);
+            if ($schoolYear !== '') {
+                $draftBuilder->where('school_year', $schoolYear);
+            }
+            if (!empty($semesterCandidates)) {
+                $draftBuilder->whereIn('semester', $semesterCandidates);
+            }
+            if ($this->db->fieldExists('is_legacy', 'exam_drafts')) {
+                $draftBuilder->where('is_legacy', 0);
+            }
+            $draftRows = $draftBuilder->findAll();
+            foreach ($draftRows as $draft) {
+                $sectionId = (int) ($draft['class_section_id'] ?? 0);
+                if ($sectionId <= 0) {
+                    continue;
+                }
+                $examDraftCounts[$sectionId] = ($examDraftCounts[$sectionId] ?? 0) + 1;
+            }
+
+            $homeworkBuilder = $homeworkModel
+                ->select('class_section_id, homework_index')
+                ->whereIn('class_section_id', $sectionIds);
+            if ($schoolYear !== '') {
+                $homeworkBuilder->where('school_year', $schoolYear);
+            }
+            if (!empty($semesterCandidates)) {
+                $homeworkBuilder->whereIn('semester', $semesterCandidates);
+            }
+            $homeworkRows = $homeworkBuilder
+                ->where('score IS NOT NULL', null, false)
+                ->where('score !=', '')
+                ->groupBy('class_section_id, homework_index')
+                ->findAll();
+            foreach ($homeworkRows as $row) {
+                $sectionId = (int) ($row['class_section_id'] ?? 0);
+                if ($sectionId <= 0) {
+                    continue;
+                }
+                $homeworkCounts[$sectionId] = ($homeworkCounts[$sectionId] ?? 0) + 1;
+            }
+        }
+
+        if (empty($lowProgressSectionIds)) {
+            $lowProgressSectionIds = $this->resolveLowProgressSectionIds($sectionIds);
+        }
 
         $teachersBySection = [];
         foreach ($assignmentRows as $assignment) {
@@ -745,7 +844,7 @@ class AdministratorController extends BaseController
             $entry = &$teachersBySection[$sectionId];
             if (!isset($entry)) {
                 $entry = [
-                    'class_section' => $assignment['class_section_name'] ?? "Section {$sectionId}",
+                    'class_section' => $assignment['class_section_name'] ?? ($sectionMap[$sectionId] ?? "Section {$sectionId}"),
                     'teachers' => [],
                 ];
             }
@@ -765,35 +864,49 @@ class AdministratorController extends BaseController
         $missingItemCount = 0;
         $allTeacherIds = [];
         $allClassSectionIds = [];
-        foreach ($teachersBySection as $classSectionId => $section) {
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreField = $examTerm === 'final' ? 'final_exam_score' : 'midterm_exam_score';
+
+        foreach ($sectionMap as $classSectionId => $sectionName) {
             $classSectionId = (int)$classSectionId;
             if ($classSectionId <= 0) {
                 continue;
             }
 
-            $studentEntries = $this->studentClassModel
+            $studentQuery = $this->studentClassModel
                 ->select('student_id')
                 ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
+                ->where('school_year', $schoolYear);
-                ->where('school_year', $schoolYear)
+            if (!empty($semesterCandidates)) {
-                ->findAll();
+                $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);
-                    ->where('school_year', $schoolYear)
+                if (!empty($semesterCandidates)) {
-                    ->findAll();
+                    $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 +920,15 @@ class AdministratorController extends BaseController
             $midtermCommentStudents = [];
             $ptapCommentStudents = [];
             if (!empty($studentIds)) {
-                $comments = $scoreComments
+                $commentQuery = $scoreComments
                     ->select('student_id, score_type, comment')
                     ->whereIn('student_id', $studentIds)
-                    ->where('semester', $semester)
                     ->where('school_year', $schoolYear)
-                    ->whereIn('score_type', ['midterm', 'ptap'])
+                    ->whereIn('score_type', [$examTerm, 'ptap']);
-                    ->findAll();
+                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 +939,7 @@ class AdministratorController extends BaseController
                         continue;
                     }
                     $type = strtolower(trim((string)($comment['score_type'] ?? '')));
-                    if ($type === 'midterm') {
+                    if ($type === $examTerm) {
                         $midtermCommentStudents[$sid] = true;
                     }
                     if ($type === 'ptap') {
@@ -833,14 +948,17 @@ class AdministratorController extends BaseController
                 }
             }
 
-            $attendanceRow = $attendanceDays
+            $attendanceQuery = $attendanceDays
                 ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
                 ->where('school_year', $schoolYear)
-                ->where('date', $today)
+                ->where('date', $today);
-                ->first();
+            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 +979,27 @@ class AdministratorController extends BaseController
             $participationStatus = $this->submissionStatus(count($participationStudents), $expected);
             $ptapCommentStatus = $this->submissionStatus(count($ptapCommentStudents), $expected);
             $attendanceStatus = $this->attendanceStatus($attendanceSubmitted);
+            $progressSubmitted = (int) ($progressSubmittedBySection[$classSectionId] ?? 0);
+            $classProgressStatus = $this->progressStatus($progressSubmitted, $progressExpectedWeeks);
+            $draftSubmitted = (int) ($examDraftCounts[$classSectionId] ?? 0);
+            $examDraftStatus = $this->draftStatus($draftSubmitted, $examDraftDeadline);
+            $homeworkSubmitted = (int) ($homeworkCounts[$classSectionId] ?? 0);
+            $homeworkStatus = $this->homeworkStatus($homeworkSubmitted);
             $statusDetails = [
                 'midterm_score_status' => $midtermScoreStatus,
                 'midterm_comment_status' => $midtermCommentStatus,
                 'participation_status' => $participationStatus,
                 'ptap_comment_status' => $ptapCommentStatus,
+                'class_progress_status' => $classProgressStatus,
+                'exam_draft_status' => $examDraftStatus,
+                'homework_status' => $homeworkStatus,
             ];
-            $missingItemsForSection = $this->buildMissingItems($statusDetails);
+            $missingItemsForSection = $this->buildMissingItems($statusDetails, $semester);
             $missingItemCount += count($missingItemsForSection);
             $totalStatuses += count($statusDetails);
 
             $rows[] = [
-                'class_section' => $section['class_section'] ?? "Section {$classSectionId}",
+                'class_section' => $sectionMap[$classSectionId] ?? ($section['class_section'] ?? "Section {$classSectionId}"),
                 'class_section_id' => $classSectionId,
                 'teachers' => $teacherList,
                 'midterm_score_status' => $midtermScoreStatus,
@@ -880,6 +1007,9 @@ class AdministratorController extends BaseController
                 'participation_status' => $participationStatus,
                 'ptap_comment_status' => $ptapCommentStatus,
                 'attendance_status' => $attendanceStatus,
+                'class_progress_status' => $classProgressStatus,
+                'exam_draft_status' => $examDraftStatus,
+                'homework_status' => $homeworkStatus,
                 'missing_items' => $missingItemsForSection,
                 'student_count' => $expected,
             ];
@@ -941,15 +1071,183 @@ class AdministratorController extends BaseController
             'schoolYear' => $schoolYear,
             'notificationHistory' => $historyMap,
             'summary' => $summary,
+            'lowProgressSectionIds' => $lowProgressSectionIds,
+            'examDraftDeadlineConfig' => $examDraftDeadlineConfig,
+            'examDraftDeadlineFormatted' => $examDraftDeadlineFormatted,
         ]);
     }
 
+    private function resolveLowProgressSectionIds(array $sectionIds): array
+    {
+        [$expectedWeeks, $submittedBySection] = $this->buildClassProgressStats($sectionIds);
+        if ($expectedWeeks <= 0) {
+            return [];
+        }
+
+        $lowProgressSectionIds = [];
+        foreach ($sectionIds as $sectionId) {
+            $submitted = (int) ($submittedBySection[$sectionId] ?? 0);
+            $percent = ($submitted / $expectedWeeks) * 100;
+            if ($percent < 50) {
+                $lowProgressSectionIds[] = $sectionId;
+            }
+        }
+
+        return $lowProgressSectionIds;
+    }
+
+    private function buildClassProgressStats(array $sectionIds): array
+    {
+        $sectionIds = array_values(array_unique(array_filter(array_map('intval', $sectionIds))));
+        if (empty($sectionIds)) {
+            return [0, []];
+        }
+
+        $semesterResolver = new SemesterRangeService($this->configModel);
+        $schoolYear = (string)($this->configModel->getConfig('school_year') ?? '');
+        $semester = (string)($this->configModel->getConfig('semester') ?? '');
+        $schoolYearForRange = $schoolYear !== '' ? $schoolYear : (string)($this->configModel->getConfig('school_year') ?? '');
+        [$rangeStart, $rangeEnd] = $semesterResolver->getSchoolYearRange($schoolYearForRange);
+        $semesterNorm = $semesterResolver->normalizeSemester($semester);
+        if ($semesterNorm !== '' && $schoolYearForRange !== '') {
+            $semRange = $semesterResolver->getSemesterRange($schoolYearForRange, $semesterNorm);
+            if ($semRange) {
+                [$rangeStart, $rangeEnd] = $semRange;
+            }
+        }
+
+        $dateList = [];
+        try {
+            $start = new \DateTimeImmutable($rangeStart);
+            $end = new \DateTimeImmutable($rangeEnd);
+            $cursor = $start;
+            $w = (int) $cursor->format('w');
+            if ($w !== 0) {
+                $cursor = $cursor->modify('next sunday');
+            }
+            while ($cursor <= $end) {
+                $dateList[] = $cursor->format('Y-m-d');
+                $cursor = $cursor->modify('+7 days');
+            }
+        } catch (\Throwable $e) {
+            $dateList = [];
+        }
+
+        $noSchoolDays = [];
+        $events = [];
+        try {
+            $calendarModel = new \App\Models\CalendarModel();
+            $events = $calendarModel->getEvents();
+        } catch (\Throwable $e) {
+            $events = [];
+        }
+        foreach ($events as $event) {
+            $d = substr((string) ($event['date'] ?? ''), 0, 10);
+            if ($d === '' || empty($event['no_school'])) {
+                continue;
+            }
+            if ($d < $rangeStart || $d > $rangeEnd) {
+                continue;
+            }
+            $eventYear = trim((string) ($event['school_year'] ?? ''));
+            if ($schoolYearForRange !== '' && $eventYear !== '' && $eventYear !== $schoolYearForRange) {
+                continue;
+            }
+            $noSchoolDays[$d] = true;
+        }
+
+        $anchorSundayYmd = '';
+        try {
+            $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
+            $tzObj = new \DateTimeZone($tzName ?: 'UTC');
+        } catch (\Throwable $e) {
+            try {
+                $tzObj = new \DateTimeZone(user_timezone() ?: 'UTC');
+            } catch (\Throwable $e2) {
+                $tzObj = new \DateTimeZone('UTC');
+            }
+        }
+        try {
+            $nowDate = new \DateTime('now', $tzObj);
+        } catch (\Throwable $e) {
+            $nowDate = new \DateTime('now');
+        }
+        $weekday = (int) $nowDate->format('w');
+        $anchorSundayYmd = $weekday === 0
+            ? $nowDate->format('Y-m-d')
+            : $nowDate->modify('next sunday')->format('Y-m-d');
+
+        $activeDatesSet = [];
+        if (! empty($dateList) && $anchorSundayYmd !== '') {
+            foreach ($dateList as $d) {
+                if ($d <= $anchorSundayYmd && empty($noSchoolDays[$d])) {
+                    $activeDatesSet[$d] = true;
+                }
+            }
+        }
+        $expectedWeeks = count($activeDatesSet);
+        if ($expectedWeeks === 0) {
+            return [0, []];
+        }
+
+        $builder = $this->db->table('class_progress_reports')
+            ->select('class_section_id, week_start')
+            ->whereIn('class_section_id', $sectionIds);
+        if (! empty($activeDatesSet)) {
+            $builder->whereIn('week_start', array_keys($activeDatesSet));
+        }
+        $rows = $builder->get()->getResultArray();
+
+        $submittedBySection = [];
+        foreach ($rows as $row) {
+            $sectionId = (int) ($row['class_section_id'] ?? 0);
+            $weekStart = (string) ($row['week_start'] ?? '');
+            if ($sectionId === 0 || $weekStart === '' || empty($activeDatesSet[$weekStart])) {
+                continue;
+            }
+            $submittedBySection[$sectionId][$weekStart] = true;
+        }
+
+        $counts = [];
+        foreach ($sectionIds as $sectionId) {
+            $counts[$sectionId] = isset($submittedBySection[$sectionId])
+                ? count($submittedBySection[$sectionId])
+                : 0;
+        }
+
+        return [$expectedWeeks, $counts];
+    }
+
     public function sendTeacherSubmissionNotifications()
     {$notify = $this->request->getPost('notify');
         if (!is_array($notify)) {
             return redirect()->back()->with('info', 'Select at least one teacher to notify.');
         }
+        $semester = (string)($this->configModel->getConfig('semester') ?? $this->semester ?? '');
         $missingItemsPayload = $this->request->getPost('missing_items') ?? [];
+        $homeworkNotifyAll = (bool) $this->request->getPost('homework_notify_all');
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreLabel = $examTerm === 'final' ? 'final scores' : 'midterm scores';
+        $examCommentLabel = $examTerm === 'final' ? 'final comments' : 'midterm comments';
+        $forcedItems = [];
+        if ($this->request->getPost('notify_midterm_score')) {
+            $forcedItems[] = $examScoreLabel;
+        }
+        if ($this->request->getPost('notify_midterm_comment')) {
+            $forcedItems[] = $examCommentLabel;
+        }
+        if ($this->request->getPost('notify_participation')) {
+            $forcedItems[] = 'participation';
+        }
+        if ($this->request->getPost('notify_ptap_comment')) {
+            $forcedItems[] = 'PTAP comments';
+        }
+        if ($this->request->getPost('notify_class_progress')) {
+            $forcedItems[] = 'class progress';
+        }
+        if ($this->request->getPost('notify_exam_draft')) {
+            $forcedItems[] = 'exam draft';
+        }
 
         $targets = [];
         foreach ($notify as $sectionIdRaw => $teachers) {
@@ -1006,6 +1304,10 @@ class AdministratorController extends BaseController
 
         $historyModel = new TeacherSubmissionNotificationHistoryModel();
         $scoreUrl = site_url('/');
+        $progressUrl = site_url('teacher/progress/history');
+        $examDraftUrl = site_url('teacher/exam-drafts');
+        $homeworkUrl = site_url('teacher/addHomework');
+        $examDraftDeadlineEmailHtml = $this->buildExamDraftDeadlineEmailHtml();
         $sentCount = 0;
         $failCount = 0;
 
@@ -1021,6 +1323,13 @@ class AdministratorController extends BaseController
             $subject = "Reminder: Complete submissions for {$sectionName}";
             $missingPayload = $missingItemsPayload[$classSectionId][$teacherId] ?? '';
             $missingItems = $this->parseMissingItemsPayload((string)$missingPayload);
+            $selectedItems = $forcedItems;
+            if ($homeworkNotifyAll && !in_array('homework', $selectedItems, true)) {
+                $selectedItems[] = 'homework';
+            }
+            if (!empty($selectedItems)) {
+                $missingItems = array_values(array_unique($selectedItems));
+            }
             if (!empty($missingItems)) {
                 $missingText = htmlspecialchars(
                     $this->formatMissingItemsText($missingItems),
@@ -1033,10 +1342,46 @@ class AdministratorController extends BaseController
             }
 
             $subject = "Reminder: Complete submissions for {$sectionName}";
+            $progressNote = '';
+            if (in_array('class progress', $missingItems, true)) {
+                $progressNote = "<p>Class progress submissions can be updated at <a href=\"{$progressUrl}\">Teacher Progress History</a>.</p>";
+            }
+            $examDraftNote = '';
+            if (in_array('exam draft', $missingItems, true)) {
+                $semesterLabel = strtolower(trim((string) $semester));
+                if ($semesterLabel === 'fall') {
+                    $draftLabel = 'midterm exam draft';
+                } elseif ($semesterLabel === 'spring') {
+                    $draftLabel = 'final exam draft';
+                } else {
+                    $draftLabel = 'exam draft';
+                }
+                $examDraftNote = "<p>" . ucfirst($draftLabel) . " submissions can be updated at <a href=\"{$examDraftUrl}\">Teacher Exam Drafts</a>.</p>"
+                    . $examDraftDeadlineEmailHtml;
+            }
+            $homeworkNote = '';
+            if (in_array('homework', $missingItems, true)) {
+                $homeworkNote = "<p>Homework scores can be submitted at <a href=\"{$homeworkUrl}\">Teacher Homework</a>.</p>";
+            }
+            $hasScoreItems = (bool) array_intersect($missingItems, [
+                'midterm scores',
+                'midterm comments',
+                'final scores',
+                'final comments',
+                'participation',
+                'PTAP comments',
+                'homework',
+            ]);
+            $nonScoreOnly = ! empty($missingItems) && ! $hasScoreItems;
             $body = "<p>Dear {$teacherName},</p>"
-                . "<p>Administration is gently reminding you to wrap up any remaining score submissions and/or comments for {$sectionName}.</p>"
+                . "<p>Administration is gently reminding you to wrap up any remaining "
+                . ($nonScoreOnly ? "submissions for {$sectionName}." : "score submissions, comments, and related items for {$sectionName}.")
+                . "</p>"
                 . $missingNote
-                . "<p>Visit <a href=\"{$scoreUrl}\">Teacher Score Submission</a> to address any remaining items.</p>"
+                . $progressNote
+                . $examDraftNote
+                . $homeworkNote
+                . ($nonScoreOnly ? '' : "<p>Visit <a href=\"{$scoreUrl}\">Teacher Score Submission</a> to address any remaining items.</p>")
                 . "<p>Thank you,<br>Al Rahma Administration</p>";
 
             $email = $teacher['email'] ?? '';
@@ -1098,6 +1443,170 @@ class AdministratorController extends BaseController
         ];
     }
 
+    private function progressStatus(int $submitted, int $expected): array
+    {
+        if ($expected <= 0) {
+            return [
+                'label' => 'N/A',
+                'badge' => 'bg-secondary',
+                'detail' => '',
+                'completed' => true,
+            ];
+        }
+        $completed = $submitted >= $expected;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => "{$submitted}/{$expected}",
+            'completed' => $completed,
+        ];
+    }
+
+    private function homeworkStatus(int $submitted): array
+    {
+        $completed = $submitted > 0;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => $completed ? (string) $submitted : '0',
+            'completed' => $completed,
+        ];
+    }
+
+    private function draftStatus(int $submitted, ?\DateTimeImmutable $deadline): array
+    {
+        if ($deadline !== null) {
+            $today = new \DateTimeImmutable('today');
+            if ($today < $deadline) {
+                return [
+                    'label' => 'Pending',
+                    'badge' => 'bg-secondary',
+                    'detail' => 'Not due',
+                    'completed' => true,
+                ];
+            }
+        }
+        $completed = $submitted > 0;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => $completed ? (string) $submitted : '0',
+            'completed' => $completed,
+        ];
+    }
+
+    /**
+     * Exam draft due date for the teacher submissions dashboard: prefers the configuration key
+     * `exam_draft_deadline` (same as automated reminders); otherwise fall/spring exam deadlines.
+     */
+    private function resolveTeacherDashboardExamDraftDeadline(string $semester, string $schoolYear): ?\DateTimeImmutable
+    {
+        $fromExamDraftKey = $this->parseExamDraftDeadlineConfigValue();
+        if ($fromExamDraftKey !== null) {
+            return $fromExamDraftKey;
+        }
+
+        return $this->resolveExamDraftDeadline($semester, $schoolYear);
+    }
+
+    /**
+     * Parses the `exam_draft_deadline` configuration value using the application timezone (midnight that calendar day).
+     */
+    private function parseExamDraftDeadlineConfigValue(): ?\DateTimeImmutable
+    {
+        $raw = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        if ($raw === '') {
+            return null;
+        }
+        $tz = new \DateTimeZone(config('App')->appTimezone ?? 'UTC');
+        try {
+            $deadline = new \DateTimeImmutable($raw, $tz);
+        } catch (\Throwable $e) {
+            return null;
+        }
+
+        return $deadline->setTime(0, 0, 0);
+    }
+
+    /**
+     * HTML snippet for reminder emails when exam draft is included (deadline from exam_draft_deadline config).
+     */
+    private function buildExamDraftDeadlineEmailHtml(): string
+    {
+        $raw = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        if ($raw === '') {
+            return '';
+        }
+        $parsed = $this->parseExamDraftDeadlineConfigValue();
+        $display = $parsed !== null
+            ? htmlspecialchars($parsed->format('l, F j, Y'), ENT_QUOTES, 'UTF-8')
+            : htmlspecialchars($raw, ENT_QUOTES, 'UTF-8');
+        $rawEsc = htmlspecialchars($raw, ENT_QUOTES, 'UTF-8');
+
+        return '<p><strong>Exam draft submission deadline</strong> (<code>exam_draft_deadline</code>): '
+            . "<strong>{$display}</strong>"
+            . ($parsed !== null && $rawEsc !== $display ? " <span style=\"color:#555;\">(configured value: {$rawEsc})</span>" : '')
+            . '.</p>';
+    }
+
+    private function resolveExamDraftDeadline(string $semester, string $schoolYear): ?\DateTimeImmutable
+    {
+        $semesterKey = strtolower(trim($semester));
+        if ($semesterKey === 'fall') {
+            $deadlineValue = (string)($this->configModel->getConfig('fall_exam_deadline') ?? '');
+        } elseif ($semesterKey === 'spring') {
+            $deadlineValue = (string)($this->configModel->getConfig('spring_exam_deadline') ?? '');
+        } else {
+            return null;
+        }
+        $deadlineValue = trim($deadlineValue);
+        if ($deadlineValue === '') {
+            return null;
+        }
+        try {
+            $deadline = new \DateTimeImmutable($deadlineValue);
+        } catch (\Throwable $e) {
+            return null;
+        }
+        if ($schoolYear !== '' && preg_match('/^\d{4}-\d{4}$/', $schoolYear)) {
+            $deadlineYear = $deadline->format('Y');
+            if ($deadlineYear === '1970') {
+                return null;
+            }
+        }
+        return $deadline->setTime(0, 0, 0);
+    }
+
+    private function resolveExamTermLabel(string $semester): string
+    {
+        $semesterKey = strtolower(trim($semester));
+        if ($semesterKey === '') {
+            return 'midterm';
+        }
+        if (str_contains($semesterKey, 'spring')) {
+            return 'final';
+        }
+        if (str_contains($semesterKey, 'fall')) {
+            return 'midterm';
+        }
+        return 'midterm';
+    }
+
+    private function buildSemesterCandidates(string $semester): array
+    {
+        $semester = trim((string) $semester);
+        if ($semester === '') {
+            return [];
+        }
+        $candidates = [
+            $semester,
+            strtolower($semester),
+            strtoupper($semester),
+            ucfirst(strtolower($semester)),
+        ];
+        $candidates = array_values(array_unique(array_filter($candidates, static fn ($v) => $v !== '')));
+        return $candidates;
+    }
     private function attendanceStatus(bool $submitted): array
     {
         return [
@@ -1107,14 +1616,20 @@ class AdministratorController extends BaseController
         ];
     }
 
-    private function buildMissingItems(array $statusMap): array
+    private function buildMissingItems(array $statusMap, string $semester): array
     {
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreLabel = $examTerm === 'final' ? 'final scores' : 'midterm scores';
+        $examCommentLabel = $examTerm === 'final' ? 'final comments' : 'midterm comments';
         $labels = [
-            'midterm_score_status' => 'midterm scores',
+            'midterm_score_status' => $examScoreLabel,
-            'midterm_comment_status' => 'midterm comments',
+            '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/AuthorizedUsersController.php

@@ -10,6 +10,8 @@ use CodeIgniter\I18n\Time;
 
 class AuthorizedUsersController extends ResourceController
 {
+    private const TOKEN_TTL_HOURS = 24;
+
     protected $userModel;
     protected $authorizedUserModel;
 
@@ -18,6 +20,30 @@ class AuthorizedUsersController extends ResourceController
         $this->userModel = new UserModel();
         $this->authorizedUserModel = new AuthorizedUserModel();
     }
+
+    private function requireLogin()
+    {
+        if (!session()->get('is_logged_in')) {
+            return $this->failUnauthorized('Authentication required.');
+        }
+
+        return null;
+    }
+
+    private function requireOwnership(array $authorizedUser)
+    {
+        $userId = (int) session()->get('user_id');
+        if ($userId <= 0 || (int) ($authorizedUser['user_id'] ?? 0) !== $userId) {
+            return $this->failForbidden('You do not have access to this resource.');
+        }
+
+        return null;
+    }
+
+    private function hashToken(string $token): string
+    {
+        return hash('sha256', $token);
+    }
     /**
      * Return a list of authorized users for the logged-in main user.
      *
@@ -25,7 +51,10 @@ class AuthorizedUsersController extends ResourceController
      */
     public function index()
     {
-        
+        if ($resp = $this->requireLogin()) {
+            return $resp;
+        }
+
         $userId = session()->get('user_id');
         $authorizedUsers = $this->authorizedUserModel->where('user_id', $userId)->findAll();
 
@@ -40,12 +69,20 @@ class AuthorizedUsersController extends ResourceController
      */
     public function show($id = null)
     {
+        if ($resp = $this->requireLogin()) {
+            return $resp;
+        }
+
         $authorizedUser = $this->authorizedUserModel->find($id);
 
         if (!$authorizedUser) {
             return $this->failNotFound('Authorized user not found.');
         }
 
+        if ($resp = $this->requireOwnership($authorizedUser)) {
+            return $resp;
+        }
+
         return $this->respond($authorizedUser);
     }
 
@@ -56,6 +93,10 @@ class AuthorizedUsersController extends ResourceController
      */
     public function create()
     {
+        if ($resp = $this->requireLogin()) {
+            return $resp;
+        }
+
         $email = strtolower($this->request->getPost('email'));
 
         // Validate email
@@ -66,19 +107,20 @@ class AuthorizedUsersController extends ResourceController
         $user = $this->userModel->where('email', $email)->first();
 
         if (!$user) {
-            return $this->failNotFound('No user found with this email.');
+            return $this->respondCreated(['message' => 'Authorized user added. A confirmation email has been sent.']);
         }
 
         // Generate a token for confirmation
         helper('text');
         $token = bin2hex(random_bytes(48));
+        $tokenHash = $this->hashToken($token);
 
         // Add entry to the authorized_users table
         $this->authorizedUserModel->insert([
             'user_id' => session()->get('user_id'),  // Main user ID
             'authorized_user_id' => $user['id'],
             'email' => $email,
-            'token' => $token,
+            'token' => $tokenHash,
             'status' => 'Pending'
         ]);
 
@@ -96,6 +138,10 @@ class AuthorizedUsersController extends ResourceController
      */
     public function update($id = null)
     {
+        if ($resp = $this->requireLogin()) {
+            return $resp;
+        }
+
         // Fetch the authorized user
         $authorizedUser = $this->authorizedUserModel->find($id);
 
@@ -103,6 +149,10 @@ class AuthorizedUsersController extends ResourceController
             return $this->failNotFound('Authorized user not found.');
         }
 
+        if ($resp = $this->requireOwnership($authorizedUser)) {
+            return $resp;
+        }
+
         // Update the authorized user’s information (e.g., email)
         $email = strtolower($this->request->getPost('email'));
         if ($email && filter_var($email, FILTER_VALIDATE_EMAIL)) {
@@ -122,12 +172,20 @@ class AuthorizedUsersController extends ResourceController
      */
     public function delete($id = null)
     {
+        if ($resp = $this->requireLogin()) {
+            return $resp;
+        }
+
         $authorizedUser = $this->authorizedUserModel->find($id);
 
         if (!$authorizedUser) {
             return $this->failNotFound('Authorized user not found.');
         }
 
+        if ($resp = $this->requireOwnership($authorizedUser)) {
+            return $resp;
+        }
+
         // Delete the authorized user record
         $this->authorizedUserModel->delete($id);
 
@@ -147,16 +205,28 @@ class AuthorizedUsersController extends ResourceController
             return $this->fail('Invalid confirmation link.');
         }
 
-        $authorizedUser = $this->authorizedUserModel->where('token', $token)->first();
+        $tokenHash = $this->hashToken($token);
+        $authorizedUser = $this->authorizedUserModel
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
+            ->where('created_at >=', Time::now()->subHours(self::TOKEN_TTL_HOURS)->toDateTimeString())
+            ->first();
 
         if (!$authorizedUser) {
             return $this->fail('Invalid or expired confirmation link.');
         }
 
-        // Mark the authorized user as active
+        // Mark the authorized user as active and rotate token for password setup
-        $this->authorizedUserModel->update($authorizedUser['id'], ['status' => 'Active', 'token' => null]);
+        $nextToken = bin2hex(random_bytes(48));
+        $nextTokenHash = $this->hashToken($nextToken);
+        $this->authorizedUserModel->update($authorizedUser['id'], [
+            'status' => 'Active',
+            'token'  => $nextTokenHash,
+        ]);
 
-        return redirect()->to('/set_authorized_user_password/' . $authorizedUser['authorized_user_id']);
+        return redirect()->to('/set_authorized_user_password/' . $authorizedUser['authorized_user_id'] . '?token=' . $nextToken);
     }
 
     /**
@@ -167,13 +237,36 @@ class AuthorizedUsersController extends ResourceController
      */
     public function setPassword($authorizedUserId)
     {
+        $token = (string) $this->request->getGet('token');
+        if ($token === '') {
+            return $this->fail('Invalid confirmation link.');
+        }
+
+        $tokenHash = $this->hashToken($token);
+        $authorizedUser = $this->authorizedUserModel
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
+            ->where('authorized_user_id', $authorizedUserId)
+            ->where('status', 'Active')
+            ->where('updated_at >=', Time::now()->subHours(self::TOKEN_TTL_HOURS)->toDateTimeString())
+            ->first();
+
+        if (!$authorizedUser) {
+            return $this->fail('Invalid or expired confirmation link.');
+        }
+
         $user = $this->userModel->find($authorizedUserId);
 
         if (!$user) {
             return $this->failNotFound('User not found.');
         }
 
-        return view('user/set_authorized_user_password', ['userId' => $authorizedUserId]);
+        return view('user/set_authorized_user_password', [
+            'userId' => $authorizedUserId,
+            'token'  => $token,
+        ]);
     }
 
     /**
@@ -181,38 +274,59 @@ class AuthorizedUsersController extends ResourceController
      *
      * @return ResponseInterface
      */
-  /*
+    public function savePassword($authorizedUserId = null)
-     public function savePassword()
     {
-        // Validate the request
         $validation = \Config\Services::validation();
         $validation->setRules([
-            'password' => 'required|min_length[6]',
+            'password' => [
+                'label' => 'Password',
+                'rules' => 'required|min_length[8]|regex_match[/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@\\-=\\+*#$%&!?])[A-Za-z\\d@\\-=\\+*#$%&!?]{8,}$/]',
+            ],
             'password_confirm' => 'required|matches[password]',
-            'user_id' => 'required|integer'
+            'user_id' => 'required|integer',
+            'token' => 'required',
         ]);
 
         if (!$this->validate($validation->getRules())) {
             return $this->failValidationErrors($validation->getErrors());
         }
 
-        // Get the validated input
+        $userId = (int) $this->request->getPost('user_id');
-        $userId = $this->request->getPost('user_id');
+        $token  = (string) $this->request->getPost('token');
-        $password = $this->request->getPost('password');
+        $authorizedUserId = $authorizedUserId !== null ? (int) $authorizedUserId : $userId;
 
-        $model = new UserModel();
+        if ($userId <= 0 || $authorizedUserId <= 0 || $userId !== $authorizedUserId) {
-        $user = $model->find($userId);
+            return $this->fail('Invalid request.');
+        }
 
+        $tokenHash = $this->hashToken($token);
+        $authorizedUser = $this->authorizedUserModel
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
+            ->where('authorized_user_id', $authorizedUserId)
+            ->where('status', 'Active')
+            ->where('updated_at >=', Time::now()->subHours(self::TOKEN_TTL_HOURS)->toDateTimeString())
+            ->first();
+
+        if (!$authorizedUser) {
+            return $this->fail('Invalid or expired confirmation link.');
+        }
+
+        $user = $this->userModel->find($authorizedUserId);
         if (!$user) {
             return $this->failNotFound('User not found.');
         }
 
-        // Save the password
+        $password = (string) $this->request->getPost('password');
-        $model->update($userId, ['password' => password_hash($password, PASSWORD_DEFAULT)]);
+        $hashedPassword = pbkdf2_hash($password);
+
+        $this->userModel->update($authorizedUserId, ['password' => $hashedPassword]);
+        $this->authorizedUserModel->update($authorizedUser['id'], ['token' => null]);
 
         return $this->respond(['message' => 'Password has been successfully set.']);
     }
-*/
     /**
      * Sends a confirmation email to the authorized user.
      *
@@ -242,4 +356,4 @@ class AuthorizedUsersController extends ResourceController
             log_message('error', 'Failed to send authorized user confirmation email to ' . $email);
         }
     }
-}
+}

app/Controllers/View/EventController.php

@@ -93,58 +93,6 @@ class EventController extends ResourceController
                 'created_by' => session()->get('user_id'),
             ]);
 
-            if ($eventId) {
-                $amount = (float) $this->request->getPost('amount');
-                $semester = (string) $this->request->getPost('semester');
-                $schoolYear = (string) $this->request->getPost('school_year');
-                $userId = (int) (session()->get('user_id') ?? 0);
-
-                $enrollments = $this->enrollmentModel
-                    ->select('enrollments.student_id, students.parent_id')
-                    ->join('students', 'students.id = enrollments.student_id', 'left')
-                    ->where('enrollments.school_year', $schoolYear)
-                    ->whereIn('enrollments.enrollment_status', ['enrolled', 'payment pending'])
-                    ->findAll();
-
-                $parentIds = [];
-                foreach ($enrollments as $row) {
-                    $studentId = (int) ($row['student_id'] ?? 0);
-                    $parentId = (int) ($row['parent_id'] ?? 0);
-                    if ($studentId <= 0 || $parentId <= 0) {
-                        continue;
-                    }
-
-                    $exists = $this->eventChargesModel
-                        ->where('event_id', $eventId)
-                        ->where('student_id', $studentId)
-                        ->where('school_year', $schoolYear)
-                        ->where('semester', $semester)
-                        ->first();
-
-                    if ($exists) {
-                        continue;
-                    }
-
-                    $this->eventChargesModel->insert([
-                        'event_id' => $eventId,
-                        'parent_id' => $parentId,
-                        'student_id' => $studentId,
-                        'participation' => 'yes',
-                        'charged' => $amount,
-                        'school_year' => $schoolYear,
-                        'semester' => $semester,
-                        'updated_by' => $userId ?: null,
-                    ]);
-
-                    $parentIds[] = $parentId;
-                }
-
-                $parentIds = array_unique($parentIds);
-                foreach ($parentIds as $pid) {
-                    $this->invoiceController->generateInvoice((string) $pid);
-                }
-            }
-
             return redirect()->to('/administrator/events')->with('success', 'Event created successfully');
         }
 
@@ -240,17 +188,24 @@ class EventController extends ResourceController
 
         $parents = $this->userModel->getParents();
         $events = $this->eventModel->getActiveEvents($this->schoolYear);
+        $filterEventId = (int) ($this->request->getGet('event_id') ?? 0);
 
-        $charges = $this->eventChargesModel
+        $chargesBuilder = $this->eventChargesModel
             ->select('event_charges.*, 
                     users.firstname AS parent_firstname, users.lastname AS parent_lastname, 
                     students.firstname AS student_firstname, students.lastname AS student_lastname,
-                    events.event_name')
+                    events.event_name, events.description AS event_description, events.amount AS event_amount')
             ->join('users', 'users.id = event_charges.parent_id', 'left')
             ->join('students', 'students.id = event_charges.student_id', 'left')
             ->join('events', 'events.id = event_charges.event_id', 'left')
             ->where('event_charges.school_year', $schoolYear)
-            ->where('event_charges.semester', $semester)
+            ->where('event_charges.semester', $semester);
+
+        if ($filterEventId > 0) {
+            $chargesBuilder->where('event_charges.event_id', $filterEventId);
+        }
+
+        $charges = $chargesBuilder
             ->orderBy('event_charges.created_at', 'DESC')
             ->findAll();
 
@@ -260,6 +215,7 @@ class EventController extends ResourceController
             'events'  => $events,
             'school_year' => $schoolYear,
             'semester' => $semester,
+            'filterEventId' => $filterEventId,
         ]);
     }
 

app/Controllers/View/FilesController.php

@@ -271,8 +271,8 @@ class FilesController extends Controller
 
     private function buildDraftDownloadName(string $filename, string $subdir): string
     {
-        $column = $subdir === 'finals' ? 'final_file' : 'teacher_file';
         $db = Database::connect();
+        $column = $subdir === 'finals' ? 'final_file' : $this->resolveExamDraftFileColumn($db);
         $row = $db->table('exam_drafts ed')
             ->select('ed.version, ed.exam_type, ed.class_section_id, cs.class_section_name')
             ->join('classSection cs', 'cs.class_section_id = ed.class_section_id', 'left')
@@ -301,4 +301,20 @@ class FilesController extends Controller
         $value = trim($value, '_');
         return $value === '' ? 'Exam' : mb_strtolower($value);
     }
+
+    private function resolveExamDraftFileColumn($db): string
+    {
+        try {
+            $fields = $db->getFieldNames('exam_drafts');
+            if (in_array('teacher_file', $fields, true)) {
+                return 'teacher_file';
+            }
+            if (in_array('author_file', $fields, true)) {
+                return 'author_file';
+            }
+        } catch (\Throwable $e) {
+            log_message('error', 'FilesController::resolveExamDraftFileColumn error: ' . $e->getMessage());
+        }
+        return 'teacher_file';
+    }
 }

app/Controllers/View/FinancialController.php

@@ -216,25 +216,28 @@ public function financialReport()
         $schoolYears[] = (string)$schoolYear;
     }
     
+    $eventFeesTotal = $this->getEventFeesTotal($schoolYear, $dateFrom, $dateTo);
+
     // JSON API support
     if ($this->wantsJson() || strtolower((string)($this->request->getGet('format') ?? '')) === 'json') {
-        return $this->response->setJSON([
+      return $this->response->setJSON([
-            'ok'               => true,
+        'ok'               => true,
-            'selectedYear'     => $schoolYear,
+        'selectedYear'     => $schoolYear,
-            'dateFrom'         => $dateFrom,
+        'dateFrom'         => $dateFrom,
-            'dateTo'           => $dateTo,
+        'dateTo'           => $dateTo,
             'schoolYears'      => $schoolYears,
             'invoices'         => $invoices,
             'payments'         => $payments,
             'paymentBreakdown' => $paymentBreakdown,
             'paymentTotals'    => $paymentTotals,
-            'refunds'          => $refunds,
+        'refunds'          => $refunds,
-            'expenses'         => $expenses,
+        'expenses'         => $expenses,
-            'reimbursements'   => $reimbursements,
+        'reimbursements'   => $reimbursements,
-            'discounts'        => $discounts,
+        'discounts'        => $discounts,
-            'csrf_token'       => csrf_token(),
+        'eventFeesTotal'   => $eventFeesTotal,
-            'csrf_hash'        => csrf_hash(),
+        'csrf_token'       => csrf_token(),
-        ]);
+        'csrf_hash'        => csrf_hash(),
+      ]);
     }
 
     return view('payment/financial_report', [
@@ -246,6 +249,7 @@ public function financialReport()
         'expenses'         => $expenses,
         'reimbursements'   => $reimbursements,
         'discounts'        => $discounts,
+        'eventFeesTotal'   => $eventFeesTotal,
         'selectedYear'     => $schoolYear,
         'schoolYears'      => $schoolYears,
         'dateFrom'         => $dateFrom,
@@ -1058,6 +1062,7 @@ public function financialReport()
         $amountCollected = $totalPaid;
         $netAmount = ($totalCharges - $totalDiscounts - $totalRefunds);
 
+        $totalEventFees = $this->getEventFeesTotal($schoolYear, $invoiceDateFrom, $invoiceDateTo);
         return [
             'schoolYear' => $schoolYear,
             'dateFrom' => $dateFrom,
@@ -1073,9 +1078,28 @@ public function financialReport()
             'amountCollected' => $amountCollected,
             'totalUnpaid' => $totalUnpaid,
             'netAmount' => $netAmount,
+            'totalEventFees' => $totalEventFees,
         ];
     }
 
+    private function getEventFeesTotal(?string $schoolYear, ?string $dateFrom, ?string $dateTo): float
+    {
+        $db = \Config\Database::connect();
+        $builder = $db->table('event_charges ec')
+            ->select('COALESCE(SUM(ec.charged),0) AS amount', false);
+        if (!empty($schoolYear)) {
+            $builder->where('ec.school_year', $schoolYear);
+        }
+        if (!empty($dateFrom)) {
+            $builder->where('DATE(ec.created_at) >=', $dateFrom);
+        }
+        if (!empty($dateTo)) {
+            $builder->where('DATE(ec.created_at) <=', $dateTo);
+        }
+        $row = $builder->get()->getRowArray();
+        return $row ? (float)($row['amount'] ?? 0) : 0.0;
+    }
+
 
     /**
      * Management page: list parents with outstanding balances (> 0) for a school year.
@@ -1226,6 +1250,23 @@ public function financialReport()
             $byParent[$pid]['total_balance'] += $extra;
         }
 
+        $eventFeesPerParent = [];
+        try {
+            $eventFeesRows = $db->table('event_charges ec')
+                ->select('ec.parent_id, COALESCE(SUM(ec.charged),0) AS event_fees', false)
+                ->where('ec.school_year', $schoolYear)
+                ->groupBy('ec.parent_id')
+                ->get()
+                ->getResultArray();
+            foreach ($eventFeesRows as $row) {
+                $pid = (int)($row['parent_id'] ?? 0);
+                if ($pid <= 0) continue;
+                $eventFeesPerParent[$pid] = (float)($row['event_fees'] ?? 0);
+            }
+        } catch (\Throwable $e) {
+            // ignore, fallback to no event fees data
+        }
+
         // Reduce into rows list; only parents with positive balance
         // Also compute remaining installments and suggested monthly amount
         $rows = [];
@@ -1305,7 +1346,7 @@ public function financialReport()
             }
         }
 
-        $dataRows = array_map(function(array $r) use ($hasPayments, $paidTotals, $paymentCounts, $nextInstallmentYmd) {
+        $dataRows = array_map(function(array $r) use ($hasPayments, $paidTotals, $paymentCounts, $nextInstallmentYmd, $eventFeesPerParent) {
             $pid = (int)($r['parent_id'] ?? 0);
             $name = trim((string)($r['firstname'] ?? '') . ' ' . (string)($r['lastname'] ?? ''));
             return [
@@ -1322,6 +1363,7 @@ public function financialReport()
                 'payment_count' => isset($paymentCounts[$pid]) ? (int)$paymentCounts[$pid] : 0,
                 'has_installment'=> isset($hasPayments[$pid]) ? 1 : 0,
                 'next_installment' => $nextInstallmentYmd,
+                'event_fees'     => (float)($eventFeesPerParent[$pid] ?? 0),
             ];
         }, $rows);
 

app/Controllers/View/FlagController.php

@@ -421,17 +421,45 @@ class FlagController extends Controller
         log_message('debug', 'Flag state: ' . $this->request->getPost('flag_state'));
 
         $currentFlagModel = new CurrentFlagModel();
+        $userId = session()->get('user_id');
 
         // Get the new flag state from the form
         $newState = $this->request->getPost('flag_state');
+        $stateDescription = (string) ($this->request->getPost('state_description') ?? '');
+        $actionTaken = (string) ($this->request->getPost('action_taken') ?? '');
 
         if (!$newState) {
             session()->setFlashdata('error', 'incident state not provided.');
             return $this->index();
         }
 
+        $update = ['flag_state' => $newState];
+        if ($newState === 'Closed') {
+            $update['updated_by_closed'] = $userId;
+            if ($stateDescription !== '') {
+                $update['close_description'] = $stateDescription;
+            }
+            if ($actionTaken !== '') {
+                $update['action_taken'] = $actionTaken;
+            }
+        } elseif ($newState === 'Canceled') {
+            $update['updated_by_canceled'] = $userId;
+            if ($stateDescription !== '') {
+                $update['cancel_description'] = $stateDescription;
+            }
+            if ($actionTaken !== '') {
+                $update['action_taken'] = $actionTaken;
+            }
+        }
+
         // Update the flag state in the database
-        if ($currentFlagModel->update($id, ['flag_state' => $newState])) {
+        if ($currentFlagModel->update($id, $update)) {
+            if ($newState === 'Closed' || $newState === 'Canceled') {
+                $flagData = $currentFlagModel->find($id);
+                if ($flagData) {
+                    return $this->moveToHistory($flagData);
+                }
+            }
             session()->setFlashdata('success', 'Incident state updated successfully!');
         } else {
             $errors = $currentFlagModel->errors();

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
@@ -1216,6 +1216,14 @@ class GradingController extends Controller
 
         $flagModel = new CurrentFlagModel();
         $semKey = strtolower(trim($semester));
+        $redirectUrl = base_url('grading/below-60');
+        $query = http_build_query([
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+        ]);
+        if ($query !== '') {
+            $redirectUrl .= '?' . $query;
+        }
 
         $existing = $flagModel
             ->where('student_id', $studentId)
@@ -1226,11 +1234,14 @@ class GradingController extends Controller
 
         $userId = (int)(session()->get('user_id') ?? 0) ?: null;
         $now = utc_now();
+        $ok = true;
 
         if ($existing) {
             $data = [
                 'flag_state' => $status,
                 'flag_datetime' => $now,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
                 'updated_at' => $now,
             ];
             if ($status === 'Open') {
@@ -1246,7 +1257,7 @@ class GradingController extends Controller
                     $data['close_description'] = trim($prev . PHP_EOL . $note);
                 }
             }
-            $flagModel->update((int)$existing['id'], $data);
+            $ok = (bool) $flagModel->update((int)$existing['id'], $data);
         } else {
             $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
             $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
@@ -1269,10 +1280,21 @@ class GradingController extends Controller
                 $data['updated_by_closed'] = $userId;
                 if ($note !== '') $data['close_description'] = $note;
             }
-            $flagModel->insert($data);
+            $ok = (bool) $flagModel->insert($data);
         }
 
-        return redirect()->back()->with('status', 'Status updated.');
+        if (!$ok) {
+            log_message('error', 'updateBelowSixtyStatus failed', [
+                'student_id' => $studentId,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'status' => $status,
+                'errors' => $flagModel->errors(),
+            ]);
+            return redirect()->to($redirectUrl)->with('error', 'Failed to update status.');
+        }
+
+        return redirect()->to($redirectUrl)->with('status', 'Status updated.');
     }
 
     public function scheduleBelowSixty()
@@ -1555,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([
@@ -1583,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(
@@ -1797,9 +1820,10 @@ class GradingController extends Controller
         }
 
         $statusMap = [];
+        $noteMap = [];
         if (!empty($studentIds)) {
             $flagRows = $this->db->table('current_flag')
-                ->select('student_id, flag_state')
+                ->select('student_id, flag_state, open_description, close_description')
                 ->where('flag', 'grade')
                 ->where('school_year', $schoolYear)
                 ->where("LOWER(TRIM(semester))", $semesterKey)
@@ -1810,6 +1834,12 @@ class GradingController extends Controller
                 $sid = (int)($row['student_id'] ?? 0);
                 if ($sid <= 0) continue;
                 $statusMap[$sid] = (string)($row['flag_state'] ?? '');
+                $openNote = trim((string)($row['open_description'] ?? ''));
+                $closeNote = trim((string)($row['close_description'] ?? ''));
+                $noteMap[$sid] = [
+                    'open' => $openNote,
+                    'closed' => $closeNote,
+                ];
             }
         }
 
@@ -1818,6 +1848,15 @@ class GradingController extends Controller
             $row['comment'] = $commentMap[$sid] ?? '';
             $flagState = strtolower(trim((string)($statusMap[$sid] ?? '')));
             $row['status'] = ($flagState === 'closed' || $flagState === 'canceled') ? 'Closed' : 'Open';
+            $noteBag = $noteMap[$sid] ?? ['open' => '', 'closed' => ''];
+            $rawNote = $row['status'] === 'Closed' ? (string)$noteBag['closed'] : (string)$noteBag['open'];
+            if ($rawNote !== '') {
+                $lines = preg_split('/\R/', $rawNote);
+                $lines = array_values(array_filter(array_map('trim', $lines), static fn($val) => $val !== ''));
+                $row['note'] = $lines ? end($lines) : '';
+            } else {
+                $row['note'] = '';
+            }
         }
         unset($row);
 

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
+        $studentClasses = $this->studentClassModel->getClassStudents($classSectionId, $schoolYear, null);
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
         $students = [];
 
         foreach ($studentClasses as $sc) {

app/Controllers/View/HomeworkTrackingController.php

@@ -86,6 +86,7 @@ class HomeworkTrackingController extends BaseController
 
         $hasHomework = [];
         $hwEnteredAt = [];
+        $homeworkSubmissionCounts = [];
         foreach ($rows as $r) {
             $csid = (int)($r['class_section_id'] ?? 0);
             $hi   = (int)($r['homework_index'] ?? 0);
@@ -94,6 +95,7 @@ class HomeworkTrackingController extends BaseController
                 $hasHomework[$csid][$hi] = true;
                 $dateStr = substr((string)($r['first_created'] ?? ''), 0, 10);
                 $hwEnteredAt[$csid][$hi] = $dateStr ?: null;
+                $homeworkSubmissionCounts[$csid] = ($homeworkSubmissionCounts[$csid] ?? 0) + 1;
             }
         }
 
@@ -217,6 +219,7 @@ class HomeworkTrackingController extends BaseController
             'teachers'     => $teachersPage,
             'hasHomework'  => $hasHomework,
             'hwEnteredAt'  => $hwEnteredAt,
+            'homeworkSubmissionCounts' => $homeworkSubmissionCounts,
             'hasHomeworkByDate' => $hasHomeworkByDate,
             'hwEnteredAtByDate' => $hwEnteredAtByDate,
             'page'         => $page,

app/Controllers/View/LandingPageController.php

@@ -95,6 +95,11 @@ class LandingPageController extends BaseController
             return null;
         }
 
+        // Teacher class sections only apply to the teacher role; other roles have no teacher_class rows.
+        if (strtolower(trim((string) $this->getUserRole())) !== 'teacher') {
+            return null;
+        }
+
         // Get all class assignments for this teacher in the current term
         $assignments = $this->teacherClassModel->getClassAssignmentsByUserId(
             (int)$user_id,
@@ -106,7 +111,7 @@ class LandingPageController extends BaseController
         $ids = array_values(array_filter(array_unique($ids)));
 
         if (empty($ids)) {
-            log_message('error', "No class section found for user ID: $user_id");
+            log_message('warning', "No class section found for user ID: $user_id");
             return null;
         }
 
@@ -868,8 +873,12 @@ class LandingPageController extends BaseController
 
     protected function getUserRole()
     {
-        // Assuming you have a session variable storing the user role
+        $active = session()->get('active_role');
-        return session()->get('user_role', 'guest'); // Default to guest if not set
+        if ($active !== null && $active !== '') {
+            return (string) $active;
+        }
+
+        return (string) (session()->get('role') ?? 'guest');
     }
 
     protected function getUserRoleFromDatabase($user_id)

app/Controllers/View/ParentController.php

@@ -717,6 +717,7 @@ class ParentController extends BaseController
 
         // Step 1: Generate a secure token for email verification
         $token = bin2hex(random_bytes(48));
+        $tokenHash = hash('sha256', $token);
 
         // Step 2: Determine user type based on relationship
         $userType = in_array(strtolower($relationToStudent), ['wife', 'husband']) ? 'Secondary' : 'Tertiary';
@@ -776,7 +777,7 @@ class ParentController extends BaseController
             'state' => strtoupper($userData['state']),
             'zip' => $userData['zip'],
             'accept_school_policy' => $userData['accept_school_policy'] ?? 0,
-            'token' => $token,
+            'token' => $tokenHash,
             'is_verified' => 0,
             'status' => 'Inactive',
             'user_type' => $userType,

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
+        $studentClasses = $studentClassModel->getClassStudents($classSectionId, $this->schoolYear, null);
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
         $students = [];
 
         foreach ($studentClasses as $sc) {

app/Controllers/View/RegisterController.php

@@ -173,16 +173,8 @@ class RegisterController extends Controller
         $existingUser = $this->userModel->where('email', $post['email'])->first();
 
         if ($existingUser) {
-            // Step 2: Check if the user has a token (i.e., not verified yet)
+            return redirect()->back()->withInput()->with('error',
-            if (!empty($existingUser['token']) && $existingUser['is_verified'] == 0) {
+                'This email address is already registered. Please check your email or log in.');
-                // User exists and is unverified
-                return redirect()->back()->withInput()->with('error',
-                    'This email address is already registered and is pending activation. Please check your email to activate your account.');
-            } else {
-                // User exists and is already active or has no token
-                return redirect()->back()->withInput()->with('error',
-                    'The email address you entered is already in use. Please try a different one.');
-            }
         }
 
         /* ───────────── 6.  Determine role ───────────── */
@@ -194,6 +186,7 @@ class RegisterController extends Controller
 
         /* ───────────── 7.  Build & insert user ───────────── */
         $token    = bin2hex(random_bytes(48));
+        $tokenHash = hash('sha256', $token);
         $userData = [
             'firstname'  => $post['firstname'],
             'lastname'   => $post['lastname'],
@@ -205,7 +198,7 @@ class RegisterController extends Controller
             'city'       => $post['city'],
             'state'      => $post['state'],
             'zip'        => $post['zip'],
-            'token'      => $token,
+            'token'      => $tokenHash,
             'is_verified'=> 0,
             'accept_school_policy' => (int) $post['accept_school_policy'],
             'status'     => 'Inactive',
@@ -357,4 +350,4 @@ class RegisterController extends Controller
 
 
 
-}
+}

app/Controllers/View/ScoreController.php

@@ -1287,14 +1287,14 @@ class ScoreController extends Controller
 public function viewStudentScore()
 {
     $parentId = session()->get('user_id');
-    $userType = $_SESSION['user_type'];
+    $userType = session()->get('user_type') ?? '';
     $firstParentId = null;
     $releaseFall = $this->getParentScoresReleasedForSemester('Fall');
     $releaseSpring = $this->getParentScoresReleasedForSemester('Spring');
     $releaseAny = $releaseFall || $releaseSpring;
 
     // Identify the firstparent based on user type
-    if ($userType === 'primary') {
+    if ($userType === 'primary' || $userType === '') {
         $firstParentId = $parentId;
     } elseif ($userType === 'secondary') {
         $parentData = $this->db->table('parents')

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,
+        MAX(fall.semester_score) as fall_score,
-        spring.semester_score as spring_score');
+        MAX(spring.semester_score) as spring_score');
-        // Also select class section for per-class trophy decision
+        // Reduce duplication from restored students while keeping a stable class section.
-        $builder->select('sc.class_section_id as class_section_id');
+        $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/Controllers/View/SubjectCurriculumController.php

@@ -99,6 +99,7 @@ class SubjectCurriculumController extends BaseController
             ->orderBy('classes.class_name', 'ASC')
             ->orderBy('subject', 'ASC')
             ->orderBy('unit_number', 'ASC')
+            ->orderBy("CAST(SUBSTRING_INDEX(subject_curriculum_items.chapter_name, '.', 1) AS UNSIGNED)", 'ASC', false)
             ->orderBy('chapter_name', 'ASC')
             ->get()
             ->getResultArray();

app/Controllers/View/TeacherController.php

@@ -297,12 +297,16 @@ class TeacherController extends BaseController
         $schoolYear = $forYear ?: ((string)($this->schoolYear ?? 'Not Set'));
 
         $teachers = $this->teacherModel->getTeachersAndTAs();
-        // Prefer class sections for the selected year, fallback to all if none
+        // Prefer class sections for the selected year if the column exists, otherwise fallback to all.
-        $classSections = $classSectionModel
+        if ($this->db->fieldExists('school_year', 'classSection')) {
-            ->where('school_year', $schoolYear)
+            $classSections = $classSectionModel
-            ->orderBy('class_section_name', 'ASC')
+                ->where('school_year', $schoolYear)
-            ->findAll();
+                ->orderBy('class_section_name', 'ASC')
-        if (empty($classSections)) {
+                ->findAll();
+            if (empty($classSections)) {
+                $classSections = $classSectionModel->orderBy('class_section_name', 'ASC')->findAll();
+            }
+        } else {
             $classSections = $classSectionModel->orderBy('class_section_name', 'ASC')->findAll();
         }
 

app/Controllers/View/UserController.php

@@ -21,6 +21,7 @@ require_once APPPATH . 'Helpers/pbkdf2_helper.php';
 
 class UserController extends BaseController
 {
+    private const ACTIVATION_TTL_HOURS = 48;
     protected $userModel;
     protected $roleModel;
     protected $userRoleModel;
@@ -49,6 +50,37 @@ class UserController extends BaseController
         $this->resetRequestModel = new PasswordResetRequestModel();
     }
 
+    private function denyAccess(string $message)
+    {
+        if ($this->request->isAJAX() || $this->request->getHeaderLine('Accept') === 'application/json') {
+            return service('response')
+                ->setStatusCode(403)
+                ->setJSON(['status' => 'error', 'message' => $message]);
+        }
+
+        session()->setFlashdata('error', $message);
+        return redirect()->to('/access_denied');
+    }
+
+    private function requirePermission(string $permission)
+    {
+        if (!session()->get('is_logged_in')) {
+            return redirect()->to('/login');
+        }
+
+        $userId = (int) session()->get('user_id');
+        if ($userId <= 0 || !has_permission($userId, $permission)) {
+            return $this->denyAccess("You don't have permission to use this feature.");
+        }
+
+        return null;
+    }
+
+    private function hashToken(string $token): string
+    {
+        return hash('sha256', $token);
+    }
+
     // Method to show the home page
     public function home()
     {
@@ -75,6 +107,10 @@ class UserController extends BaseController
 
     public function userList()
     {
+        if ($resp = $this->requirePermission('read_user')) {
+            return $resp;
+        }
+
         helper('url');
 
         return view('user/user_list', [
@@ -85,6 +121,10 @@ class UserController extends BaseController
     // Method to show the list of users   
     public function index()
     {
+        if ($resp = $this->requirePermission('read_user')) {
+            return $resp;
+        }
+
         // Fetch users along with their assigned roles
         $builder = $this->db->table('users');
         $builder->select('users.id, users.firstname, users.lastname, users.email, user_roles.role_id, roles.name as role, users.status, users.updated_at');
@@ -122,6 +162,10 @@ class UserController extends BaseController
 
     public function userListData()
     {
+        if ($resp = $this->requirePermission('read_user')) {
+            return $resp;
+        }
+
         return $this->response->setJSON([
             'users' => $this->buildUsersWithRoles(),
         ]);
@@ -253,6 +297,10 @@ class UserController extends BaseController
     // Method to store a new user
     public function store()
     {
+        if ($resp = $this->requirePermission('edit_user')) {
+            return $resp;
+        }
+
         // Validate input data
         $validation = \Config\Services::validation();
         $validation->setRules([
@@ -315,6 +363,10 @@ class UserController extends BaseController
     // Method to show the form for editing an existing user
     public function edit($id)
     {
+        if ($resp = $this->requirePermission('edit_user')) {
+            return $resp;
+        }
+
         $data['user'] = $this->userModel->find($id);
         $data['roles'] = $this->roleModel->findAll();
         $userRoles = $this->userRoleModel->where('user_id', $id)->findAll();
@@ -327,6 +379,10 @@ class UserController extends BaseController
     // Method to delete an existing user
     public function delete($id)
     {
+        if ($resp = $this->requirePermission('edit_user')) {
+            return $resp;
+        }
+
         $this->userModel->delete($id);
 
         // Delete the user's roles from the user_roles table
@@ -369,27 +425,21 @@ class UserController extends BaseController
         $email = strtolower($this->request->getPost('email'));
         $user  = $this->userModel->where('email', $email)->first();
 
-        // --- Handle unknown email ---
+        // --- Handle unknown or unverified email ---
-        if (!$user) {
+        if (!$user || (int) $user['is_verified'] === 0) {
-            session()->setFlashdata('error', 'If this email is registered, you will receive a reset link.');
+            session()->setFlashdata('success', 'If this email is registered, you will receive a reset link.');
-            log_message('info', "Password reset requested for non-existing user {$email}");
+            log_message('info', "Password reset requested for {$email} (user missing or unverified).");
-            return redirect()->back();
-        }
-
-        // --- Handle unverified accounts ---
-        if ((int) $user['is_verified'] === 0) {
-            session()->setFlashdata('error', 'Please check your email and complete the account activation process before resetting your password.');
-            log_message('info', "Password reset blocked for unverified user {$email}");
             return redirect()->back();
         }
 
         // --- Verified user: continue with reset ---
         $token      = bin2hex(random_bytes(48));
+        $tokenHash  = $this->hashToken($token);
         $expires_at = Time::now()->addHours(1);
 
         $this->passwordResetModel->insert([
             'email'      => $email,
-            'token'      => $token,
+            'token'      => $tokenHash,
             'created_at' => Time::now(),
             'expires_at' => $expires_at,
         ]);
@@ -447,7 +497,12 @@ class UserController extends BaseController
         }
 
         // You may want to validate the token here
-        $resetEntry = $this->passwordResetModel->where('token', $token)
+        $tokenHash = $this->hashToken($token);
+        $resetEntry = $this->passwordResetModel
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
             ->where('expires_at >=', Time::now())
             ->first();
 
@@ -462,6 +517,10 @@ class UserController extends BaseController
     //This function processes the new password submission, validating the token, updating the user's password, and cleaning up the reset entry.
     public function processResetPassword()
     {
+        if (strtolower($this->request->getMethod()) !== 'post') {
+            return redirect()->to('/')->with('error', 'Invalid request.');
+        }
+
         $token = $this->request->getPost('token');
         $newPassword = $this->request->getPost('password');
         $passConfirm = $this->request->getPost('pass_confirm');
@@ -490,7 +549,12 @@ class UserController extends BaseController
         }
 
         // Find the password reset entry
-        $resetEntry = $this->passwordResetModel->where('token', $token)
+        $tokenHash = $this->hashToken($token);
+        $resetEntry = $this->passwordResetModel
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
             ->where('expires_at >=', Time::now())
             ->first();
 
@@ -519,7 +583,12 @@ class UserController extends BaseController
         ]);
 
         // Delete the used token from the password reset table
-        $this->passwordResetModel->where('token', $token)->delete();
+        $this->passwordResetModel
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
+            ->delete();
 
         // Retrieve the user's IP address from the request
         $ipAddress = $this->request->getIPAddress();
@@ -546,10 +615,16 @@ class UserController extends BaseController
 
     public function confirm($token)
     {
-        log_message('info', 'Processing email confirmation with token: ' . $token);
+        log_message('info', 'Processing email confirmation.');
 
-
+        $tokenHash = $this->hashToken($token);
-        $user = $this->userModel->where('token', $token)->first();
+        $user = $this->userModel
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
+            ->where('created_at >=', Time::now()->subHours(self::ACTIVATION_TTL_HOURS)->toDateTimeString())
+            ->first();
 
         if (!$user || $user['is_verified'] == 1) {
             return redirect()->to('/invalid_token');
@@ -570,7 +645,14 @@ class UserController extends BaseController
     {
         //echo "Reached setPassword with token: " . esc($token);
         //echo "Token received: " . $token;
-        $user = $this->userModel->where('token', $token)->first();
+        $tokenHash = $this->hashToken($token);
+        $user = $this->userModel
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
+            ->where('created_at >=', Time::now()->subHours(self::ACTIVATION_TTL_HOURS)->toDateTimeString())
+            ->first();
 
         if (!$user || $user['is_verified'] == 1) {
             return redirect()->to('/invalid_token');
@@ -584,6 +666,10 @@ class UserController extends BaseController
 
     public function savePassword()
     {
+        if (strtolower($this->request->getMethod()) !== 'post') {
+            return redirect()->to('/')->with('error', 'Invalid request.');
+        }
+
         $validation = \Config\Services::validation();
         $validation->setRules([
             'password' => [
@@ -615,9 +701,17 @@ class UserController extends BaseController
         $token  = $this->request->getPost('token');
         $password = $this->request->getPost('password');
 
-        $user = $this->userModel->where('id', $userId)->where('token', $token)->first();
+        $tokenHash = $this->hashToken($token);
+        $user = $this->userModel
+            ->where('id', $userId)
+            ->groupStart()
+            ->where('token', $tokenHash)
+            ->orWhere('token', $token)
+            ->groupEnd()
+            ->where('created_at >=', Time::now()->subHours(self::ACTIVATION_TTL_HOURS)->toDateTimeString())
+            ->first();
 
-        log_message('debug', "Attempting to set password for user $userId with token $token");
+        log_message('debug', "Attempting to set password for user $userId");
 
         if (!$user || $user['is_verified'] == 1) {
             return redirect()->to('/invalid_token');
@@ -670,20 +764,39 @@ class UserController extends BaseController
         $roleKey = (string) $this->request->getPost('role');
         log_message('info', 'Role selected: ' . $roleKey);
 
-        $roleModel = new RoleModel();
-        $route = $roleModel->getRouteByNameOrSlug($roleKey);
-
-        if ($route === null) {
-            log_message('error', 'Invalid or inactive role selected: ' . $roleKey);
-            return redirect()->back()->with('error', 'Invalid role selected.');
-        }
-
         $userId = (int) session()->get('user_id');
         log_message('info', 'User ID: ' . $userId);
 
+        if ($userId <= 0) {
+            return $this->denyAccess("You don't have permission to use this feature.");
+        }
+
+        $roleRow = $this->db->table('user_roles ur')
+            ->join('roles r', 'r.id = ur.role_id', 'inner')
+            ->select('r.name, r.slug, r.dashboard_route')
+            ->where('ur.user_id', $userId)
+            ->where('r.is_active', 1)
+            ->groupStart()
+            ->where('LOWER(r.name)', strtolower($roleKey))
+            ->orWhere('LOWER(r.slug)', strtolower($roleKey))
+            ->groupEnd()
+            ->get()
+            ->getRowArray();
+
+        if (empty($roleRow)) {
+            log_message('error', 'Invalid or unassigned role selected: ' . $roleKey);
+            return redirect()->back()->with('error', 'Invalid role selected.');
+        }
+
+        $route = $roleRow['dashboard_route'] ?? null;
+        if ($route === null) {
+            log_message('error', 'No dashboard route configured for role: ' . $roleKey);
+            return redirect()->back()->with('error', 'Invalid role selected.');
+        }
+
         // Persist the *exact* role name or slug—choose your convention.
-        // If you want to store the canonical name, fetch the row and use $row['name'].
+        // Store the canonical name to avoid arbitrary role strings.
-        $this->userModel->update($userId, ['role' => $roleKey]);
+        $this->userModel->update($userId, ['role' => $roleRow['name']]);
         log_message('info', 'Role updated in database.');
 
         log_message('info', 'Redirecting to role dashboard: ' . $route);
@@ -702,6 +815,10 @@ class UserController extends BaseController
 
     public function delete_role($roleId)
     {
+        if ($resp = $this->requirePermission('edit_user')) {
+            return $resp;
+        }
+
         // Fetch the role to be deleted
         $role = $this->roleModel->find($roleId);
         if (!$role) {
@@ -731,6 +848,10 @@ class UserController extends BaseController
 
     public function loginActivity()
     {
+        if ($resp = $this->requirePermission('view_login_activity')) {
+            return $resp;
+        }
+
         helper('url');
 
         $perPage = (int) ($this->request->getGet('per_page') ?? 25);
@@ -743,6 +864,10 @@ class UserController extends BaseController
 
     public function loginActivityData()
     {
+        if ($resp = $this->requirePermission('view_login_activity')) {
+            return $resp;
+        }
+
         $perPage = (int) ($this->request->getGet('per_page') ?? 25);
         $page    = (int) ($this->request->getGet('page') ?? 1);
 
@@ -752,6 +877,10 @@ class UserController extends BaseController
     // Method to update an existing user
     public function updateUser()
     {
+        if ($resp = $this->requirePermission('edit_user')) {
+            return $resp;
+        }
+
         if (strtolower($this->request->getMethod()) !== 'post') {
             return redirect()->to(site_url('user/user_list'))->with('error', 'Invalid request.');
         }
@@ -800,9 +929,6 @@ class UserController extends BaseController
             'status'               => trim((string)$this->request->getPost('status')),
             'is_suspended'         => $toBool('is_suspended'),
             'is_verified'          => $toBool('is_verified'),
-            'token'                => trim((string)$this->request->getPost('token')),
-            'updated_at'           => $toDT('updated_at'),
-            'created_at'           => $toDT('created_at'),
         ];
 
         // Validation

app/Database/Migrations/2026-01-27-220000_AddReviewRevisionToExamDrafts.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddReviewRevisionToExamDrafts extends Migration
+{
+    public function up()
+    {
+        if (! $this->db->fieldExists('review_revision', 'exam_drafts')) {
+            $this->forge->addColumn('exam_drafts', [
+                'review_revision' => [
+                    'type' => 'INT',
+                    'constraint' => 11,
+                    'null' => false,
+                    'default' => 0,
+                    'after' => 'version',
+                ],
+            ]);
+        }
+    }
+
+    public function down()
+    {
+        if ($this->db->fieldExists('review_revision', 'exam_drafts')) {
+            $this->forge->dropColumn('exam_drafts', 'review_revision');
+        }
+    }
+}

app/Models/ClassProgressReportModel.php

@@ -4,6 +4,15 @@ namespace App\Models;
 
 use CodeIgniter\Model;
 
+/**
+ * Weekly class progress reports (one row per subject per week).
+ *
+ * unit_title stores a compact summary of unit/chapter rows: segments joined with " ; ".
+ * Teacher-entered custom Islamic or Quran topics use the prefix "Custom / {text}"
+ * (see {@see \App\Controllers\ClassProgressController::CUSTOM_UNIT_ROW_LABEL} and
+ * {@see \App\Controllers\ClassProgressController::splitUnitTitleForDisplay()}).
+ * DB column is VARCHAR(120); controller truncates to match.
+ */
 class ClassProgressReportModel extends Model
 {
     protected $table = 'class_progress_reports';
@@ -27,7 +36,42 @@ class ClassProgressReportModel extends Model
         'flags_json',
         'attachment_path',
     ];
+
     protected $useTimestamps = true;
     protected $createdField = 'created_at';
     protected $updatedField = 'updated_at';
+
+    /**
+     * Validation is performed in {@see \App\Controllers\ClassProgressController} on HTTP input.
+     * Rules below document schema limits and can be enabled if you set {@see $skipValidation} to false.
+     */
+    protected $skipValidation = true;
+
+    protected $validationRules = [
+        'class_section_id' => 'required|integer',
+        'teacher_id' => 'required|integer',
+        'week_start' => 'required|valid_date[Y-m-d]',
+        'week_end' => 'required|valid_date[Y-m-d]',
+        'subject' => 'required|string|max_length[160]',
+        'unit_title' => 'permit_empty|string|max_length[120]',
+        'covered' => 'permit_empty|string',
+        'homework' => 'permit_empty|string',
+        'assessment' => 'permit_empty|string',
+        'status' => 'permit_empty|in_list[on_track,slightly_behind,behind]',
+        'status_notes' => 'permit_empty|string|max_length[200]',
+        'class_notes' => 'permit_empty|string',
+        'next_week_plan' => 'permit_empty|string',
+        'support_needed' => 'permit_empty|string',
+        'flags_json' => 'permit_empty|string',
+        'attachment_path' => 'permit_empty|string|max_length[255]',
+    ];
+
+    protected $validationMessages = [
+        'unit_title' => [
+            'max_length' => 'Unit and chapter summary cannot exceed 120 characters.',
+        ],
+        'subject' => [
+            'max_length' => 'Subject cannot exceed 160 characters.',
+        ],
+    ];
 }

app/Models/ConfigurationModel.php

@@ -22,11 +22,13 @@ class ConfigurationModel extends Model
      */
     public function getConfigValueByKey(string $key)
     {
-        // Deterministic read in case historical duplicates exist
+        // Use a fresh builder to avoid stale state from shared model builder.
-        $result = $this->where('config_key', $key)
+        $builder = $this->db->table($this->table);
+        $result = $builder->where('config_key', $key)
             ->orderBy('id', 'DESC')
-            ->first();
+            ->get(1)
-        return $result ? $result['config_value'] : null;
+            ->getRowArray();
+        return $result['config_value'] ?? null;
     }
 
     /**

app/Models/EventChargesModel.php

@@ -30,7 +30,7 @@ class EventChargesModel extends Model
 
     public function getChargesWithEventInfo($parentId = null, $schoolYear = null, $semester = null)
     {
-        $builder = $this->select('event_charges.*, events.event_name, events.amount')
+        $builder = $this->select('event_charges.*, events.event_name, events.amount AS event_amount, events.description AS event_description')
                         ->join('events', 'events.id = event_charges.event_id', 'left');
 
         if ($parentId) {

app/Models/ExamDraftModel.php

@@ -8,19 +8,51 @@ class ExamDraftModel extends Model
 {
     protected $table = 'exam_drafts';
     protected $primaryKey = 'id';
+    protected $returnType = 'array';
+    protected $useTimestamps = true;
+    protected $createdField = 'created_at';
+    protected $updatedField = 'updated_at';
+    protected bool $updateOnlyChanged = false;
+
+    /** @var list<string> Stored in `status` column */
+    public const STATUSES = [
+        'submitted',
+        'accepted',
+        'review needed',
+        'rejected',
+        'canceled',
+        'under review',
+        'legacy',
+    ];
+
+    /** @var list<string> Stored in `acceptance_type` when status is finalized */
+    public const ACCEPTANCE_TYPES = [
+        'as_is',
+        'minor_edits',
+    ];
+
     protected $allowedFields = [
         'teacher_id',
+        'author_id',
         'class_section_id',
         'semester',
         'school_year',
         'exam_type',
         'draft_title',
+        'author_comment',
         'description',
         'teacher_file',
         'teacher_filename',
+        'author_file',
+        'author_filename',
         'status',
+        'acceptance_type',
+        'review_revision',
+        'reviewer_id',
         'admin_id',
         'is_legacy',
+        'reviewer_comment',
+        'reviewer_comments',
         'admin_comments',
         'reviewed_at',
         'final_file',
@@ -29,9 +61,40 @@ class ExamDraftModel extends Model
         'version',
         'previous_draft_id',
     ];
-    protected $returnType = 'array';
+
-    protected $useTimestamps = true;
+    /**
-    protected $createdField = 'created_at';
+     * Applied on insert/update when validation runs (e.g. $model->insert($data, true)).
-    protected $updatedField = 'updated_at';
+     * Uses if_exist so partial updates still validate only keys present in $data.
-    protected bool $updateOnlyChanged = false; // force updates even if CI thinks nothing changed
+     */
+    protected $validationRules = [
+        'status' => 'if_exist|in_list[submitted,accepted,review needed,rejected,canceled,under review,legacy]',
+        'acceptance_type' => 'if_exist|permit_empty|in_list[as_is,minor_edits]',
+        'author_id' => 'if_exist|is_natural_no_zero',
+        'class_section_id' => 'if_exist|is_natural_no_zero',
+        'version' => 'if_exist|is_natural_no_zero',
+    ];
+
+    protected $validationMessages = [
+        'status' => [
+            'in_list' => 'Invalid exam draft status.',
+        ],
+        'acceptance_type' => [
+            'in_list' => 'Acceptance must be as_is or minor_edits.',
+        ],
+    ];
+
+    /**
+     * @var array<string, string>
+     */
+    protected array $casts = [
+        'teacher_id' => 'int',
+        'author_id' => 'int',
+        'class_section_id' => 'int',
+        'reviewer_id' => '?int',
+        'admin_id' => '?int',
+        'review_revision' => 'int',
+        'version' => 'int',
+        'previous_draft_id' => '?int',
+        'is_legacy' => 'boolean',
+    ];
 }

app/Models/SubjectCurriculumModel.php

@@ -27,6 +27,7 @@ class SubjectCurriculumModel extends Model
         return $this->where('class_id', $classId)
             ->where('subject', $subject)
             ->orderBy('unit_number', 'ASC')
+            ->orderBy("CAST(SUBSTRING_INDEX(chapter_name, '.', 1) AS UNSIGNED)", 'ASC', false)
             ->orderBy('chapter_name', 'ASC')
             ->findAll();
     }

app/Models/TeacherClassModel.php

@@ -71,7 +71,7 @@ class TeacherClassModel extends Model
         $builder = $this->db->table('teacher_class tc')
             ->select([
                 'cs.class_section_name',
-                'cs.id AS class_section_pk',
+                'cs.class_section_id AS class_section_pk',
                 'cs.class_section_id',
                 'c.id AS class_id',
                 'c.class_name',
@@ -181,10 +181,10 @@ class TeacherClassModel extends Model
     {
         $db = \Config\Database::connect();
 
-        // Adjust table/column names if yours differ (e.g., cs.id vs cs.class_section_id)
+        // Adjust table/column names if yours differ (e.g., cs.class_section_id vs cs.id)
         $row = $db->table('classSection cs')
             ->select('u.id AS teacher_id, u.firstname, u.lastname')
-            ->join('teacher_class tc', 'tc.class_section_id = cs.id', 'inner')
+            ->join('teacher_class tc', 'tc.class_section_id = cs.class_section_id', 'inner')
             ->join('users u', 'u.id = tc.teacher_id', 'inner')
             ->where('cs.class_section_name', $classSectionName)
             ->where('tc.school_year', $schoolYear)

app/Models/TeacherModel.php

@@ -34,11 +34,11 @@ class TeacherModel extends Model
 public function getTeachersAndTAs(): array
 {
     return $this->db->table('users u')
-        ->select('u.id, u.firstname, u.lastname, u.email, u.cellphone, r.name as role')
+        ->select('u.id, u.firstname, u.lastname, u.email, u.cellphone, MIN(r.name) as role')
         ->join('user_roles ur', 'ur.user_id = u.id')
         ->join('roles r', 'r.id = ur.role_id')
         ->whereIn('r.name', ['teacher', 'teacher_assistant']) // ✅ Filter only relevant roles
-        ->groupBy('u.id')
+        ->groupBy('u.id, u.firstname, u.lastname, u.email, u.cellphone')
         ->orderBy('u.lastname', 'ASC')
         ->get()
         ->getResultArray();
@@ -72,4 +72,4 @@ public function getTeachersAndTAs(): array
             ->get()
             ->getResultArray();
     }
-}
+}

app/Services/TimeService.php

@@ -167,8 +167,13 @@ class TimeService
             return null;
         }
 
-        $sourceTz = $sourceTz ?: $this->serverTimezone;
         $targetTz = $targetTz ?: $this->userTimezone();
+        if ($sourceTz === null && $this->isDateOnlyString($value)) {
+            // Date-only strings should not shift across timezones.
+            $sourceTz = $targetTz;
+        } else {
+            $sourceTz = $sourceTz ?: $this->serverTimezone;
+        }
 
         try {
             if ($value instanceof Time) {
@@ -204,4 +209,14 @@ class TimeService
     {
         return (string) ($this->toUTC($value, $fromTz, $format) ?? '');
     }
+
+    private function isDateOnlyString($value): bool
+    {
+        if (!is_string($value)) {
+            return false;
+        }
+
+        $value = trim($value);
+        return (bool) preg_match('/^\d{4}-\d{2}-\d{2}$/', $value);
+    }
 }

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'])) {
+                                  $name = trim((string) ($report['teacher_name'] ?? ''));
-                                    $teacherName = $report['teacher_name'];
+                                  if ($name === '') {
-                                    break;
+                                    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;
                               ?>
@@ -176,12 +214,22 @@
                                           <strong class="small mb-0"><?= esc($section['label'] ?? $subjectName) ?></strong>
                                           <span class="badge <?= $badgeClass ?>"><?= esc($statusTag) ?></span>
                                         </div>
-                                        <div class="small text-muted"><?= $report ? esc($report['unit_title'] ?: '-') : 'No submission' ?></div>
+                                        <div class="small">
+                                          <?php if ($report): ?>
+                                            <?= view('admin/partials/class_progress_unit_display', [
+                                              'unitTitle' => (string) ($report['unit_title'] ?? ''),
+                                              'isQuran' => ($subjectName === 'Quran/Arabic'),
+                                              'compact' => true,
+                                            ]) ?>
+                                          <?php else: ?>
+                                            <span class="text-muted">No submission</span>
+                                          <?php endif; ?>
+                                        </div>
                                       </div>
                                     <?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/admin/class_progress_view.php

@@ -39,7 +39,6 @@
         <?php
           $subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
           $isQuran = $subjectName === 'Quran/Arabic';
-          $unitLabel = $isQuran ? 'Surah / Custom Arabic' : 'Unit / Chapter';
           $homeworkLabel = $isQuran ? 'Arabic Practice / Homework' : 'Assigned Homework';
           $report = $reportsBySubject[$subjectName] ?? null;
         ?>
@@ -51,7 +50,13 @@
             <?php if (! $report): ?>
               <div class="text-muted">No entry submitted for this subject this week.</div>
             <?php else: ?>
-              <div class="mb-2"><strong><?= $unitLabel ?>:</strong> <?= esc($report['unit_title'] ?: '-') ?></div>
+              <div class="mb-2">
+                <?= view('admin/partials/class_progress_unit_display', [
+                  'unitTitle' => (string) ($report['unit_title'] ?? ''),
+                  'isQuran' => $isQuran,
+                  'compact' => false,
+                ]) ?>
+              </div>
               <?php if (!empty($report['materials'])): ?>
                 <div class="mb-2"><strong>Materials:</strong> <?= esc($report['materials']) ?></div>
               <?php endif; ?>

app/Views/admin/partials/class_progress_unit_display.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Renders class progress unit_title with explicit curriculum vs custom subject lines.
+ *
+ * @var string $unitTitle
+ * @var bool   $isQuran
+ * @var bool   $compact  If true, tighter layout for the list accordion.
+ */
+
+use App\Controllers\ClassProgressController;
+
+$unitTitle = trim((string) ($unitTitle ?? ''));
+$compact = ! empty($compact);
+$isQuran = ! empty($isQuran);
+
+$split = ClassProgressController::splitUnitTitleForDisplay($unitTitle);
+$curriculumLines = $split['curriculum'];
+$customTopics = $split['custom'];
+
+$labelCurriculum = $isQuran ? 'Surah / curriculum' : 'Unit / chapter';
+$labelCustom = $isQuran ? 'Custom Surah / Arabic' : 'Custom subject(s)';
+?>
+
+<?php if ($unitTitle === ''): ?>
+  <span class="text-muted">-</span>
+<?php elseif ($compact): ?>
+  <?php if (! empty($customTopics)): ?>
+    <div class="small">
+      <span class="badge text-bg-info me-1"><?= $isQuran ? 'Custom' : 'Custom subject' ?></span><?= esc(implode(', ', $customTopics)) ?>
+    </div>
+  <?php endif; ?>
+  <?php if (! empty($curriculumLines)): ?>
+    <div class="small <?= ! empty($customTopics) ? 'text-muted mt-1' : 'text-muted' ?>"><?= esc(implode(' · ', $curriculumLines)) ?></div>
+  <?php endif; ?>
+  <?php if (empty($customTopics) && empty($curriculumLines)): ?>
+    <div class="small text-muted"><?= esc($unitTitle) ?></div>
+  <?php endif; ?>
+<?php else: ?>
+  <?php if (! empty($curriculumLines)): ?>
+    <div class="mb-2"><strong><?= esc($labelCurriculum) ?>:</strong> <?= esc(implode(' ; ', $curriculumLines)) ?></div>
+  <?php endif; ?>
+  <?php if (! empty($customTopics)): ?>
+    <div class="mb-2"><strong><?= esc($labelCustom) ?>:</strong> <?= esc(implode(' ; ', $customTopics)) ?></div>
+  <?php endif; ?>
+  <?php if (empty($curriculumLines) && empty($customTopics)): ?>
+    <div class="mb-2"><strong><?= esc($labelCurriculum) ?>:</strong> <?= esc($unitTitle) ?></div>
+  <?php endif; ?>
+<?php endif; ?>

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/daily_attendance_analysis.php

@@ -250,6 +250,54 @@
         $analysisSectionTotals[] = (int)($s['total_students'] ?? 0);
       }
 
+      // ---- Student absences/late list ----
+      $sectionLabelByKey = [];
+      foreach ($grades as $classId => $sections) {
+        foreach ($sections as $section) {
+          $sectionKey = (string)($section['class_section_id'] ?? ($section['id'] ?? ''));
+          if ($sectionKey === '') continue;
+          $secNameRaw = trim((string)($section['class_section_name'] ?? ''));
+          $sectionLabelByKey[$sectionKey] = $secNameRaw !== '' ? $secNameRaw : ('Section ' . $sectionKey);
+        }
+      }
+
+      $studentIssueRows = [];
+      foreach ($studentsBySection as $sectionKey => $students) {
+        foreach ($students as $stu) {
+          $sid = (int)($stu['id'] ?? 0);
+          if ($sid <= 0) continue;
+          $entries = $attendanceData[$sectionKey][$sid] ?? [];
+          if (!is_array($entries)) continue;
+          $abs = 0;
+          $late = 0;
+          foreach ($entries as $e) {
+            $d = substr((string)($e['date'] ?? ''), 0, 10);
+            if ($d === '') continue;
+            if ($filterStart !== '' && $d < $filterStart) continue;
+            if ($filterEnd !== '' && $d > $filterEnd) continue;
+            $st = strtolower(trim((string)($e['status'] ?? '')));
+            if ($st === 'absent') {
+              $abs++;
+            } elseif ($st === 'late') {
+              $late++;
+            }
+          }
+          if (($abs + $late) <= 0) continue;
+          $studentIssueRows[] = [
+            'name' => trim((string)($stu['firstname'] ?? '') . ' ' . (string)($stu['lastname'] ?? '')),
+            'section' => $sectionLabelByKey[(string)$sectionKey] ?? ('Section ' . $sectionKey),
+            'absent' => $abs,
+            'late' => $late,
+          ];
+        }
+      }
+
+      usort($studentIssueRows, static function ($a, $b) {
+        $sec = strcmp($a['section'], $b['section']);
+        if ($sec !== 0) return $sec;
+        return strcmp($a['name'], $b['name']);
+      });
+
       $totalDaysForPercent = 0;
       if ($filterStart === '' && $filterEnd === '' && !empty($totalPassedDays)) {
         $totalDaysForPercent = (int)$totalPassedDays;
@@ -373,6 +421,37 @@
           </table>
         </div>
       </div>
+      <div class="attn-analysis-card attn-analysis-wide">
+        <h6>Students With Absences / Late</h6>
+        <div class="attn-analysis-scroll">
+          <table id="studentIssueTable" class="attn-analysis-table no-mgmt-sticky" data-no-mgmt-sticky>
+            <thead>
+              <tr>
+                <th>Student Name</th>
+                <th>Class Section</th>
+                <th class="text-end">Nbr of ABS</th>
+                <th class="text-end">Nbr of LATE</th>
+              </tr>
+            </thead>
+            <tbody>
+              <?php if (empty($studentIssueRows)): ?>
+                <tr>
+                  <td colspan="4" class="text-center text-muted">No absences or late records in the selected range.</td>
+                </tr>
+              <?php else: ?>
+                <?php foreach ($studentIssueRows as $row): ?>
+                  <tr>
+                    <td><?= esc($row['name']) ?></td>
+                    <td><?= esc($row['section']) ?></td>
+                    <td class="text-end"><?= (int)$row['absent'] ?></td>
+                    <td class="text-end"><?= (int)$row['late'] ?></td>
+                  </tr>
+                <?php endforeach; ?>
+              <?php endif; ?>
+            </tbody>
+          </table>
+        </div>
+      </div>
     </div>
   </div>
 </div>
@@ -480,6 +559,13 @@
         info: false,
         order: [[0, 'asc']]
       });
+      $('#studentIssueTable').DataTable({
+        paging: true,
+        searching: true,
+        info: true,
+        order: [[1, 'asc'], [0, 'asc']],
+        pageLength: 25
+      });
     }
   });
 </script>

app/Views/administrator/events/create_event.php

@@ -4,6 +4,11 @@
 <div class="container mt-4">
     <h2>Create Event</h2>
 
+    <?php
+    $defaultCategories = ['Fun Event-1', 'Fun Event-2', 'Fun Event-3'];
+    $existingCategories = array_map('strval', $categories ?? []);
+    $allCategories = array_unique(array_merge($defaultCategories, $existingCategories));
+    ?>
     <form method="post" action="<?= site_url('administrator/events/create') ?>" enctype="multipart/form-data">
         <?= csrf_field() ?>
         <div class="mb-3">
@@ -15,7 +20,7 @@
             <label class="form-label">Category</label>
             <select name="event_category" class="form-control" required>
                 <option value="" selected disabled>Select category</option>
-                <?php foreach (($categories ?? []) as $category): ?>
+                <?php foreach ($allCategories as $category): ?>
                     <option value="<?= esc($category) ?>"><?= esc(ucwords($category)) ?></option>
                 <?php endforeach; ?>
             </select>

app/Views/administrator/events/event_charges.php

@@ -11,44 +11,85 @@
         <div class="alert alert-danger"><?= session()->getFlashdata('error') ?></div>
     <?php endif; ?>
 
+    <?php
+        $selectedEvent = null;
+        if (!empty($filterEventId)) {
+            foreach ($events as $event) {
+                if ((int)$event['id'] === (int)$filterEventId) {
+                    $selectedEvent = $event;
+                    break;
+                }
+            }
+        }
+    ?>
     <!-- Add New Charge Form -->
-    <form action="<?= site_url('payment/event_charges') ?>" method="post">
+    <div class="card mb-4">
-        <?= csrf_field() ?>
+        <div class="card-body">
-        <div class="row">
+            <form action="<?= site_url('payment/event_charges') ?>" method="post">
-            <div class="col-md-3 mt-3">
+                <?= csrf_field() ?>
-                <label for="event_id" class="form-label">Select Event</label>
+                <div class="row g-3">
-                <select name="event_id" id="event_id" class="form-select" required>
+                    <div class="col-md-4">
-                    <option value="">-- Select Event --</option>
+                        <label for="event_id" class="form-label">Select Event</label>
-                    <?php foreach ($events as $event): ?>
+                        <select name="event_id" id="event_id" class="form-select" required>
-                        <option value="<?= esc($event['id']) ?>">
+                            <option value="">-- All events --</option>
-                            <?= esc($event['event_name']) ?>
+                            <?php foreach ($events as $event): ?>
-                        </option>
+                                <option value="<?= esc($event['id']) ?>" <?= isset($filterEventId) && $filterEventId == $event['id'] ? 'selected' : '' ?>>
-                    <?php endforeach; ?>
+                                    <?= esc($event['event_name']) ?>
-                </select>
+                                </option>
-            </div>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
 
-            <div class="col-md-3 mt-3">
+                    <?php if ($selectedEvent): ?>
-                <label for="parent_id" class="form-label">Parent</label>
+                        <div class="col-md-8">
-                <select id="parent_id" name="parent_id" class="form-select" required>
+                            <div class="border rounded bg-light p-3 h-100">
-                    <option value="">-- Select Parent --</option>
+                                <div class="d-flex justify-content-between align-items-center mb-2">
-                    <?php foreach ($parents as $parent): ?>
+                                    <h6 class="m-0"><?= esc($selectedEvent['event_name']) ?></h6>
-                        <option value="<?= $parent['id'] ?>">
+                                    <span class="badge bg-info text-dark">
-                            <?= esc($parent['firstname'] . ' ' . $parent['lastname']) ?> (<?= esc($parent['school_id']) ?>)
+                                        $<?= esc(number_format($selectedEvent['amount'] ?? 0, 2)) ?> fee
-                        </option>
+                                    </span>
-                    <?php endforeach; ?>
+                                </div>
-                </select>
+                                <p class="mb-1 text-muted small">
-            </div>
+                                    <?= esc($selectedEvent['description'] ?: 'No description provided for this event.') ?>
+                                </p>
+                                <?php if (!empty($selectedEvent['expiration_date'])): ?>
+                                    <small class="text-secondary">
+                                        Expires: <?= esc(local_date($selectedEvent['expiration_date'], 'm-d-Y')) ?>
+                                    </small>
+                                <?php endif; ?>
+                            </div>
+                        </div>
+                    <?php endif; ?>
 
-            <div class="col-12 mt-3" id="studentCheckboxContainer" style="display: none;">
+                </div>
-                <label>Select Students:</label>
+
-                <div id="studentList" class="row"></div>
+                <div class="row g-3 mt-2">
-            </div>           
+                    <div class="col-md-4">
+                        <label for="parent_id" class="form-label">Parents List</label>
+                        <select id="parent_id" name="parent_id" class="form-select" required>
+                            <option value="">-- Select Parent --</option>
+                            <?php foreach ($parents as $parent): ?>
+                                <option value="<?= $parent['id'] ?>">
+                                    <?= esc($parent['firstname'] . ' ' . $parent['lastname']) ?> (<?= esc($parent['school_id']) ?>)
+                                </option>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="mt-4" id="studentCheckboxContainer" style="display: none;">
+                    <label class="form-label">Select Students:</label>
+                    <div id="studentList" class="row g-3"></div>
+                </div>
+
+                <div class="d-flex flex-wrap gap-2 mt-3">
+                    <button type="submit" class="btn btn-primary">Submit</button>
+                    <a href="<?= site_url('administrator/events') ?>" class="btn btn-success">Event List</a>
+                </div>
+            </form>
         </div>
+    </div>
 
-<button type="submit" class="btn btn-primary mt-3">Submit</button>
-    <a href="<?= site_url('administrator/events') ?>" class="btn btn-success mt-3">Event List</a>
-    </form>
-<br>
     <!-- Charge Tables grouped by event -->
     <?php
         $grouped = [];
@@ -70,16 +111,18 @@
                     <div class="table-responsive">
                         <table class="table table-bordered table-striped mb-0 no-mgmt-sticky">
                             <thead class="table-light">
-                                <tr>
+                            <tr>
-                                    <th>ID</th>
+                                <th>ID</th>
-                                    <th>Parent Name</th>
+                                <th>Parent Name</th>
-                                    <th>Student Name</th>
+                                <th>Student Name</th>
-                                    <th>Charged Amount</th>
+                                <th>Charged Amount</th>
-                                    <th>Is Participating</th>
+                                <th>Is Participating</th>
-                                    <th>Semester</th>
+                                <th>Semester</th>
-                                    <th>Year</th>
+                                <th>Year</th>
-                                    <th>Created</th>
+                                <th>Created</th>
-                                </tr>
+                                <th>Description</th>
+                                <th>Event Fees</th>
+                            </tr>
                             </thead>
                             <tbody>
                                 <?php foreach ($rows as $charge): ?>
@@ -100,6 +143,8 @@
                                         <td><?= esc($charge['semester'] ?? '-') ?></td>
                                         <td><?= esc($charge['school_year'] ?? '-') ?></td>
                                         <td><?= esc(!empty($charge['created_at']) ? local_datetime($charge['created_at'], 'm-d-Y H:i') : '') ?></td>
+                                        <td><?= esc($charge['event_description'] ?? '—') ?></td>
+                                        <td>$<?= esc(number_format($charge['event_amount'] ?? 0, 2)) ?></td>
                                     </tr>
                                 <?php endforeach; ?>
                             </tbody>
@@ -156,7 +201,19 @@ function loadStudentsWithCharges() {
     }
 }
 
-$('#parent_id').on('change', loadStudentsWithCharges);
+$(function() {
-$('#event_id').on('change', loadStudentsWithCharges);
+    $('#parent_id').on('change', loadStudentsWithCharges);
+
+    $('#event_id').on('change', function() {
+        let eventId = $(this).val();
+        let url = new URL(window.location.href);
+        if (eventId) {
+            url.searchParams.set('event_id', eventId);
+        } else {
+            url.searchParams.delete('event_id');
+        }
+        window.location.href = url.toString();
+    });
+});
 </script>
 <?= $this->endSection() ?>

app/Views/administrator/events/event_list.php

@@ -21,7 +21,8 @@
                 <tr>
                     <th>Event Name</th>
                     <th>Category</th>
-                    <th>Amount</th>
+                    <th>Description</th>
+                    <th>Event Fees</th>
                     <th>Expiration Date</th>
                     <th>Semester</th>
                     <th>School Year</th>
@@ -33,7 +34,8 @@
                     <tr>
                         <td><?= esc($event['event_name']) ?></td>
                         <td><?= esc($event['event_category'] ?? '—') ?></td>
-                        <td><?= esc($event['amount']) ?></td>
+                        <td><?= esc(!empty($event['description']) ? $event['description'] : '—') ?></td>
+                        <td>$<?= esc(number_format($event['amount'], 2)) ?></td>
                         <td><?= esc(!empty($event['expiration_date']) ? local_date($event['expiration_date'], 'm-d-Y') : '') ?></td>
                         <td><?= esc($event['semester']) ?></td>
                         <td><?= esc($event['school_year']) ?></td>

app/Views/administrator/exam_drafts.php

@@ -1,9 +1,31 @@
 <?= $this->extend('layout/management_layout') ?>
 <?= $this->section('content') ?>
+<?php
+$statusBadges = $statusBadges ?? [];
+$drafts = $drafts ?? [];
+$legacyByClass = $legacyByClass ?? [];
+$classSections = $classSections ?? [];
+$examTypes = $examTypes ?? [];
+$visibleClasses = $visibleClasses ?? [];
+$classDraftGroups = $classDraftGroups ?? [];
+$newSubmissionClasses = $newSubmissionClasses ?? [];
+$schoolYear = $schoolYear ?? '';
+$semester = $semester ?? '';
+$maxUploadBytes = $maxUploadBytes ?? (12 * 1024 * 1024);
+$allowedExtensions = $allowedExtensions ?? ['doc', 'docx', 'pdf'];
+
+$renderBadge = static function (string $status, array $badges): string {
+    $b = $badges[$status] ?? ['label' => $status, 'class' => 'bg-secondary text-white'];
+    $style = !empty($b['style']) ? ' style="' . esc($b['style']) . '"' : '';
+    return '<span class="badge ' . esc($b['class']) . '"' . $style . '>' . esc($b['label']) . '</span>';
+};
+
+$fileAccept = implode(',', array_map(static fn ($x) => '.' . $x, $allowedExtensions));
+?>
 <div class="container-fluid px-4 py-4">
     <div class="d-flex flex-column flex-lg-row justify-content-between align-items-lg-center gap-3 mb-4">
         <div>
-            <h1 class="h3 mb-1">Exam Draft Submissions</h1>
+            <h1 class="h3 mb-1">Exam draft submissions</h1>
             <p class="text-muted mb-0 small">
                 <?= esc($semester ?: 'Semester') ?> <?= esc($schoolYear ?: '') ?>
             </p>
@@ -15,13 +37,9 @@
     </div>
 
     <?php if (session()->getFlashdata('success')): ?>
-        <div class="alert alert-success">
+        <div class="alert alert-success"><?= esc(session()->getFlashdata('success')) ?></div>
-            <?= esc(session()->getFlashdata('success')) ?>
-        </div>
     <?php elseif (session()->getFlashdata('error')): ?>
-        <div class="alert alert-danger">
+        <div class="alert alert-danger"><?= esc(session()->getFlashdata('error')) ?></div>
-            <?= esc(session()->getFlashdata('error')) ?>
-        </div>
     <?php endif; ?>
 
     <ul class="nav nav-pills mb-3" id="examDraftTabs" role="tablist">
@@ -32,177 +50,253 @@
         </li>
         <li class="nav-item" role="presentation">
             <button class="nav-link" id="legacy-tab" data-bs-toggle="pill" data-bs-target="#legacy" type="button" role="tab" aria-controls="legacy" aria-selected="false">
-                Legacy Exams
+                Legacy exams
             </button>
         </li>
     </ul>
+
     <div class="tab-content" id="examDraftTabsContent">
         <div class="tab-pane fade show active" id="submissions" role="tabpanel" aria-labelledby="submissions-tab">
             <div class="card mb-4">
                 <div class="card-body">
-                    <?php if (empty($drafts)): ?>
+                    <?php if (empty($visibleClasses)): ?>
-                        <p class="text-muted mb-0">No exam drafts have been submitted yet.</p>
+                        <p class="text-muted mb-0">No classes with enrolled students are available for this term.</p>
                     <?php else: ?>
-                        <div class="table-responsive">
+                        <div class="accordion exam-drafts-accordion" id="examDraftsAccordion">
-                            <table class="table table-striped table-bordered align-middle mb-0 exam-drafts-table no-mgmt-sticky">
+                            <?php foreach ($visibleClasses as $classSectionId => $classInfo): ?>
-                                <thead class="table-light">
+                                <?php $classDraftsForSection = $classDraftGroups[$classSectionId] ?? []; ?>
-                                    <tr>
+                                <?php $collapseId = 'classDraftGroup_' . $classSectionId; ?>
-                                        <th>Teacher</th>
+                                <div class="accordion-item mb-3">
-                                        <th>Class</th>
+                                    <h2 class="accordion-header" id="heading_<?= esc($collapseId) ?>">
-                                        <th>Title / Type</th>
+                                        <button class="accordion-button collapsed px-3" type="button" data-bs-toggle="collapse" data-bs-target="#<?= esc($collapseId) ?>" aria-expanded="false" aria-controls="<?= esc($collapseId) ?>">
-                                        <th>Version</th>
+                                            <div class="d-flex flex-column flex-lg-row w-100 justify-content-between gap-2">
-                                        <th>Submitted</th>
+                                                <div>
-                                        <th>Status</th>
+                                                    <strong><?= esc($classInfo['class_section_name'] ?? ('Class ' . $classSectionId)) ?></strong>
-                                        <th>Files</th>
+                                                    <div class="small text-muted">
-                                        <th>PDF</th>
+                                                        <?= esc($classInfo['student_count'] ?? 0) ?> students · <?= esc(count($classDraftsForSection)) ?> submissions
-                                        <th>Review</th>
+                                                        <?php if (!empty($newSubmissionClasses[$classSectionId])): ?>
-                                    </tr>
+                                                            <span class="badge bg-info text-dark ms-2">New submission</span>
-                                </thead>
-                                <tbody>
-                                    <?php foreach ($drafts as $draft): ?>
-                                        <?php
-                                            $teacherName = trim(($draft['teacher_first'] ?? '') . ' ' . ($draft['teacher_last'] ?? ''));
-                                            if ($teacherName === '') {
-                                                $teacherName = ($draft['admin_id'] ?? null) === ($draft['teacher_id'] ?? null)
-                                                    ? 'Admin Upload'
-                                                    : 'User #' . ($draft['teacher_id'] ?? 'N/A');
-                                            }
-                                            $statusInfo = $statusBadges[$draft['status'] ?? 'pending'] ?? ['label' => 'Unknown', 'class' => 'bg-secondary text-white'];
-                                            $adminName = trim(($draft['admin_first'] ?? '') . ' ' . ($draft['admin_last'] ?? ''));
-                                        ?>
-                                        <tr>
-                                            <td><?= esc($teacherName) ?></td>
-                                            <td><?= esc($draft['class_section_name'] ?? 'Unknown') ?></td>
-                                            <td>
-                                                <strong><?= esc($draft['draft_title'] ?? 'Untitled') ?></strong>
-                                                <div class="small text-muted"><?= esc($draft['exam_type'] ?? 'N/A') ?></div>
-                                                <?php if (!empty($draft['description'])): ?>
-                                                    <div class="small text-muted"><?= esc($draft['description']) ?></div>
-                                                <?php endif; ?>
-                                            </td>
-                                            <td class="text-nowrap">v<?= esc($draft['version'] ?? 1) ?></td>
-                                            <td class="text-nowrap"><?= esc((!empty($draft['created_at']) ? local_datetime($draft['created_at'], 'M j, Y g:i A') : '—')) ?></td>
-                                            <td>
-                                                <span class="badge <?= esc($statusInfo['class']) ?>">
-                                                    <?= esc($statusInfo['label']) ?>
-                                                </span>
-                                                <?php if (!empty($draft['reviewed_at'])): ?>
-                                                    <div class="small text-muted mt-1">
-                                                        Reviewed <?= esc(local_datetime($draft['reviewed_at'], 'M j, Y g:i A')) ?>
-                                                        <?php if ($adminName !== ''): ?>
-                                                            by <?= esc($adminName) ?>
                                                         <?php endif; ?>
                                                     </div>
-                                                <?php endif; ?>
+                                                </div>
-                                            </td>
+                                                <span class="badge bg-secondary align-self-start">
-                                            <td>
+                                                    <?= esc(count($classDraftsForSection)) ?>
-                                                <?php if (!empty($draft['teacher_file'])): ?>
+                                                    <?= count($classDraftsForSection) === 1 ? 'submission' : 'submissions' ?>
-                                                    <div>
+                                                </span>
-                                                        <a href="<?= base_url('exam-drafts/files/teacher/' . $draft['teacher_file']) ?>" target="_blank">
+                                            </div>
-                                                            <?= esc($draft['teacher_filename'] ?? 'Submitted draft') ?>
+                                        </button>
-                                                        </a>
+                                    </h2>
-                                                    </div>
+                                    <div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="heading_<?= esc($collapseId) ?>">
-                                                <?php else: ?>
+                                        <div class="accordion-body pt-0 px-3">
-                                                    <span class="text-muted small">No teacher file</span>
+                                            <?php if (empty($classDraftsForSection)): ?>
-                                                <?php endif; ?>
+                                                <p class="text-muted mb-0">No submissions yet for this class.</p>
-                                                <?php if (!empty($draft['final_file'])): ?>
+                                            <?php else: ?>
-                                                    <div class="mt-2">
+                                                <div class="table-responsive">
-                                                        <a href="<?= base_url('exam-drafts/files/final/' . $draft['final_file']) ?>" target="_blank" class="link-success small">
+                                                    <table class="table table-striped table-bordered align-middle mb-0 exam-drafts-table no-mgmt-sticky">
-                                                            <?= esc($draft['final_filename'] ?? 'Final draft') ?>
+                                                        <thead class="table-light">
-                                                        </a>
+                                                            <tr>
-                                                    </div>
+                                                                <th>Teacher</th>
-                                                <?php endif; ?>
+                                                                <th>Class</th>
-                                            </td>
+                                                                <th>Title & AuthorNote</th>
-                                            <td class="text-nowrap">
+                                                                <th>Version</th>
-                                                <?php
+                                                                <th>Date-Time</th>
-                                                    $pdfFile = $draft['final_pdf_file'] ?? null;
+                                                                <th>Status</th>
-                                                    // Fallback: if final_file itself is a pdf, use it
+                                                                <th>Files</th>
-                                                    if (empty($pdfFile) && !empty($draft['final_file']) && strtolower(pathinfo($draft['final_file'], PATHINFO_EXTENSION)) === 'pdf') {
+                                                                <th>Reviewer Action</th>
-                                                        $pdfFile = $draft['final_file'];
+                                                                <th>Final version</th>
-                                                    }
+                                                            </tr>
-                                                ?>
+                                                        </thead>
-                                                <?php if (!empty($pdfFile)): ?>
+                                                        <tbody>
-                                                    <a href="<?= base_url('exam-drafts/files/final/' . $pdfFile) ?>" target="_blank" class="link-success small">
+                                                            <?php foreach ($classDraftsForSection as $draft): ?>
-                                                        PDF
+                                                                <?php
-                                                    </a>
+                                                                    $teacherName = trim(($draft['teacher_first'] ?? '') . ' ' . ($draft['teacher_last'] ?? ''));
-                                                <?php else: ?>
+                                                                    if ($teacherName === '') {
-                                                    <span class="text-muted small">—</span>
+                                                                        $teacherName = ($draft['admin_id'] ?? null) === ($draft['teacher_id'] ?? null)
-                                                <?php endif; ?>
+                                                                            ? 'Admin upload'
-                                            </td>
+                                                                            : 'User #' . ($draft['teacher_id'] ?? 'N/A');
-                                            <td>
+                                                                    }
-                                                <form method="post" action="<?= base_url('/administrator/exam-drafts/review') ?>" enctype="multipart/form-data">
+                                                                    $st = strtolower((string) ($draft['status'] ?? ''));
-                                                    <?= csrf_field() ?>
+                                                                    $adminName = trim(($draft['admin_first'] ?? '') . ' ' . ($draft['admin_last'] ?? ''));
-                                                    <input type="hidden" name="draft_id" value="<?= esc($draft['id']) ?>">
+                                                                    $authorNote = $draft['author_comment'] ?? $draft['description'] ?? '';
-                                                    <div class="mb-2">
+                                                                    $reviewerNote = $draft['reviewer_comment'] ?? $draft['admin_comments'] ?? '';
-                                                        <textarea
+                                                                ?>
-                                                            name="admin_comments"
+                                                                <tr>
-                                                            rows="2"
+                                                                    <td><?= esc($teacherName) ?></td>
-                                                            class="form-control form-control-sm"
+                                                                    <td><?= esc($draft['class_section_name'] ?? 'Unknown') ?></td>
-                                                            placeholder="Optional note for the teacher"
+                                                                    <td>
-                                                        ><?= esc($draft['admin_comments'] ?? '') ?></textarea>
+                                                                        <strong><?= esc($draft['draft_title'] ?? 'Untitled') ?></strong>
-                                                    </div>
+                                                                        <div class="small text-muted"><?= esc($draft['exam_type'] ?? 'N/A') ?></div>
-                                                    <div class="mb-2">
+                                                                        <?php if ($authorNote !== ''): ?>
-                                                        <label class="form-label small mb-1">Status</label>
+                                                                            <div class="small mt-1">
-                                                        <select name="review_status" class="form-select form-select-sm">
+                                                                                <span class="text-muted fw-semibold">Author:</span>
-                                                            <?php foreach ($statusOptions as $option): ?>
+                                                                                <?= esc($authorNote) ?>
-                                                                <option value="<?= esc($option) ?>" <?= ($option === ($draft['status'] ?? '')) ? 'selected' : '' ?>>
+                                                                            </div>
-                                                                    <?= esc(ucfirst($option)) ?>
+                                                                        <?php endif; ?>
-                                                                </option>
+                                                                        <?php if ($reviewerNote !== ''): ?>
+                                                                            <div class="small mt-1 border-top pt-1">
+                                                                                <span class="text-muted fw-semibold">Reviewer:</span>
+                                                                                <?= esc($reviewerNote) ?>
+                                                                            </div>
+                                                                        <?php endif; ?>
+                                                                    </td>
+                                                                    <td class="text-nowrap">v<?= esc((string) ($draft['version'] ?? 1)) ?></td>
+                                                                    <td class="text-nowrap"><?= esc(!empty($draft['created_at']) ? local_datetime($draft['created_at'], 'M j, Y g:i A') : '—') ?></td>
+                                                                    <td>
+                                                                        <?php
+                                                                            $badgeData = $statusBadges[$st] ?? ['label' => $st, 'class' => 'bg-secondary text-white'];
+                                                                            $badgeStyle = !empty($badgeData['style']) ? ' style="' . esc($badgeData['style']) . '"' : '';
+                                                                        ?>
+                                                                        <span class="badge <?= esc($badgeData['class']) ?> js-status-badge" data-status="<?= esc($st) ?>"<?= $badgeStyle ?>>
+                                                                            <?= esc($badgeData['label']) ?>
+                                                                        </span>
+                                                                        <div class="small text-muted mt-1 js-acceptance-note">
+                                                                            <?php if ($st === 'accepted' && !empty($draft['acceptance_type'])): ?>
+                                                                                <?= $draft['acceptance_type'] === 'minor_edits' ? 'Accepted w/ minor edits' : 'Accepted as is' ?>
+                                                                            <?php endif; ?>
+                                                                        </div>
+                                                                        <?php if (!empty($draft['reviewed_at'])): ?>
+                                                                            <div class="small text-muted mt-1">
+                                                                                Reviewed <?= esc(local_datetime($draft['reviewed_at'], 'M j, Y g:i A')) ?>
+                                                                                <?php if ($adminName !== ''): ?>
+                                                                                    by <?= esc($adminName) ?>
+                                                                                <?php endif; ?>
+                                                                            </div>
+                                                                        <?php endif; ?>
+                                                                    </td>
+                                                                    <td>
+                                                                        <?php $formId = 'review_form_' . (int) ($draft['id'] ?? 0); ?>
+                                                                        <?php $revNumber = max(1, (int) ($draft['version'] ?? 1)); ?>
+                                                                        <?php if (!empty($draft['teacher_file'])): ?>
+                                                                            <div>
+                                                                                <a href="<?= base_url('exam-drafts/files/teacher/' . $draft['teacher_file']) ?>" target="_blank" rel="noopener">
+                                                                                    <?= esc('Ver' . $revNumber . ' ' . ($draft['teacher_filename'] ?? 'Submitted draft')) ?>
+                                                                                </a>
+                                                                            </div>
+                                                                        <?php else: ?>
+                                                                            <span class="text-muted small">No teacher file</span>
+                                                                        <?php endif; ?>
+                                                                        <?php if (!empty($draft['final_file']) && strtolower((string) ($draft['status'] ?? '')) === 'accepted'): ?>
+                                                                            <div class="mt-2">
+                                                                                <a href="<?= base_url('exam-drafts/files/final/' . $draft['final_file']) ?>" target="_blank" rel="noopener" class="link-success small">
+                                                                                    <?= esc('Final ' . ($draft['final_filename'] ?? 'Final draft')) ?>
+                                                                                </a>
+                                                                            </div>
+                                                                        <?php endif; ?>
+                                                                        <?php if (!empty($draft['review_files'])): ?>
+                                                                            <div class="mt-2">
+                                                                                <?php
+                                                                                    $reviewLinks = [];
+                                                                                    foreach ($draft['review_files'] as $rf) {
+                                                                                        $rev = max(1, (int) ($rf['review_revision'] ?? 1));
+                                                                                        $name = $rf['final_filename'] ?? 'Review file';
+                                                                                        $file = $rf['final_file'] ?? '';
+                                                                                        if ($file !== '') {
+                                                                                            $reviewLinks[] = '<a href="' . esc(base_url('exam-drafts/files/final/' . $file)) . '" target="_blank" rel="noopener" class="link-success small">' . esc('Ver' . $revNumber . '_' . $rev . ' ' . $name) . '</a>';
+                                                                                        }
+                                                                                    }
+                                                                                ?>
+                                                                                <?= !empty($reviewLinks) ? implode(' | ', $reviewLinks) : '' ?>
+                                                                            </div>
+                                                                        <?php endif; ?>
+                                                                        <div class="mt-2">
+                                                                            <?php $fileInputId = 'review_file_' . (int) ($draft['id'] ?? 0); ?>
+                                                                            <input type="file" name="final_file" id="<?= esc($fileInputId) ?>" class="form-control form-control-sm" accept="<?= esc($fileAccept) ?>" form="<?= esc($formId) ?>">
+                                                                            <button type="submit" class="btn btn-sm btn-outline-primary mt-2" form="<?= esc($formId) ?>">Upload review file</button>
+                                                                        </div>
+                                                                    </td>
+                                                                    <td style="min-width: 280px;">
+                                                                        <?= form_open_multipart(base_url('administrator/exam-drafts/review'), ['class' => 'vstack gap-2', 'id' => $formId]) ?>
+                                                                            <?= csrf_field() ?>
+                                                                            <input type="hidden" name="draft_id" value="<?= (int) ($draft['id'] ?? 0) ?>">
+                                                                            <?php $selectedStatus = ''; ?>
+                                                                            <select name="review_status" class="form-select form-select-sm" required>
+                                                                                <option value="" <?= $selectedStatus === '' ? 'selected' : '' ?> disabled>— Select status —</option>
+                                                                                <option value="accepted" <?= $selectedStatus === 'accepted' ? 'selected' : '' ?>>Accepted</option>
+                                                                                <option value="legacy" <?= $selectedStatus === 'legacy' ? 'selected' : '' ?>>Legacy</option>
+                                                                                <option value="canceled" <?= $selectedStatus === 'canceled' ? 'selected' : '' ?>>Canceled</option>
+                                                                                <option value="rejected" <?= $selectedStatus === 'rejected' ? 'selected' : '' ?>>Rejected</option>
+                                                                                <option value="review needed" <?= $selectedStatus === 'review needed' ? 'selected' : '' ?>>Review needed</option>
+                                                                                <option value="under review" <?= $selectedStatus === 'under review' ? 'selected' : '' ?>>Under review</option>
+                                                                            </select>
+                                                                            <div class="small js-acceptance-group d-none">
+                                                                                <span class="d-block mb-1">As is / Minor edits</span>
+                                                                                <?php $acc = (string) ($draft['acceptance_type'] ?? ''); ?>
+                                                                                <div class="form-check form-check-inline">
+                                                                                    <input class="form-check-input" type="radio" name="acceptance_type" value="as_is" id="as_is_<?= (int) ($draft['id'] ?? 0) ?>" <?= $acc !== 'minor_edits' ? 'checked' : '' ?>>
+                                                                                    <label class="form-check-label" for="as_is_<?= (int) ($draft['id'] ?? 0) ?>">As is</label>
+                                                                                </div>
+                                                                                <div class="form-check form-check-inline">
+                                                                                    <input class="form-check-input" type="radio" name="acceptance_type" value="minor_edits" id="minor_<?= (int) ($draft['id'] ?? 0) ?>" <?= $acc === 'minor_edits' ? 'checked' : '' ?>>
+                                                                                    <label class="form-check-label" for="minor_<?= (int) ($draft['id'] ?? 0) ?>">Minor edits</label>
+                                                                                </div>
+                                                                            </div>
+                                                                            <textarea name="reviewer_comment" class="form-control form-control-sm js-review-comment" rows="3" placeholder="Feedback for the teacher"><?= esc($draft['reviewer_comment'] ?? $draft['reviewer_comments'] ?? $draft['admin_comments'] ?? '') ?></textarea>
+                                                                            <div class="d-flex flex-wrap gap-2">
+                                                                                <span class="text-muted small js-review-status"></span>
+                                                                            </div>
+                                                                        <?= form_close() ?>
+                                                                    </td>
+                                                                    <td class="text-nowrap" style="min-width: 220px;">
+                                                                        <?php
+                                                                            $pdfFile = $draft['final_pdf_file'] ?? null;
+                                                                            if (empty($pdfFile) && !empty($draft['final_file']) && strtolower(pathinfo($draft['final_file'], PATHINFO_EXTENSION)) === 'pdf') {
+                                                                                $pdfFile = $draft['final_file'];
+                                                                            }
+                                                                        ?>
+                                                                        <?php if (!empty($pdfFile)): ?>
+                                                                            <div class="mt-2 d-flex flex-wrap gap-2">
+                                                                                <a class="btn btn-sm btn-outline-primary" href="<?= base_url('exam-drafts/files/final/' . $pdfFile) ?>" target="_blank" rel="noopener">View</a>
+                                                                                <a class="btn btn-sm btn-outline-secondary" href="<?= base_url('exam-drafts/files/final/' . $pdfFile) ?>" target="_blank" rel="noopener" download>Download</a>
+                                                                            </div>
+                                                                        <?php endif; ?>
+                                                                    </td>
+                                                                </tr>
                                                             <?php endforeach; ?>
-                                                        </select>
+                                                        </tbody>
-                                                    </div>
+                                                    </table>
-                                                    <div class="mb-2">
+                                                </div>
-                                                        <label class="form-label small mb-1">Upload final draft</label>
+                                            <?php endif; ?>
-                                                        <input type="file" name="final_file" class="form-control form-control-sm">
+                                        </div>
-                                                    </div>
+                                    </div>
-                                                    <button type="submit" class="btn btn-sm btn-primary w-100">
+                                </div>
-                                                        Save review
+                            <?php endforeach; ?>
-                                                    </button>
-                                                </form>
-                                            </td>
-                                        </tr>
-                                    <?php endforeach; ?>
-                                </tbody>
-                            </table>
                         </div>
                     <?php endif; ?>
                 </div>
             </div>
         </div>
+
         <div class="tab-pane fade" id="legacy" role="tabpanel" aria-labelledby="legacy-tab">
             <div class="card border-primary-subtle mb-3">
                 <div class="card-header bg-light d-flex justify-content-between align-items-center">
                     <div>
-                        <strong>Upload Old / Legacy Exam</strong>
+                        <strong>Upload old / legacy exam</strong>
-                        <div class="small text-muted">Store historic exams as finalized records.</div>
+                        <div class="small text-muted">Store historic exams as accepted records.</div>
                     </div>
                     <span class="badge bg-primary-subtle text-primary">Admin only</span>
                 </div>
                 <div class="card-body">
-                    <form method="post" action="<?= base_url('/administrator/exam-drafts/upload-legacy') ?>" enctype="multipart/form-data" class="row g-3">
+                    <?= form_open_multipart(base_url('administrator/exam-drafts/upload-legacy'), ['class' => 'row g-3']) ?>
                         <?= csrf_field() ?>
                         <div class="col-md-4">
-                            <label class="form-label small">Class Section</label>
+                            <label class="form-label small">Class sections</label>
-                            <select name="class_section_id" class="form-select" required>
+                            <select name="class_section_ids[]" class="form-select" multiple required size="6">
-                                <option value="">Select class</option>
                                 <?php foreach ($classSections as $cs): ?>
-                                    <option value="<?= esc($cs['class_section_id']) ?>"><?= esc($cs['class_section_name']) ?></option>
+                                    <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>
+                            <label class="form-label small">School year</label>
                             <input type="text" name="school_year" class="form-control" value="<?= esc($schoolYear) ?>" placeholder="2025-2026" required>
                         </div>
                         <div class="col-md-2">
                             <label class="form-label small">Semester</label>
-                            <select name="semester" class="form-select" required>
+                            <input type="text" name="semester" class="form-control" value="<?= esc($semester) ?>" placeholder="Fall / Spring" required>
-                                <option value="Fall" <?= ($semester === 'Fall') ? 'selected' : '' ?>>Fall</option>
-                                <option value="Spring" <?= ($semester === 'Spring') ? 'selected' : '' ?>>Spring</option>
-                            </select>
                         </div>
                         <div class="col-md-4">
-                            <label class="form-label small">Exam Type</label>
+                            <label class="form-label small">Exam type</label>
                             <select name="exam_type" class="form-select">
                                 <option value="">— Select type —</option>
                                 <?php foreach ($examTypes as $type): ?>
@@ -211,14 +305,14 @@
                             </select>
                         </div>
                         <div class="col-12">
-                            <label class="form-label small">Upload File</label>
+                            <label class="form-label small">Upload file</label>
-                            <input type="file" name="old_exam_file" class="form-control" accept=".doc,.docx,.pdf" required>
+                            <input type="file" name="old_exam_file" class="form-control" accept="<?= esc($fileAccept) ?>" required>
                             <div class="form-text">Allowed: <?= esc(implode(', ', $allowedExtensions)) ?> • Max <?= number_format($maxUploadBytes / 1024 / 1024, 0) ?> MB</div>
                         </div>
                         <div class="col-12">
-                            <button type="submit" class="btn btn-primary">Upload Legacy Exam</button>
+                            <button type="submit" class="btn btn-primary">Upload legacy exam</button>
                         </div>
-                    </form>
+                    <?= form_close() ?>
                 </div>
             </div>
 
@@ -231,20 +325,21 @@
                             <div class="mb-4">
                                 <h6 class="mb-2"><?= esc($group['class_section_name'] ?? 'Class') ?></h6>
                                 <div class="list-group">
-                                    <?php foreach ($group['items'] as $item): ?>
+                                    <?php foreach ($group['items'] ?? [] as $item): ?>
-                                        <div class="list-group-item d-flex justify-content-between align-items-start">
+                                        <?php $lst = strtolower((string) ($item['status'] ?? '')); ?>
+                                        <div class="list-group-item d-flex justify-content-between align-items-start flex-wrap gap-2">
                                             <div class="me-3">
-                                                <div class="fw-semibold"><?= esc($item['draft_title'] ?? 'Legacy Exam') ?></div>
+                                                <div class="fw-semibold"><?= esc($item['draft_title'] ?? 'Legacy exam') ?></div>
                                                 <div class="small text-muted">
                                                     <?= esc($item['exam_type'] ?? 'N/A') ?> •
                                                     <?= esc($item['semester'] ?? '') ?> <?= esc($item['school_year'] ?? '') ?>
                                                 </div>
+                                                <div class="small mt-1"><?= $renderBadge($lst, $statusBadges) ?></div>
                                             </div>
-                                            <div class="text-end">
+                                            <div class="text-end d-flex flex-wrap gap-2 justify-content-end">
                                                 <?php if (!empty($item['final_file'])): ?>
-                                                    <a href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" class="btn btn-sm btn-outline-primary">
+                                                    <a class="btn btn-sm btn-outline-primary" href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" rel="noopener">View</a>
-                                                        Download
+                                                    <a class="btn btn-sm btn-outline-secondary" href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" rel="noopener" download>Download</a>
-                                                    </a>
                                                 <?php else: ?>
                                                     <span class="text-muted small">File missing</span>
                                                 <?php endif; ?>
@@ -260,6 +355,208 @@
         </div>
     </div>
 </div>
+<script>
+document.addEventListener('DOMContentLoaded', () => {
+    const submissionsTab = document.getElementById('submissions-tab');
+    if (submissionsTab) {
+        submissionsTab.addEventListener('click', () => {
+            window.location.reload();
+        });
+    }
+    const statusBadges = <?= json_encode($statusBadges, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
+    const csrfTokenName = <?= json_encode(csrf_token(), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
+    const csrfCookieNames = <?= json_encode(array_values(array_filter([
+        config('Security')->csrfCookieName ?? null,
+        config('Security')->cookieName ?? null,
+        'csrf_cookie_name',
+    ])), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
+
+    const readCookie = (name) => {
+        const match = document.cookie.match(new RegExp('(?:^|; )' + name.replace(/[$()*+.?[\\\]^{|}-]/g, '\\$&') + '=([^;]*)'));
+        return match ? decodeURIComponent(match[1]) : '';
+    };
+
+    const syncCsrfToken = (form) => {
+        let tokenValue = '';
+        csrfCookieNames.some((name) => {
+            tokenValue = readCookie(name);
+            return tokenValue !== '';
+        });
+        if (!tokenValue && form) {
+            const tokenInput = form.querySelector(`input[name="${csrfTokenName}"]`);
+            if (tokenInput && tokenInput.value) {
+                tokenValue = tokenInput.value;
+            }
+        }
+        if (!tokenValue || !form) {
+            return tokenValue;
+        }
+        const tokenInput = form.querySelector(`input[name="${csrfTokenName}"]`);
+        if (tokenInput) {
+            tokenInput.value = tokenValue;
+        }
+        return tokenValue;
+    };
+    const updateRow = (row) => {
+        const statusSelect = row.querySelector('select[name="review_status"]');
+        const acceptanceGroup = row.querySelector('.js-acceptance-group');
+        if (!statusSelect || !acceptanceGroup) {
+            return;
+        }
+        acceptanceGroup.classList.toggle('d-none', statusSelect.value !== 'accepted');
+    };
+
+    const updateStatusUI = (row) => {
+        const statusSelect = row.querySelector('select[name="review_status"]');
+        const badge = row.querySelector('.js-status-badge');
+        if (!statusSelect || !badge || statusSelect.value === '') {
+            return;
+        }
+        const status = statusSelect.value;
+        const badgeData = statusBadges[status] || { label: status, class: 'bg-secondary text-white' };
+        badge.textContent = badgeData.label || status;
+        badge.className = `badge ${badgeData.class} js-status-badge`;
+        if (badgeData.style) {
+            badge.setAttribute('style', badgeData.style);
+        } else {
+            badge.removeAttribute('style');
+        }
+        badge.dataset.status = status;
+
+        const acceptanceNote = row.querySelector('.js-acceptance-note');
+        if (acceptanceNote) {
+            if (status === 'accepted') {
+                const acc = row.querySelector('input[name="acceptance_type"]:checked');
+                acceptanceNote.textContent = acc && acc.value === 'minor_edits'
+                    ? 'Accepted w/ minor edits'
+                    : 'Accepted as is';
+            } else {
+                acceptanceNote.textContent = '';
+            }
+        }
+    };
+
+    const saveRow = (row, options = {}) => {
+        const form = row.querySelector('form');
+        if (!form) {
+            return;
+        }
+        const statusSelect = form.querySelector('select[name="review_status"]');
+        if (!statusSelect) {
+            return;
+        }
+        const statusLabel = form.querySelector('.js-review-status');
+        const data = new FormData(form);
+        data.delete('final_file');
+        data.delete('old_exam_file');
+        if (options.commitComment) {
+            const commentInput = form.querySelector('textarea[name="reviewer_comment"]');
+            if (commentInput) {
+                const raw = commentInput.value || '';
+                const committed = raw.endsWith('\n') ? raw : raw + '\n';
+                data.set('reviewer_comment', committed);
+            }
+        }
+        const csrfToken = syncCsrfToken(form);
+        if (csrfToken) {
+            data.set(csrfTokenName, csrfToken);
+        }
+        if (statusLabel) {
+            statusLabel.textContent = 'Saving...';
+        }
+        fetch(form.action, {
+            method: 'POST',
+            body: data,
+            credentials: 'same-origin',
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+                'X-CSRF-TOKEN': csrfToken,
+            },
+        })
+            .then((resp) => {
+                if (!resp.ok) {
+                    throw new Error('Save failed');
+                }
+                syncCsrfToken(form);
+                updateStatusUI(row);
+                if (statusLabel) {
+                    statusLabel.textContent = 'Saved';
+                }
+                setTimeout(() => {
+                    if (statusLabel && statusLabel.textContent === 'Saved') {
+                        statusLabel.textContent = '';
+                    }
+                }, 1500);
+            })
+            .catch(() => {
+                if (statusLabel) {
+                    statusLabel.textContent = 'Error saving';
+                }
+            });
+    };
+
+    const debounce = (fn, wait) => {
+        let timer;
+        return (...args) => {
+            clearTimeout(timer);
+            timer = setTimeout(() => fn(...args), wait);
+        };
+    };
+
+    const debouncedSave = debounce(saveRow, 500);
+
+    document.querySelectorAll('.exam-drafts-table tbody tr').forEach(updateRow);
+
+    document.addEventListener('change', (event) => {
+        const target = event.target;
+        if (!(target instanceof HTMLElement)) {
+            return;
+        }
+        const row = target.closest('tr');
+        if (!row) {
+            return;
+        }
+        if (target instanceof HTMLSelectElement && target.name === 'review_status') {
+            updateRow(row);
+            debouncedSave(row);
+            return;
+        }
+        if (target instanceof HTMLInputElement && target.name === 'acceptance_type') {
+            debouncedSave(row);
+        }
+    });
+
+    document.addEventListener('input', (event) => {
+        const target = event.target;
+        if (!(target instanceof HTMLTextAreaElement) || target.name !== 'reviewer_comment') {
+            return;
+        }
+        const row = target.closest('tr');
+        if (row && target.value.endsWith('\n')) {
+            const lastCommitted = target.dataset.lastCommitted || '';
+            if (target.value !== lastCommitted) {
+                target.dataset.lastCommitted = target.value;
+                debouncedSave(row, { commitComment: true });
+            }
+        }
+    });
+
+    document.addEventListener('blur', (event) => {
+        const target = event.target;
+        if (!(target instanceof HTMLTextAreaElement) || target.name !== 'reviewer_comment') {
+            return;
+        }
+        const row = target.closest('tr');
+        if (row) {
+            const lastCommitted = target.dataset.lastCommitted || '';
+            if (target.value !== lastCommitted) {
+                target.dataset.lastCommitted = target.value;
+                debouncedSave(row, { commitComment: true });
+            }
+        }
+    }, true);
+});
+</script>
 <?= $this->endSection() ?>
 
 <?= $this->section('styles') ?>
@@ -270,13 +567,15 @@
     word-break: break-word;
   }
   .exam-drafts-table th {
-    min-width: 120px;
+    min-width: 0;
+    white-space: nowrap;
   }
   .exam-drafts-table td {
-    max-width: 220px;
+    max-width: none;
   }
   .exam-drafts-table {
     table-layout: auto;
+    width: max-content;
   }
   .exam-drafts-table thead th {
     background-color: #f8f9fa;

app/Views/administrator/subject_curriculum.php

@@ -144,58 +144,86 @@
           <span class="text-muted small"><?= count($entries) ?> record<?= count($entries) === 1 ? '' : 's' ?></span>
         </div>
         <div class="card-body">
-          <div class="table-responsive">
+          <?php if (empty($entries)): ?>
-            <table class="table table-bordered table-hover align-middle mb-0" data-no-mgmt-sticky>
+            <div class="text-center text-muted">No curriculum records yet.</div>
-              <thead class="table-light">
+          <?php else: ?>
-                <tr>
+            <?php
-                  <th>Class</th>
+              $entriesByClass = [];
-                  <th>Subject</th>
+              foreach ($entries as $entry) {
-                  <th>Unit</th>
+                $className = ($entry['class_name'] ?? '') ?: '—';
-                  <th>Unit title</th>
+                if (!isset($entriesByClass[$className])) {
-                  <th>Chapter / Surah</th>
+                  $entriesByClass[$className] = [];
-                  <th>Updated</th>
+                }
-                  <th style="min-width: 170px;">Actions</th>
+                $entriesByClass[$className][] = $entry;
-                </tr>
+              }
-              </thead>
+            ?>
-              <tbody>
+            <div class="accordion" id="curriculumAccordion">
-                <?php if (empty($entries)): ?>
+              <?php $accIndex = 0; ?>
-                  <tr>
+              <?php foreach ($entriesByClass as $className => $classEntries): ?>
-                    <td colspan="7" class="text-center text-muted">No curriculum records yet.</td>
+                <?php
-                  </tr>
+                  $accIndex++;
-                <?php else: ?>
+                  $collapseId = 'curriculum-class-' . $accIndex;
-                  <?php foreach ($entries as $entry): ?>
+                  $headingId = 'curriculum-heading-' . $accIndex;
-                    <?php
+                ?>
-                      $subjectLabel = $subjectLabels[$entry['subject']] ?? ucfirst($entry['subject'] ?? '');
+                <div class="accordion-item mb-2">
-                      $updatedAt = $entry['updated_at'] ?? $entry['created_at'] ?? '';
+                  <h2 class="accordion-header" id="<?= esc($headingId) ?>">
-                      $updatedDisplay = '';
+                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<?= esc($collapseId) ?>" aria-expanded="false" aria-controls="<?= esc($collapseId) ?>">
-                      if ($updatedAt) {
+                      <?= esc($className) ?>
-                        try {
+                      <span class="badge bg-secondary ms-2"><?= count($classEntries) ?> entries</span>
-                          $updatedDisplay = (new \DateTime($updatedAt))->format('M d, Y H:i');
+                    </button>
-                        } catch (\Exception $e) {
+                  </h2>
-                          $updatedDisplay = $updatedAt;
+                  <div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="<?= esc($headingId) ?>" data-bs-parent="#curriculumAccordion">
-                        }
+                    <div class="accordion-body">
-                      }
+                      <div class="table-responsive">
-                    ?>
+                        <table class="table table-bordered table-hover align-middle mb-0" data-no-mgmt-sticky>
-                    <tr>
+                          <thead class="table-light">
-                      <td><?= esc(($entry['class_name'] ?? '') ?: '—') ?></td>
+                            <tr>
-                      <td><?= esc($subjectLabel) ?></td>
+                              <th>Subject</th>
-                      <td><?= $entry['unit_number'] ? esc((string)$entry['unit_number']) : '—' ?></td>
+                              <th>Unit</th>
-                      <td><?= esc(($entry['unit_title'] ?? '') ?: '—') ?></td>
+                              <th>Unit title</th>
-                      <td><?= esc(($entry['chapter_name'] ?? '') ?: '—') ?></td>
+                              <th>Chapter / Surah</th>
-                      <td><?= esc($updatedDisplay ?: '—') ?></td>
+                              <th>Updated</th>
-                      <td class="d-flex gap-2 flex-wrap">
+                              <th style="min-width: 170px;">Actions</th>
-                        <a href="<?= site_url('administrator/subject-curriculum/edit/' . $entry['id']) ?>" class="btn btn-sm btn-outline-primary">Edit</a>
+                            </tr>
-                        <form action="<?= site_url('administrator/subject-curriculum/delete/' . $entry['id']) ?>" method="post" onsubmit="return confirm('Remove this curriculum entry?');">
+                          </thead>
-                          <?= csrf_field() ?>
+                          <tbody>
-                          <button type="submit" class="btn btn-sm btn-outline-danger">Delete</button>
+                            <?php foreach ($classEntries as $entry): ?>
-                        </form>
+                              <?php
-                      </td>
+                                $subjectLabel = $subjectLabels[$entry['subject']] ?? ucfirst($entry['subject'] ?? '');
-                    </tr>
+                                $updatedAt = $entry['updated_at'] ?? $entry['created_at'] ?? '';
-                  <?php endforeach; ?>
+                                $updatedDisplay = '';
-                <?php endif; ?>
+                                if ($updatedAt) {
-              </tbody>
+                                  try {
-            </table>
+                                    $updatedDisplay = (new \DateTime($updatedAt))->format('M d, Y H:i');
-          </div>
+                                  } catch (\Exception $e) {
+                                    $updatedDisplay = $updatedAt;
+                                  }
+                                }
+                              ?>
+                              <tr>
+                                <td><?= esc($subjectLabel) ?></td>
+                                <td><?= $entry['unit_number'] ? esc((string)$entry['unit_number']) : '—' ?></td>
+                                <td><?= esc(($entry['unit_title'] ?? '') ?: '—') ?></td>
+                                <td><?= esc(($entry['chapter_name'] ?? '') ?: '—') ?></td>
+                                <td><?= esc($updatedDisplay ?: '—') ?></td>
+                                <td class="d-flex gap-2 flex-wrap">
+                                  <a href="<?= site_url('administrator/subject-curriculum/edit/' . $entry['id']) ?>" class="btn btn-sm btn-outline-primary">Edit</a>
+                                  <form action="<?= site_url('administrator/subject-curriculum/delete/' . $entry['id']) ?>" method="post" onsubmit="return confirm('Remove this curriculum entry?');">
+                                    <?= csrf_field() ?>
+                                    <button type="submit" class="btn btn-sm btn-outline-danger">Delete</button>
+                                  </form>
+                                </td>
+                              </tr>
+                            <?php endforeach; ?>
+                          </tbody>
+                        </table>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              <?php endforeach; ?>
+            </div>
+          <?php endif; ?>
         </div>
       </div>
     </div>

app/Views/administrator/teacher_class_assignment.php

@@ -63,7 +63,15 @@
                 </thead>
                 <tbody>
                     <tr>
-                        <td colspan="9" class="text-center text-muted">Loading...</td>
+                        <td class="text-center text-muted">Loading...</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
                     </tr>
                 </tbody>
             </table>
@@ -198,10 +206,12 @@ document.addEventListener('DOMContentLoaded', function () {
         if (!teachers || teachers.length === 0) {
             var emptyRow = document.createElement('tr');
             var emptyCell = document.createElement('td');
-            emptyCell.colSpan = 9;
             emptyCell.className = 'text-center text-muted';
             emptyCell.textContent = 'No teachers found.';
             emptyRow.appendChild(emptyCell);
+            for (var i = 0; i < 8; i++) {
+                emptyRow.appendChild(document.createElement('td'));
+            }
             tbody.appendChild(emptyRow);
         } else {
             teachers.forEach(function (teacher, index) {
@@ -312,7 +322,10 @@ document.addEventListener('DOMContentLoaded', function () {
             return;
         }
 
-        tbody.innerHTML = '<tr><td colspan="9" class="text-center text-muted">Loading...</td></tr>';
+        tbody.innerHTML = '<tr>'
+            + '<td class="text-center text-muted">Loading...</td>'
+            + '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
+            + '</tr>';
 
         var url = apiList + (selectedYear ? ('?schoolYear=' + encodeURIComponent(selectedYear)) : '');
         fetch(url, {

app/Views/administrator/teacher_submissions.php

@@ -21,140 +21,329 @@
       $totalItems = max(0, (int)($summary['total_items'] ?? 0));
     ?>
     <div class="card-body">
-      <div class="border rounded-3 p-3 mb-4 bg-light">
+      <?php
-        <div class="d-flex flex-wrap gap-4 align-items-center">
+        $termExamLabel = (isset($semester) && strtolower((string) $semester) === 'spring') ? 'Final' : 'Midterm';
-          <div>
+        $lowProgressSectionIds = $lowProgressSectionIds ?? [];
-            <div class="text-uppercase small text-muted">Submission completion</div>
+        $flaggedClasses = count($lowProgressSectionIds);
-            <div class="h4 fw-semibold mb-1"><?= esc($completionPercent) ?>%</div>
+        $pageNotifications = [];
-            <div class="progress" style="height:6px;">
+        if ($missingItemsCount > 0) {
-              <div
+            $pageNotifications[] = [
-                class="progress-bar bg-primary"
+                'level' => 'danger',
-                role="progressbar"
+                'message' => "{$missingItemsCount} missing item" . ($missingItemsCount === 1 ? '' : 's') . " awaiting teacher uploads.",
-                style="width: <?= esc($completionPercent) ?>%;"
+            ];
-                aria-valuenow="<?= esc($completionPercent) ?>"
+        }
-                aria-valuemin="0"
+        if ($completionPercent < 70) {
-                aria-valuemax="100"
+            $pageNotifications[] = [
-              ></div>
+                'level' => 'warning',
+                'message' => "Submission completion is below 70% — follow up with remaining teachers.",
+            ];
+        }
+        if ($flaggedClasses > 0) {
+            $pageNotifications[] = [
+                'level' => 'warning',
+                'message' => "Progress is under 50% for {$flaggedClasses} class section" . ($flaggedClasses === 1 ? '' : 's') . ".",
+            ];
+        }
+        if (empty($rows)) {
+            $pageNotifications[] = [
+                'level' => 'info',
+                'message' => 'No class-section assignments submitted yet; encourage teachers to upload drafts.',
+            ];
+        }
+        if (empty($pageNotifications)) {
+            $pageNotifications[] = [
+                'level' => 'info',
+                'message' => 'All tracked classes are current. Use the controls below to send reminders.',
+            ];
+        }
+        $examDraftDeadlineConfig = $examDraftDeadlineConfig ?? '';
+        $examDraftDeadlineFormatted = $examDraftDeadlineFormatted ?? '';
+      ?>
+      <?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
+        $groupedRows = [];
+        foreach ($rows as $idx => $row) {
+          $classKey = (string) ($row['class_section_id'] ?? $row['class_section'] ?? 'class_' . $idx);
+          $groupedRows[$classKey][] = $row;
+        }
+      ?>
+      <div class="row g-3 mb-4 align-items-stretch">
+        <div class="col-lg-8">
+          <div class="row g-3 summary-row">
+            <div class="col-12 col-sm-6 col-xl-3">
+              <div class="summary-card h-100 shadow-sm border-0">
+                <div class="summary-card-body">
+                  <div class="summary-label text-uppercase">Completion</div>
+                  <div class="summary-value"><?= esc($completionPercent) ?>%</div>
+                  <div class="progress summary-progress">
+                    <div
+                      class="progress-bar"
+                      role="progressbar"
+                      style="width: <?= esc($completionPercent) ?>%;"
+                      aria-valuenow="<?= esc($completionPercent) ?>"
+                      aria-valuemin="0"
+                      aria-valuemax="100"
+                    ></div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="col-12 col-sm-6 col-xl-3">
+              <div class="summary-card h-100 shadow-sm border-0">
+                <div class="summary-card-body">
+                  <div class="summary-label text-uppercase">Missing items</div>
+                  <div class="summary-value <?= $missingItemsCount > 0 ? 'text-danger' : '' ?>"><?= esc($missingItemsCount) ?></div>
+                  <div class="summary-note"><?= esc($submittedItems) ?> submitted / <?= esc($totalItems) ?> total</div>
+                </div>
+              </div>
+            </div>
+            <div class="col-12 col-sm-6 col-xl-3">
+              <div class="summary-card h-100 shadow-sm border-0">
+                <div class="summary-card-body">
+                  <div class="summary-label text-uppercase">Submissions</div>
+                  <div class="summary-value"><?= esc($submittedItems) ?></div>
+                  <div class="summary-note"><?= esc($totalItems) ?> teachers tracked</div>
+                </div>
+              </div>
+            </div>
+            <div class="col-12 col-sm-6 col-xl-3">
+              <div class="summary-card h-100 shadow-sm border-0">
+                <div class="summary-card-body">
+                  <div class="summary-label text-uppercase">Flagged</div>
+                  <div class="summary-value"><?= esc($flaggedClasses) ?></div>
+                  <div class="summary-note">Sections under 50% complete</div>
+                </div>
+              </div>
             </div>
           </div>
-          <div>
+        </div>
-            <div class="text-uppercase small text-muted">Missing items</div>
+        <div class="col-lg-4">
-            <div class="h4 fw-semibold text-danger mb-0"><?= esc($missingItemsCount) ?></div>
+          <div class="card page-notifications-card h-100 shadow-sm">
-          </div>
+            <div class="card-header d-flex justify-content-between align-items-center">
-          <div class="text-muted small">
+              <span>Page notifications</span>
-            <?= esc($submittedItems) ?> submitted / <?= esc($totalItems) ?> total items
+              <span class="badge bg-light text-dark"><?= count($pageNotifications) ?> alerts</span>
+            </div>
+            <div class="card-body">
+              <ul class="page-notifications-list mb-0">
+                <?php foreach ($pageNotifications as $notification): ?>
+                  <li class="page-notification-item page-notification-<?= esc($notification['level']) ?>">
+                    <span class="notification-indicator" aria-hidden="true"></span>
+                    <span><?= esc($notification['message']) ?></span>
+                  </li>
+                <?php endforeach; ?>
+              </ul>
+            </div>
           </div>
         </div>
       </div>
       <form method="post" action="<?= site_url('administrator/teacher-submissions/notify') ?>">
         <?= csrf_field() ?>
-        <div class="table-responsive">
+        <?php if (empty($rows)): ?>
-          <table
+          <p class="text-center text-muted mt-4">No teacher-class assignments found for this term.</p>
-            class="table table-striped table-bordered m-0 align-middle teacher-submissions-table"
+        <?php else: ?>
-            data-no-mgmt-sticky
+          <div class="table-control-bar mb-3 d-flex flex-wrap align-items-center gap-3">
-            data-no-dt-fixedheader
+            <div class="d-flex flex-wrap align-items-center gap-3">
-          >
+              <label class="form-check form-check-inline mb-0">
-            <thead class="table-light">
+                <input class="form-check-input" type="checkbox" name="notify_midterm_score" value="1">
-              <tr>
+                <span class="form-check-label small">Include <?= esc($termExamLabel) ?> score</span>
-                <th>Class Section</th>
+              </label>
-                <th>Teacher</th>
+              <label class="form-check form-check-inline mb-0">
-                <th class="text-center">Midterm Score</th>
+                <input class="form-check-input" type="checkbox" name="notify_midterm_comment" value="1">
-                <th class="text-center">Midterm Comment</th>
+                <span class="form-check-label small">Include <?= esc($termExamLabel) ?> comment</span>
-                <th class="text-center">Participation</th>
+              </label>
-                <th class="text-center">PTAP Comment</th>
+              <label class="form-check form-check-inline mb-0">
-                <th class="text-center">Notifications</th>
+                <input class="form-check-input" type="checkbox" name="notify_participation" value="1">
-              </tr>
+                <span class="form-check-label small">Include participation</span>
-            </thead>
+              </label>
-            <tbody>
+              <label class="form-check form-check-inline mb-0">
-              <?php if (!empty($rows)): ?>
+                <input class="form-check-input" type="checkbox" name="notify_ptap_comment" value="1">
-                <?php foreach ($rows as $row): ?>
+                <span class="form-check-label small">Include PTAP comment</span>
-                  <tr>
+              </label>
-                    <td><?= esc($row['class_section']) ?></td>
+              <label class="form-check form-check-inline mb-0">
-                    <td>
+                <input class="form-check-input" type="checkbox" name="notify_class_progress" value="1">
-                      <?php if (!empty($row['teachers'])): ?>
+                <span class="form-check-label small">Include class progress</span>
-                        <?php foreach ($row['teachers'] as $teacher): ?>
+              </label>
-                          <div><?= esc($teacher['label'] ?? 'Teacher') ?></div>
+              <label class="form-check form-check-inline mb-0">
-                        <?php endforeach; ?>
+                <input class="form-check-input" type="checkbox" name="notify_exam_draft" value="1">
-                      <?php else: ?>
+                <span class="form-check-label small">Include exam draft</span>
-                        <span class="text-muted small">Unassigned</span>
+              </label>
-                      <?php endif; ?>
+              <label class="form-check form-check-inline mb-0">
-                    </td>
+                <input class="form-check-input" type="checkbox" name="homework_notify_all" value="1">
-                    <?php foreach ([
+                <span class="form-check-label small">Include homework</span>
-                      'midterm_score_status',
+              </label>
-                      'midterm_comment_status',
+            </div>
-                      'participation_status',
+            <div class="small text-muted">
-                      'ptap_comment_status'
+              <span class="text-uppercase" style="font-size:0.65rem;">Exam draft deadline</span><br>
-                    ] as $statusKey): ?>
+              <?php if ($examDraftDeadlineConfig !== ''): ?>
-                      <?php $status = $row[$statusKey] ?? ['label' => 'N/A', 'badge' => 'bg-secondary']; ?>
+                <?= esc($examDraftDeadlineConfig) ?>
-                      <td class="text-center">
+                <?php if ($examDraftDeadlineFormatted !== ''): ?>
-                        <span class="badge <?= esc($status['badge'] ?? 'bg-secondary') ?>">
+                  <span class="text-muted"> → <?= esc($examDraftDeadlineFormatted) ?></span>
-                          <?= esc($status['label'] ?? 'N/A') ?>
+                <?php endif; ?>
-                        </span>
-                        <?php if (!empty($status['detail'])): ?>
-                          <div class="small text-muted"><?= esc($status['detail']) ?></div>
-                        <?php endif; ?>
-                      </td>
-                    <?php endforeach; ?>
-                    <td>
-                      <?php if (!empty($row['teachers'])): ?>
-                        <?php $missingPayload = base64_encode(json_encode($row['missing_items'] ?? [])); ?>
-                        <?php foreach ($row['teachers'] as $teacher): ?>
-                          <?php $history = $notificationHistory[$row['class_section_id']][$teacher['id']] ?? []; ?>
-                          <?php $lastEntry = $history[0] ?? null; ?>
-                          <div class="mb-2">
-                            <label class="d-flex align-items-center gap-2 mb-1">
-                              <input
-                                type="checkbox"
-                                class="form-check-input"
-                                name="notify[<?= esc($row['class_section_id']) ?>][<?= esc($teacher['id']) ?>]"
-                                value="1"
-                              />
-                              <span class="fw-semibold"><?= esc($teacher['label'] ?? 'Teacher') ?></span>
-                            </label>
-                            <input
-                              type="hidden"
-                              name="missing_items[<?= esc($row['class_section_id']) ?>][<?= esc($teacher['id']) ?>]"
-                              value="<?= esc($missingPayload) ?>"
-                            />
-                            <div class="small text-muted">
-                              <?php if ($lastEntry !== null): ?>
-                                <span>
-                                  Last <?= esc($lastEntry['status'] === 'sent' ? 'sent' : 'attempted') ?> on <?= esc($lastEntry['sent_at_text'] ?: 'N/A') ?>
-                                  by <?= esc($lastEntry['admin_name'] ?? '') ?>
-                                </span>
-                                <?php if (count($history) > 1): ?>
-                                  <div>History: <?= count($history) ?> entries</div>
-                                <?php endif; ?>
-                              <?php else: ?>
-                                <span>No notifications sent yet</span>
-                              <?php endif; ?>
-                            </div>
-                          </div>
-                        <?php endforeach; ?>
-                      <?php else: ?>
-                        <span class="text-muted small">No teacher assigned</span>
-                      <?php endif; ?>
-                      <?php if (!empty($row['missing_items'])): ?>
-                        <div class="small text-danger mt-1">
-                          Outstanding: <?= esc(implode(', ', $row['missing_items'])) ?>
-                        </div>
-                      <?php endif; ?>
-                    </td>
-                  </tr>
-                <?php endforeach; ?>
               <?php else: ?>
-                <tr>
+                <span class="text-warning">Not set</span>
-                  <td colspan="7" class="text-center">No teacher-class assignments found for this term.</td>
-                </tr>
               <?php endif; ?>
-            </tbody>
+            </div>
-          </table>
+          </div>
-        </div>
+          <div class="accordion" id="teacherSubmissionAccordion">
-        <div class="mt-3 text-end">
+            <?php foreach ($groupedRows as $sectionKey => $sectionRows): ?>
-          <button type="submit" class="btn btn-primary" <?= empty($rows) ? 'disabled' : '' ?>>
+              <?php
-            Send notifications to selected teachers
+                $firstRow = $sectionRows[0] ?? [];
-          </button>
+                $sectionLabel = esc($firstRow['class_section'] ?? 'Class section');
-        </div>
+                $collapseId = 'teacherSectionCollapse_' . md5($sectionKey);
+                $badgeStatus = count($sectionRows) === 1 ? 'submission' : 'submissions';
+              ?>
+              <div class="accordion-item">
+                <h2 class="accordion-header" id="heading_<?= esc($collapseId) ?>">
+                  <button
+                    class="accordion-button collapsed d-flex justify-content-between align-items-center"
+                    type="button"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#<?= esc($collapseId) ?>"
+                    aria-expanded="false"
+                    aria-controls="<?= esc($collapseId) ?>"
+                  >
+                    <div>
+                      <strong><?= $sectionLabel ?></strong>
+                      <div class="small text-muted"><?= esc(count($sectionRows)) ?> <?= $badgeStatus ?></div>
+                    </div>
+                    <span class="badge bg-primary-subtle text-primary"><?= count($sectionRows) ?> rows</span>
+                  </button>
+                </h2>
+                <div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="heading_<?= esc($collapseId) ?>">
+                  <div class="accordion-body p-0">
+                    <div class="table-responsive">
+                      <table
+                        class="table table-striped table-bordered m-0 align-middle teacher-submissions-table mb-0"
+                        data-no-mgmt-sticky
+                        data-no-dt-fixedheader
+                      >
+                        <thead class="table-light">
+                          <tr>
+                            <th>Class-Section</th>
+                            <th>Teachers Name</th>
+                            <th class="text-center"><?= esc($termExamLabel) ?> Score</th>
+                            <th class="text-center"><?= esc($termExamLabel) ?> Comment</th>
+                            <th class="text-center">Participation</th>
+                            <th class="text-center">PTAP Comment</th>
+                            <th class="text-center">Class Progress</th>
+                            <th class="text-center">Exam Draft</th>
+                            <th class="text-center">Homework</th>
+                            <th class="text-center">Notifications</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          <?php foreach ($sectionRows as $row): ?>
+                            <tr>
+                              <td><?= esc($row['class_section']) ?></td>
+                              <td>
+                                <?php if (!empty($row['teachers'])): ?>
+                                  <?php foreach ($row['teachers'] as $teacher): ?>
+                                    <div><?= esc($teacher['label'] ?? 'Teacher') ?></div>
+                                  <?php endforeach; ?>
+                                <?php else: ?>
+                                  <span class="text-muted small">Unassigned</span>
+                                <?php endif; ?>
+                              </td>
+                              <?php foreach ([
+                                'midterm_score_status',
+                                'midterm_comment_status',
+                                'participation_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">
+                                  <span class="badge <?= esc($status['badge'] ?? 'bg-secondary') ?>">
+                                    <?= esc($status['label'] ?? 'N/A') ?>
+                                  </span>
+                                  <?php if (!empty($status['detail'])): ?>
+                                    <div class="small text-muted"><?= esc($status['detail']) ?></div>
+                                  <?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'] ?? [])); ?>
+                                  <?php foreach ($row['teachers'] as $teacher): ?>
+                                    <?php $history = $notificationHistory[$row['class_section_id']][$teacher['id']] ?? []; ?>
+                                    <?php $lastEntry = $history[0] ?? null; ?>
+                                    <div class="mb-2">
+                                      <label class="d-flex align-items-center gap-2 mb-1">
+                                        <input
+                                          type="checkbox"
+                                          class="form-check-input"
+                                          name="notify[<?= esc($row['class_section_id']) ?>][<?= esc($teacher['id']) ?>]"
+                                          value="1"
+                                        />
+                                        <span class="fw-semibold"><?= esc($teacher['label'] ?? 'Teacher') ?></span>
+                                      </label>
+                                      <input
+                                        type="hidden"
+                                        name="missing_items[<?= esc($row['class_section_id']) ?>][<?= esc($teacher['id']) ?>]"
+                                        value="<?= esc($missingPayload) ?>"
+                                      />
+                                      <div class="small text-muted">
+                                        <?php if ($lastEntry !== null): ?>
+                                          <span>
+                                            Last <?= esc($lastEntry['status'] === 'sent' ? 'sent' : 'attempted') ?> on <?= esc($lastEntry['sent_at_text'] ?: 'N/A') ?>
+                                            by <?= esc($lastEntry['admin_name'] ?? '') ?>
+                                          </span>
+                                          <?php if (count($history) > 1): ?>
+                                            <div>History: <?= count($history) ?> entries</div>
+                                          <?php endif; ?>
+                                        <?php else: ?>
+                                          <span>No notifications sent yet</span>
+                                        <?php endif; ?>
+                                      </div>
+                                    </div>
+                                  <?php endforeach; ?>
+                                <?php else: ?>
+                                  <span class="text-muted small">No teacher assigned</span>
+                                <?php endif; ?>
+                                <?php if (!empty($row['missing_items'])): ?>
+                                  <div class="small text-danger mt-1">
+                                    Outstanding: <?= esc(implode(', ', $row['missing_items'])) ?>
+                                  </div>
+                                <?php endif; ?>
+                              </td>
+                            </tr>
+                          <?php endforeach; ?>
+                        </tbody>
+                      </table>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            <?php endforeach; ?>
+          </div>
+          <div class="mt-3 text-end">
+            <button type="submit" class="btn btn-primary">
+              Send notifications to selected teachers
+            </button>
+          </div>
+        <?php endif; ?>
       </form>
     </div>
   </div>
@@ -186,5 +375,77 @@
   .card-body .table-responsive .teacher-submissions-table td {
     white-space: normal;
   }
+
+  .summary-card {
+    background: var(--bs-white);
+    border-radius: 0.75rem;
+  }
+  .summary-card-body {
+    padding: 1.25rem;
+  }
+  .summary-label {
+    font-size: 0.7rem;
+    letter-spacing: 0.08em;
+    color: #6c757d;
+  }
+  .summary-value {
+    font-size: 1.75rem;
+    font-weight: 600;
+    margin-top: 0.35rem;
+  }
+  .summary-note {
+    font-size: 0.85rem;
+    color: #6c757d;
+  }
+  .summary-progress {
+    height: 6px;
+    margin-top: 0.65rem;
+  }
+  .summary-progress .progress-bar {
+    background: var(--bs-primary);
+  }
+  .page-notifications-card {
+    border-radius: 0.75rem;
+  }
+  .page-notifications-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+  }
+  .page-notification-item {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    font-size: 0.85rem;
+  }
+  .page-notification-info .notification-indicator {
+    background: #0dcaf0;
+  }
+  .page-notification-warning .notification-indicator {
+    background: #ffc107;
+  }
+  .page-notification-danger .notification-indicator {
+    background: #dc3545;
+  }
+  .notification-indicator {
+    width: 0.75rem;
+    height: 0.75rem;
+    border-radius: 50%;
+    display: inline-block;
+  }
+  .table-control-bar {
+    border: 1px solid rgba(0,0,0,0.08);
+    border-radius: 0.75rem;
+    padding: 0.75rem 1rem;
+    background: #f8f9fa;
+  }
+  .table-control-bar .form-check-label {
+    font-size: 0.8rem;
+    margin-left: 0.15rem;
+    text-transform: none;
+  }
 </style>
 <?= $this->endSection() ?>

app/Views/flags/flags_management.php

@@ -107,7 +107,10 @@
                         <td><?= esc($flag['flag_state']) ?></td>
 
                         <td>
-                            <form id="flagForm_<?= $flag['id'] ?>" method="post">
+                            <form id="flagForm_<?= $flag['id'] ?>" method="post"
+                                action="<?= site_url('flags/update_state/' . (int) $flag['id']) ?>"
+                                data-action-close="<?= site_url('flags/closeFlag/' . (int) $flag['id']) ?>"
+                                data-action-cancel="<?= site_url('flags/cancelFlag/' . (int) $flag['id']) ?>">
                                 <?= csrf_field() ?>
 
                                 <select name="flag_state" class="form-select" id="flag_state_<?= $flag['id'] ?>"
@@ -347,9 +350,9 @@
 
             // Set form action based on flag state
             if (flagState === "Closed") {
-                form.action = `/flags/closeFlag/${currentFlagId}`;
+                form.action = form.dataset.actionClose || form.action;
             } else if (flagState === "Canceled") {
-                form.action = `/flags/cancelFlag/${currentFlagId}`;
+                form.action = form.dataset.actionCancel || form.action;
             }
 
             console.log("Description set for form submission:", description); // For debugging
@@ -357,6 +360,10 @@
 
             const modal = bootstrap.Modal.getInstance(document.getElementById('descriptionModal'));
             modal.hide();
+
+            if (form && form.action) {
+                form.submit();
+            }
         }
 
         document.getElementById('flagStateDescription').addEventListener('input', function() {

app/Views/grading/below_sixty.php

@@ -93,7 +93,7 @@
                                             <option value="Open" <?= ($row['status'] ?? 'Open') === 'Open' ? 'selected' : '' ?>>Open</option>
                                             <option value="Closed" <?= ($row['status'] ?? '') === 'Closed' ? 'selected' : '' ?>>Closed</option>
                                         </select>
-                                        <input type="text" name="note" class="form-control form-control-sm" style="width: 140px;" placeholder="Note (optional)">
+                                        <input type="text" name="note" class="form-control form-control-sm" style="width: 140px;" placeholder="Note (optional)" value="<?= esc((string)($row['note'] ?? '')) ?>">
                                         <button type="submit" class="btn btn-sm btn-outline-secondary">Update</button>
                                     </form>
                                 </td>

app/Views/grading/homework_tracking.php

@@ -70,7 +70,8 @@ $todayYmd = local_date(utc_now(), 'Y-m-d');
             <tr>
               <th class="sticky-col">Grade</th>
               <th class="sticky-col-2" style="min-width:300px; width:300px;">Teacher &amp; TAs</th>
-              <?php foreach (($headerDates ?? []) as $i => $label): $ymd = $sundays[$i] ?? ''; ?>
+              <th class="text-center">HW Submitted</th>
+                <?php foreach (($headerDates ?? []) as $i => $label): $ymd = $sundays[$i] ?? ''; ?>
                 <?php $isCal = !empty($eventDays[$ymd]); $isFuture = ($ymd > $todayYmd); ?>
                 <th class="text-center <?= $isCal ? 'bg-warning' : ($isFuture ? 'bg-future' : '') ?>" title="<?= esc($ymd) ?>"><?= esc($label) ?></th>
               <?php endforeach; ?>
@@ -100,6 +101,9 @@ $todayYmd = local_date(utc_now(), 'Y-m-d');
                   <?php endif; ?>
                   <div><strong>TA<?= count($taNames) !== 1 ? 's' : '' ?>:</strong> <?= !empty($taNames) ? esc(implode(', ', $taNames)) : '—' ?></div>
                 </td>
+                <td class="text-center">
+                  <?= (int)($homeworkSubmissionCounts[$csid] ?? 0) ?>
+                </td>
                 <?php foreach (($sundays ?? []) as $ymd): ?>
                   <?php if (!empty($eventDays[$ymd])): ?>
                     <td class="bg-warning text-center">—</td>

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)): ?>
+  <?php if (! empty($students)): ?>
-    <div class="alert alert-secondary">No reports submitted yet.</div>
+    <div class="accordion" id="parentProgressAccordion">
-  <?php else: ?>
+      <?php foreach ($students as $index => $student): ?>
-    <div class="card shadow-sm">
+        <?php
-      <div class="table-responsive">
+          $studentId = (int) ($student['student_id'] ?? 0);
-        <table class="table table-hover align-middle mb-0">
+          $studentName = trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? ''));
-          <thead class="table-light">
+          $studentName = $studentName !== '' ? $studentName : 'Student';
-            <tr>
+          $className = $student['class_section_name'] ?? '';
-              <th>Week</th>
+          $collapseId = 'student-progress-' . $studentId;
-              <th>Subjects</th>
+          $headingId = 'student-progress-heading-' . $studentId;
-              <th class="text-end">Details</th>
+          $reportGroups = $studentReportGroups[$studentId] ?? [];
-            </tr>
+        ?>
-          </thead>
+        <div class="accordion-item">
-          <tbody>
+          <h2 class="accordion-header" id="<?= esc($headingId) ?>">
-            <?php foreach ($reportGroups as $group): ?>
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<?= esc($collapseId) ?>" aria-expanded="false" aria-controls="<?= esc($collapseId) ?>">
-              <?php
+              <div class="d-flex flex-column flex-md-row align-items-md-center gap-1 gap-md-3">
-                $start = $group['week_start'] ?? '';
+                <span class="fw-semibold"><?= esc($studentName) ?></span>
-                $end = $group['week_end'] ?? '';
+                <?php if ($className !== ''): ?>
-                $weekLabel = $start ? date('M d, Y', strtotime($start)) : '-';
+                  <span class="text-muted small">Class: <?= esc($className) ?></span>
-                if ($end) {
+                <?php endif; ?>
-                  $weekLabel .= ' – ' . date('M d, Y', strtotime($end));
+              </div>
-                }
+            </button>
-                $reports = $group['reports'] ?? [];
+          </h2>
-                $exampleReport = $reports ? reset($reports) : null;
+          <div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="<?= esc($headingId) ?>" data-bs-parent="#parentProgressAccordion">
-              ?>
+            <div class="accordion-body">
-              <tr>
+              <?php if (empty($reportGroups)): ?>
-                <td>
+                <div class="alert alert-secondary mb-0">No reports submitted yet.</div>
-                  <div class="fw-semibold"><?= esc($weekLabel) ?></div>
+              <?php else: ?>
-                  <?php if (!empty($group['class_section_name'])): ?>
+                <div class="table-responsive">
-                    <div class="text-muted small">Class: <?= esc($group['class_section_name']) ?></div>
+                  <table class="table table-hover align-middle mb-0">
-                  <?php endif; ?>
+                    <thead class="table-light">
-                </td>
+                      <tr>
-                <td>
+                        <th>Week</th>
-                  <div class="d-flex flex-column gap-2">
+                        <th>Subjects</th>
-                    <?php foreach ($subjectSections as $slug => $section): ?>
+                        <th class="text-end">Details</th>
-                      <?php
+                      </tr>
-                        $subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
+                    </thead>
-                        $report = $reports[$subjectName] ?? null;
+                    <tbody>
-                        $statusLabel = $report ? ($report['status_label'] ?? 'Unknown') : 'No submission';
+                      <?php foreach ($reportGroups as $group): ?>
-                        $badgeClass = $report ? 'bg-secondary' : 'bg-light text-muted';
+                        <?php
-                      ?>
+                          $start = $group['week_start'] ?? '';
-                      <div class="border rounded-3 p-2">
+                          $end = $group['week_end'] ?? '';
-                        <div class="d-flex justify-content-between align-items-center">
+                          $weekLabel = $start ? date('M d, Y', strtotime($start)) : '-';
-                          <strong class="small mb-0"><?= esc($section['label'] ?? $subjectName) ?></strong>
+                          if ($end) {
-                          <span class="badge <?= esc($badgeClass) ?>"><?= esc($statusLabel) ?></span>
+                            $weekLabel .= ' – ' . date('M d, Y', strtotime($end));
-                        </div>
+                          }
-                        <div class="small text-muted">
+                          $reports = $group['reports'] ?? [];
-                          <?= $report ? esc($report['unit_title'] ?: '-') : 'No submission' ?>
+                          $exampleReport = $reports ? reset($reports) : null;
-                        </div>
+                        ?>
-                      </div>
+                        <tr>
-                    <?php endforeach; ?>
+                          <td>
-                  </div>
+                            <div class="fw-semibold"><?= esc($weekLabel) ?></div>
-                </td>
+                          </td>
-                <td class="text-end">
+                          <td>
-                  <?php if ($exampleReport): ?>
+                            <div class="d-flex flex-column gap-2">
-                    <a href="<?= base_url('parent/progress/view/' . $exampleReport['id']) ?>" class="btn btn-sm btn-outline-primary">View Weekly Details</a>
+                              <?php foreach ($subjectSections as $slug => $section): ?>
-                  <?php endif; ?>
+                                <?php
-                </td>
+                                  $subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
-              </tr>
+                                  $report = $reports[$subjectName] ?? null;
-            <?php endforeach; ?>
+                                  $statusLabel = $report ? ($report['status_label'] ?? 'Unknown') : 'No submission';
-          </tbody>
+                                  $badgeClass = $report ? 'bg-secondary' : 'bg-light text-muted';
-        </table>
+                                ?>
-      </div>
+                                <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/parent/event_participation.php

@@ -42,9 +42,6 @@
                         <?php endif; ?>
                     </div>
 
-                    <!-- Event Description -->
-                    <p class="card-text"><?= esc($event['description']) ?></p>
-
                     <!-- Participation Table -->
                     <form method="post" action="<?= site_url('parent/updateParticipation') ?>">
                         <?= csrf_field() ?>
@@ -53,11 +50,13 @@
                         <div class="table-responsive">
                             <table class="table table-sm table-bordered">
                                 <thead class="table-light">
-                                    <tr>
+                            <tr>
-                                        <th>Student First Name</th>
+                                <th>Student First Name</th>
-                                        <th>Student Last Name</th>
+                                <th>Student Last Name</th>
-                                        <th class="text-center">Participate</th>
+                                <th class="text-center">Participate</th>
-                                    </tr>
+                                <th>Description</th>
+                                <th>Event Fees</th>
+                            </tr>
                                 </thead>
                                 <tbody>
                                     <?php foreach ($yourStudents as $student): ?>
@@ -84,6 +83,8 @@
                                                     </div>
                                                 </div>
                                             </td>
+                                            <td><?= esc($event['description'] ?: 'No description') ?></td>
+                                            <td class="text-nowrap">$<?= esc(number_format((float) ($event['amount'] ?? 0), 2)) ?></td>
                                         </tr>
                                     <?php endforeach; ?>
                                 </tbody>

app/Views/payment/financial_report.php

@@ -54,6 +54,11 @@
     <button class="btn btn-primary" onclick="window.print()">Print Report</button>
     <a id="summaryReportLink" href="<?= base_url('financial-report/financialReportSummary') ?>" class="btn btn-info">Display Summary Report</a>
   </div>
+  <?php if (isset($eventFeesTotal)): ?>
+    <div class="alert alert-info mb-3">
+      <strong>Event fees total:</strong> $<?= number_format((float)$eventFeesTotal, 2) ?>
+    </div>
+  <?php endif; ?>
   <div class="table-responsive">
     <table id="invoicesTable" class="table table-bordered table-striped align-middle w-100">
       <thead>

app/Views/payment/financial_report_summary.php

@@ -32,6 +32,7 @@
   </thead>
   <tbody id="summaryBody">
     <tr><td>Total Charges</td><td class="text-right" id="sumCharges">$0.00</td></tr>
+    <tr><td>Event Fees</td><td class="text-right" id="sumEventFees">$0.00</td></tr>
     <tr><td>Total Extra Charges</td><td class="text-right" id="sumExtraCharges">$0.00</td></tr>
     <tr><td>Total Discounts</td><td class="text-right" id="sumDiscounts">$0.00</td></tr>
     <tr><td>Total Refunds</td><td class="text-right" id="sumRefunds">$0.00</td></tr>
@@ -98,6 +99,9 @@ function loadSummary(){
       if (!d || d.ok !== true) return;
       document.getElementById('summaryPeriod').textContent = 'Report for School Year: ' + (d.schoolYear||'');
       document.getElementById('sumCharges').textContent    = fmt(d.totalCharges);
+      if (document.getElementById('sumEventFees')) {
+        document.getElementById('sumEventFees').textContent = fmt(d.totalEventFees || 0);
+      }
       if (document.getElementById('sumExtraCharges')) {
         document.getElementById('sumExtraCharges').textContent = fmt(d.totalExtraCharges || 0);
       }
@@ -127,10 +131,10 @@ function renderCharts(d){
   const summaryCtx = document.getElementById('summaryChart').getContext('2d');
   window._summaryChart = new Chart(summaryCtx, {
     type: 'bar',
-    data: { labels: ['Charges','Paid','Unpaid','Discounts','Refunds','Expenses','Reimbursements','Net'],
+    data: { labels: ['Charges','Event Fees','Paid','Unpaid','Discounts','Refunds','Expenses','Reimbursements','Net'],
       datasets: [{ label:'Amount (USD)', data:[
-        d.totalCharges||0, d.totalPaid||0, d.totalUnpaid||0, d.totalDiscounts||0, d.totalRefunds||0, d.totalExpenses||0, d.totalReimbursements||0, d.netAmount||0
+        d.totalCharges||0, d.totalEventFees||0, d.totalPaid||0, d.totalUnpaid||0, d.totalDiscounts||0, d.totalRefunds||0, d.totalExpenses||0, d.totalReimbursements||0, d.netAmount||0
-      ], backgroundColor: ['#007bff','#28a745','#ffc107','#17a2b8','#ffc107','#dc3545','#6f42c1','#20c997']}] },
+      ], backgroundColor: ['#007bff','#6610f2','#28a745','#ffc107','#17a2b8','#ffc107','#dc3545','#6f42c1','#20c997']}] },
     options: { responsive:true, scales:{ y:{ beginAtZero:true }}}
   });
 
@@ -177,11 +181,12 @@ document.addEventListener("DOMContentLoaded", function() {
     window._summaryChart = new Chart(summaryCtx, {
         type: 'bar',
         data: {
-            labels: ['Charges', 'Paid', 'Unpaid', 'Discounts', 'Refunds', 'Expenses', 'Reimbursements', 'Net'],
+            labels: ['Charges', 'Event Fees', 'Paid', 'Unpaid', 'Discounts', 'Refunds', 'Expenses', 'Reimbursements', 'Net'],
             datasets: [{
                 label: 'Amount (USD)',
                 data: [
                     <?= (float)$totalCharges ?>,
+                    <?= (float)($totalEventFees ?? 0) ?>,
                     <?= (float)$totalPaid ?>,
                     <?= (float)$totalUnpaid ?>,
                     <?= (float)$totalDiscounts ?>,
@@ -191,7 +196,7 @@ document.addEventListener("DOMContentLoaded", function() {
                     <?= (float)$netAmount ?>
                 ],
                 backgroundColor: [
-                    '#007bff', '#28a745', '#ffc107', '#17a2b8', '#ffc107', '#dc3545', '#6f42c1', '#20c997'
+                    '#007bff', '#6610f2', '#28a745', '#ffc107', '#17a2b8', '#ffc107', '#dc3545', '#6f42c1', '#20c997'
                 ]
             }]
         },

app/Views/payment/unpaid_parents.php

@@ -47,6 +47,7 @@
           <button class="btn btn-primary btn-sm" type="submit">Send Reminders (All)</button>
         </form>
       </div>
+      <?php $sumEventFees = 0.0; ?>
       <div class="table-responsive">
         <table id="unpaidTable" class="table table-sm align-middle no-mgmt-sticky" data-no-mgmt-sticky>
           <thead>
@@ -54,6 +55,7 @@
               <th>Parent</th>
               <th class="text-center">Nbr of Installements</th>
               <th>Type</th>
+              <th class="text-end">Event Fees</th>
               <th class="text-end">Invoice Amount</th>
               <th class="text-end">Applied Discount</th>
               <th class="text-end">Paid Amount</th>
@@ -67,7 +69,7 @@
           </thead>
           <tbody>
             <?php if (empty($rows)): ?>
-              <tr><td colspan="12" class="text-center text-muted py-4">No parents with outstanding balance.</td></tr>
+              <tr><td colspan="13" class="text-center text-muted py-4">No parents with outstanding balance.</td></tr>
             <?php else: ?>
               <?php
                 $sumInvoice = 0.0;
@@ -86,18 +88,20 @@
                   </td>
                   <td class="text-center"><?= (int)($r['payment_count'] ?? 0) ?></td>
                   <td>
-                    <?php if (($r['type'] ?? '') === 'no_payment'): ?>
+                  <?php if (($r['type'] ?? '') === 'no_payment'): ?>
-                      <span class="badge bg-danger badge-type">no payment</span>
+                    <span class="badge bg-danger badge-type">no payment</span>
-                    <?php else: ?>
+                  <?php else: ?>
-                      <span class="badge bg-success badge-type">installment</span>
+                    <span class="badge bg-success badge-type">installment</span>
-                    <?php endif; ?>
+                  <?php endif; ?>
-                  </td>
+                </td>
-                  <?php $sumInvoice += (float)($r['total_invoice'] ?? 0); ?>
+                <?php $sumInvoice += (float)($r['total_invoice'] ?? 0); ?>
-                  <?php $sumPaid    += (float)($r['total_paid']    ?? 0); ?>
+                <?php $sumEventFees += (float)($r['event_fees'] ?? 0); ?>
+                <?php $sumPaid    += (float)($r['total_paid']    ?? 0); ?>
                   <?php $sumDisc    += (float)($r['total_discount'] ?? 0); ?>
                   <?php $sumInstAmt += (float)($r['installment_amount'] ?? 0); ?>
                   <?php $sumBal     += (float)($r['total_balance'] ?? 0); ?>
-                  <td class="text-end">$<?= number_format((float)($r['total_invoice'] ?? 0), 2) ?></td>
+                <td class="text-end">$<?= number_format((float)($r['event_fees'] ?? 0), 2) ?></td>
+                <td class="text-end">$<?= number_format((float)($r['total_invoice'] ?? 0), 2) ?></td>
                   <td class="text-end text-success">-$<?= number_format((float)($r['total_discount'] ?? 0), 2) ?></td>
                   <td class="text-end">$<?= number_format((float)($r['total_paid'] ?? 0), 2) ?></td>
                   <td class="text-center"><?= (int)($r['remaining_installments'] ?? 0) ?></td>
@@ -129,6 +133,7 @@
           <tfoot>
             <tr>
               <th colspan="3" class="text-end">Totals:</th>
+              <th class="text-end">$<?= number_format($sumEventFees, 2) ?></th>
               <th class="text-end">$<?= number_format($sumInvoice, 2) ?></th>
               <th class="text-end text-success">-$<?= number_format($sumDisc, 2) ?></th>
               <th class="text-end">$<?= number_format($sumPaid, 2) ?></th>

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');
+                row.appendChild(renderNameCell(user));
-                nameCell.textContent = `${user.firstname ?? ''} ${user.lastname ?? ''}`.trim();
-                row.appendChild(nameCell);
 
                 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,16 +68,17 @@
     </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>
+                <select id="weekStartSelect" name="week_start" class="form-select form-select-sm" required <?= $isEdit ? 'data-original-week="' . esc($weekStartSelected) . '"' : '' ?>>
                 <option value="">Select week</option>
                 <?php foreach ($sundayOptions as $sunday): ?>
                   <?php
@@ -96,8 +111,10 @@
       ?>
       <?php foreach ($subjectSections as $slug => $section): ?>
         <?php
-          $unitValues = old("unit_$slug") ?? [];
+          $unitValues = old("unit_$slug") ?? ($existingReports[$slug]['unit_values'] ?? []);
-          $chapterValues = old("chapter_$slug") ?? [];
+          $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">
@@ -166,6 +183,14 @@
                         </div>
                         <div class="form-text small text-muted">Add a custom Surah or Arabic target.</div>
                       </div>
+                    <?php elseif ($slug === 'islamic'): ?>
+                      <div class="px-2 py-2 border-top">
+                        <div class="input-group input-group-sm">
+                          <input type="text" class="form-control" placeholder="Type subject or topic" data-custom-input data-subject="<?= esc($slug) ?>">
+                          <button type="button" class="btn btn-outline-secondary" data-custom-entry data-subject="<?= esc($slug) ?>">Add</button>
+                        </div>
+                        <div class="form-text small text-muted">Add a subject or unit not listed above (e.g. Seerah, Fiqh, Akhlaq).</div>
+                      </div>
                     <?php endif; ?>
                   </div>
                 </div>
@@ -188,11 +213,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 +232,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 +249,78 @@
 <?= $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 originalWeek = weekStartSelect?.dataset.originalWeek || '';
+      if (originalWeek && weekStartSelect && weekStartSelect.value && weekStartSelect.value !== originalWeek) {
+        const ok = confirm('A progress report already exists for the original week. Change the week and override any existing report for the new date?');
+        if (!ok) {
+          event.preventDefault();
+          event.stopPropagation();
+          return;
+        }
+        const confirmInput = document.getElementById('confirmOverwriteInput');
+        if (confirmInput) {
+          confirmInput.value = '1';
+        }
+      }
+      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();
@@ -302,6 +393,9 @@
     if (isQuran) {
       return isCustom ? 'Custom' : 'Surah';
     }
+    if (subject === 'islamic' && isCustom) {
+      return 'Custom';
+    }
     return parts.join(' – ');
   };
 
@@ -362,12 +456,42 @@
       if (!input) return;
       const customValue = input.value.trim();
       if (customValue === '') return;
-      const unitValue = buildUnitDisplay(subject, '', '', { isQuran: subject === 'quran', isCustom: true });
+      const unitValue = buildUnitDisplay(subject, '', '', {
+        isQuran: subject === 'quran',
+        isCustom: subject === 'quran' || subject === 'islamic',
+      });
       appendUnitChapterRow(subject, unitValue, customValue);
       input.value = '';
       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/drafts.php

@@ -1,34 +1,307 @@
 <?= $this->extend('layout/main_layout') ?>
 <?= $this->section('content') ?>
-<div class="container-xxl py-5">
+<?php
+$statusBadges = $statusBadges ?? [];
+$drafts = $drafts ?? [];
+$legacyExams = $legacyExams ?? [];
+$assignments = $assignments ?? [];
+$selectedClassSection = $selectedClassSection ?? 0;
+$examTypes = $examTypes ?? [];
+$schoolYear = $schoolYear ?? '';
+$semester = $semester ?? '';
+$maxUploadBytes = $maxUploadBytes ?? (12 * 1024 * 1024);
+?>
+<style>
+  .teacher-drafts-page,
+  .teacher-drafts-page * {
+    font-family: Arial, sans-serif !important;
+  }
+  .teacher-drafts-table {
+    table-layout: auto;
+    width: max-content;
+  }
+  .teacher-drafts-table th {
+    min-width: 0;
+  }
+  .teacher-drafts-table td {
+    max-width: none;
+  }
+  .teacher-drafts-table th {
+    white-space: nowrap;
+  }
+  .teacher-drafts-table td.title-cell {
+    white-space: nowrap;
+  }
+</style>
+<div class="container-xxl py-5 teacher-drafts-page">
     <div class="container">
-        <h1>Drafts</h1>
+        <div class="d-flex flex-wrap justify-content-between align-items-center mb-4">
-        <?php if (!empty($draftMessages)): ?>
+            <h1 class="mb-0">Exam drafts</h1>
+            <?php if (!empty($legacyExams)): ?>
+                <button type="button" class="btn btn-sm btn-outline-secondary" id="legacyToggle">Legacy Exams</button>
+            <?php endif; ?>
+        </div>
+
+        <?php if (session()->getFlashdata('success')): ?>
+            <div class="alert alert-success"><?= esc(session()->getFlashdata('success')) ?></div>
+        <?php endif; ?>
+        <?php if (session()->getFlashdata('error')): ?>
+            <div class="alert alert-danger"><?= esc(session()->getFlashdata('error')) ?></div>
+        <?php endif; ?>
+
+        <div class="card mb-4">
+            <div class="card-body">
+                <?= form_open_multipart(base_url('teacher/exam-drafts'), ['class' => 'row g-3', 'id' => 'examDraftForm']) ?>
+                    <?= csrf_field() ?>
+                    <div class="col-md-6">
+                        <label class="form-label" for="exam_type">Exam type <span class="text-danger">*</span></label>
+                        <select name="exam_type" id="exam_type" class="form-select" required>
+                            <option value="">— Select —</option>
+                            <?php foreach ($examTypes as $t): ?>
+                                <option value="<?= esc($t) ?>" <?= old('exam_type') === $t ? 'selected' : '' ?>><?= esc($t) ?></option>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
+                    <div class="col-8">
+                        <label class="form-label" for="author_comment">Author comment</label>
+                        <textarea name="author_comment" id="author_comment" class="form-control" rows="2" placeholder="Optional note for reviewers"><?= esc(old('author_comment') ?? '') ?></textarea>
+                    </div>
+                    <div class="col-md-8">
+                        <label class="form-label" for="draft_file">File (Word) <span class="text-danger">*</span></label>
+                        <input type="file" name="draft_file" id="draft_file" class="form-control" accept=".doc,.docx" required>
+                        <div class="form-text">Max <?= esc(number_format($maxUploadBytes / 1048576, 1)) ?> MB.</div>
+                    </div>
+                    <div class="col-12 d-flex flex-wrap gap-2">
+                        <button type="submit" class="btn btn-primary">Submit for review</button>
+                    </div>
+                <?= form_close() ?>
+                <?php if ($schoolYear !== '' || $semester !== ''): ?>
+                    <p class="text-muted small mb-0 mt-2">School year: <?= esc($schoolYear) ?> · Semester: <?= esc($semester) ?></p>
+                <?php endif; ?>
+            </div>
+        </div>
+
+        <?php
+        $renderBadge = static function (string $status, array $badges): string {
+            $b = $badges[$status] ?? ['label' => $status, 'class' => 'bg-secondary text-white'];
+            $style = !empty($b['style']) ? ' style="' . esc($b['style']) . '"' : '';
+            return '<span class="badge ' . esc($b['class']) . ' js-status-badge" data-status="' . esc($status) . '"' . $style . '>' . esc($b['label']) . '</span>';
+        };
+        ?>
+
+        <h2 class="h5 mb-3">Your submissions</h2>
+        <?php if (!empty($drafts)): ?>
             <div class="table-responsive">
-                <table class="table table-striped">
+                <table class="table table-striped align-middle teacher-drafts-table">
                     <thead>
                         <tr>
-                            <th>Subject</th>
+                            <th>Class</th>
-                            <th>Date</th>
+                            <th>Title / type</th>
-                            <th>Actions</th>
+                            <th>Ver.</th>
+                            <th>Status</th>
+                            <th>File link</th>
+                            <th>Reviewer comment</th>
+                            <th>Last Update</th>
                         </tr>
                     </thead>
                     <tbody>
-                        <?php foreach ($draftMessages as $message): ?>
+                        <?php foreach ($drafts as $d): ?>
-                            <tr>
+                            <?php
-                                <td><?= esc($message['subject']) ?></td>
+                            $st = strtolower((string) ($d['status'] ?? ''));
-                                <td><?= esc(!empty($message['created_at']) ? local_datetime($message['created_at'], 'm-d-Y H:i') : '') ?></td>
+                            $badgeHtml = $renderBadge($st, $statusBadges);
+                            ?>
+                            <tr data-draft-id="<?= (int) ($d['id'] ?? 0) ?>">
+                                <td><?= esc($d['class_section_name'] ?? '') ?></td>
+                                <td class="title-cell"><?= esc($d['draft_title'] ?? $d['exam_type'] ?? '') ?></td>
+                                <td><?= esc((string) ($d['version'] ?? '')) ?></td>
+                                <td><?= $badgeHtml ?></td>
                                 <td>
-                                    <a href="<?= base_url('messages/edit/' . $message['id']) ?>">Edit</a> |
+                                    <?php $revNumber = max(1, (int) ($d['version'] ?? 1)); ?>
-                                    <a href="<?= base_url('messages/delete/' . $message['id']) ?>">Delete</a>
+                                    <?php if (!empty($d['teacher_file'])): ?>
+                                        <div>
+                                            <a href="<?= base_url('exam-drafts/files/teacher/' . $d['teacher_file']) ?>" target="_blank" rel="noopener">
+                                                <?= esc('Ver' . $revNumber . ' ' . ($d['teacher_filename'] ?? 'Submitted draft')) ?>
+                                            </a>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if (!empty($d['final_file'])): ?>
+                                        <div class="mt-1">
+                                            <a href="<?= base_url('exam-drafts/files/final/' . $d['final_file']) ?>" target="_blank" rel="noopener" class="link-success small">
+                                                <?= esc('Final ' . ($d['final_filename'] ?? 'Final draft')) ?>
+                                            </a>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if (!empty($d['review_files'])): ?>
+                                        <div class="mt-1">
+                                            <?php
+                                                $reviewLinks = [];
+                                                foreach ($d['review_files'] as $rf) {
+                                                    $rev = max(1, (int) ($rf['review_revision'] ?? 1));
+                                                    $name = $rf['final_filename'] ?? 'Review file';
+                                                    $file = $rf['final_file'] ?? '';
+                                                    if ($file !== '') {
+                                                        $reviewLinks[] = '<a href="' . esc(base_url('exam-drafts/files/final/' . $file)) . '" target="_blank" rel="noopener" class="link-success small">' . esc('Ver' . $revNumber . '_' . $rev . ' ' . $name) . '</a>';
+                                                    }
+                                                }
+                                            ?>
+                                            <?= !empty($reviewLinks) ? implode(' | ', $reviewLinks) : '' ?>
+                                        </div>
+                                    <?php endif; ?>
+                                    <?php if (empty($d['teacher_file']) && empty($d['final_file'])): ?>
+                                        —
+                                    <?php endif; ?>
                                 </td>
+                                <td><?= nl2br(esc($d['reviewer_comment'] ?? $d['reviewer_comments'] ?? $d['admin_comments'] ?? '—')) ?></td>
+                                <td><?= esc(!empty($d['updated_at']) ? local_datetime($d['updated_at'], 'm-d-Y H:i') : '') ?></td>
+                                
                             </tr>
                         <?php endforeach; ?>
                     </tbody>
                 </table>
             </div>
         <?php else: ?>
-            <p>No drafts found.</p>
+            <p class="text-muted">No submissions yet.</p>
+        <?php endif; ?>
+
+        <?php if (!empty($legacyExams)): ?>
+            <div id="legacySection" class="table-responsive d-none mt-4">
+                <table class="table table-sm table-striped align-middle teacher-drafts-table">
+                    <thead>
+                        <tr>
+                            <th>Class</th>
+                            <th>Title</th>
+                            <th>Ver.</th>
+                            <th>Status</th>
+                            <th>School year</th>
+                            <th>Semester</th>
+                            <th>Exam type</th>
+                            <th>Updated</th>
+                            <th>Actions</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php foreach ($legacyExams as $d): ?>
+                            <?php $st = strtolower((string) ($d['status'] ?? '')); ?>
+                            <tr>
+                                <td><?= esc($d['class_section_name'] ?? '') ?></td>
+                                <td class="title-cell"><?= esc($d['draft_title'] ?? $d['exam_type'] ?? '') ?></td>
+                                <td><?= esc((string) ($d['version'] ?? '')) ?></td>
+                                <td><?= $renderBadge($st, $statusBadges) ?></td>
+                                <td><?= esc($d['school_year'] ?? '') ?></td>
+                                <td><?= esc($d['semester'] ?? '') ?></td>
+                                <td><?= esc($d['exam_type'] ?? '') ?></td>
+                                <td><?= esc(!empty($d['updated_at']) ? local_datetime($d['updated_at'], 'm-d-Y H:i') : '') ?></td>
+                                <td>
+                                    <?php if (!empty($d['final_file'])): ?>
+                                        <a class="btn btn-sm btn-outline-primary" href="<?= base_url('exam-drafts/files/final/' . $d['final_file']) ?>" target="_blank" rel="noopener">View</a>
+                                    <?php endif; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
         <?php endif; ?>
     </div>
+</div>
+<?= $this->endSection() ?>
+
+<?= $this->section('scripts') ?>
+<script>
+document.addEventListener('DOMContentLoaded', () => {
+    const csrfTokenName = <?= json_encode(csrf_token(), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
+    const csrfCookieNames = <?= json_encode(array_values(array_filter([
+        config('Security')->csrfCookieName ?? null,
+        config('Security')->cookieName ?? null,
+        'csrf_cookie_name',
+    ])), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
+
+    const readCookie = (name) => {
+        const match = document.cookie.match(new RegExp('(?:^|; )' + name.replace(/[$()*+.?[\\\]^{|}-]/g, '\\$&') + '=([^;]*)'));
+        return match ? decodeURIComponent(match[1]) : '';
+    };
+
+    const syncCsrfToken = (form) => {
+        let tokenValue = '';
+        csrfCookieNames.some((name) => {
+            tokenValue = readCookie(name);
+            return tokenValue !== '';
+        });
+        if (!tokenValue || !form) {
+            return;
+        }
+        const tokenInput = form.querySelector(`input[name="${csrfTokenName}"]`);
+        if (tokenInput) {
+            tokenInput.value = tokenValue;
+        }
+    };
+
+    const draftForm = document.getElementById('examDraftForm');
+    if (draftForm) {
+        draftForm.addEventListener('submit', () => syncCsrfToken(draftForm));
+    }
+
+    const statusBadges = <?= json_encode($statusBadges, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
+    const rows = new Map();
+    document.querySelectorAll('tr[data-draft-id]').forEach((row) => {
+        const id = row.getAttribute('data-draft-id');
+        if (id) {
+            rows.set(id, row);
+        }
+    });
+
+    const updateRow = (row, status, acceptanceType) => {
+        const badge = row.querySelector('.js-status-badge');
+        if (badge) {
+            const badgeData = statusBadges[status] || { label: status, class: 'bg-secondary text-white' };
+            badge.textContent = badgeData.label || status;
+            badge.className = `badge ${badgeData.class} js-status-badge`;
+            if (badgeData.style) {
+                badge.setAttribute('style', badgeData.style);
+            } else {
+                badge.removeAttribute('style');
+            }
+            badge.dataset.status = status;
+        }
+        const note = row.querySelector('.js-acceptance-note');
+        if (note) {
+            if (status === 'accepted' && acceptanceType) {
+                note.textContent = acceptanceType === 'minor_edits' ? 'With minor edits' : 'As is';
+            } else {
+                note.textContent = '—';
+            }
+        }
+    };
+
+    const poll = () => {
+        fetch('<?= base_url('teacher/exam-drafts/status') ?>', { headers: { 'X-Requested-With': 'XMLHttpRequest' } })
+            .then((resp) => resp.ok ? resp.json() : null)
+            .then((data) => {
+                if (!data || !Array.isArray(data.drafts)) {
+                    return;
+                }
+                data.drafts.forEach((draft) => {
+                    const row = rows.get(String(draft.id));
+                    if (row) {
+                        updateRow(row, draft.status, draft.acceptance_type);
+                    }
+                });
+            })
+            .catch(() => {});
+    };
+
+    if (rows.size > 0) {
+        poll();
+        setInterval(poll, 15000);
+    }
+
+    const legacyToggle = document.getElementById('legacyToggle');
+    const legacySection = document.getElementById('legacySection');
+    if (legacyToggle && legacySection) {
+        legacyToggle.addEventListener('click', () => {
+            legacySection.classList.toggle('d-none');
+        });
+    }
+});
+</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; ?>

app/Views/teacher/scores.php

@@ -308,6 +308,7 @@
                 id="submitScoresLockBtn"
                 formaction="<?= base_url('/teacher/submit-scores-lock') ?>"
                 formmethod="post"
+                data-confirm-message="Once you submit, you cannot add any scores or comments. Do you want to continue?"
                 <?= $scoresLocked ? 'disabled' : '' ?>>
                 <?= $scoresLocked ? 'Scores Locked' : 'Submit Semester Scores' ?>
             </button>
@@ -430,6 +431,14 @@
 
             form.addEventListener('submit', function(event) {
                 syncCsrfToken();
+                const submitter = event.submitter;
+                if (submitter && submitter.id === 'submitScoresLockBtn') {
+                    const message = submitter.dataset.confirmMessage || 'Submit semester scores?';
+                    if (!confirm(message)) {
+                        event.preventDefault();
+                        return;
+                    }
+                }
                 const errors = [];
                 form.querySelectorAll('textarea[data-first-name]').forEach(function(field) {
                     const value = field.value.trim();

app/Views/user/set_authorized_user_password.php

@@ -0,0 +1,142 @@
+<?= $this->extend('layout/register_layout') ?>
+<?= $this->section('content') ?>
+
+<div class="registration-form container mt-5 mb-5">
+    <form method="post" action="<?= base_url('set_authorized_user_password/' . $userId) ?>" onsubmit="return validatePassword()" autocomplete="off">
+        <?= csrf_field(); ?>
+        <div class="text-center mb-4">
+            <a href="<?= base_url('/') ?>">
+                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 180px; height: 120px;">
+            </a>
+        </div>
+
+        <h3 class="text-center text-success" style="font-family: Arial, sans-serif;">Create Your Password</h3>
+        <br>
+        <input type="hidden" name="user_id" value="<?= esc($userId); ?>" required>
+        <input type="hidden" name="token" value="<?= esc($token ?? ''); ?>" required>
+
+        <div class="mb-3">
+            <div class="input-with-icon">
+                <input type="password"
+                    class="form-control item"
+                    id="password"
+                    name="password"
+                    placeholder="Enter new password"
+                    maxlength="40"
+                    required
+                    autocomplete="new-password"
+                    oncopy="return false"
+                    oncut="return false"
+                    onpaste="return false">
+                <span class="toggle-password" onclick="togglePassword('password', this)">
+                    <i class="fa-solid fa-eye"></i>
+                </span>
+            </div>
+            <small id="passwordHelp" class="text-danger d-none">
+                Password must be at least 8 characters long, contain a number, an uppercase letter, a lowercase letter, and one special character: @, -, =, +, *, #, $, %, &, !
+            </small>
+            <small id="passwordCopyWarning" class="text-muted d-none">
+                Copy and paste are disabled for security reasons.
+            </small>
+        </div>
+
+        <div class="mb-3">
+            <div class="input-with-icon">
+                <input type="password"
+                    class="form-control item"
+                    id="password_confirm"
+                    name="password_confirm"
+                    placeholder="Confirm new password"
+                    maxlength="40"
+                    required
+                    autocomplete="new-password"
+                    oncopy="return false"
+                    oncut="return false"
+                    onpaste="return false">
+                <span class="toggle-password" onclick="togglePassword('password_confirm', this)">
+                    <i class="fa-solid fa-eye"></i>
+                </span>
+            </div>
+            <small id="confirmPasswordHelp" class="text-danger d-none">
+                Passwords do not match.
+            </small>
+            <small id="confirmCopyWarning" class="text-muted d-none">
+                Copy and paste are disabled for security reasons.
+            </small>
+        </div>
+
+        <div class="mb-3 d-grid">
+            <button type="submit" class="btn btn-success item">Save Password</button>
+        </div>
+    </form>
+</div>
+
+<?= $this->endSection() ?>
+
+<?= $this->section('scripts') ?>
+<script>
+    document.addEventListener('DOMContentLoaded', () => {
+        const showWarning = (inputId, warningId) => {
+            const input = document.getElementById(inputId);
+            const warning = document.getElementById(warningId);
+
+            ['copy', 'paste', 'cut'].forEach(eventName => {
+                input.addEventListener(eventName, (e) => {
+                    e.preventDefault();
+                    warning.classList.remove('d-none');
+
+                    if (warning.timeout) clearTimeout(warning.timeout);
+                    warning.timeout = setTimeout(() => {
+                        warning.classList.add('d-none');
+                    }, 4000);
+                });
+            });
+        };
+
+        showWarning('password', 'passwordCopyWarning');
+        showWarning('password_confirm', 'confirmCopyWarning');
+    });
+
+    function togglePassword(fieldId, iconContainer) {
+        const input = document.getElementById(fieldId);
+        const icon = iconContainer.querySelector('i');
+
+        if (input.type === 'password') {
+            input.type = 'text';
+            icon.classList.remove('fa-eye');
+            icon.classList.add('fa-eye-slash');
+        } else {
+            input.type = 'password';
+            icon.classList.remove('fa-eye-slash');
+            icon.classList.add('fa-eye');
+        }
+    }
+
+    function validatePassword() {
+        const password = document.getElementById('password').value;
+        const passwordConfirm = document.getElementById('password_confirm').value;
+        const passwordHelp = document.getElementById('passwordHelp');
+        const confirmPasswordHelp = document.getElementById('confirmPasswordHelp');
+
+        const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@\-=\+*#$%&!?])[A-Za-z\d@\-=\+*#$%&!?]{8,}$/;
+
+        let valid = true;
+
+        if (!passwordRegex.test(password)) {
+            passwordHelp.classList.remove('d-none');
+            valid = false;
+        } else {
+            passwordHelp.classList.add('d-none');
+        }
+
+        if (password !== passwordConfirm) {
+            confirmPasswordHelp.classList.remove('d-none');
+            valid = false;
+        } else {
+            confirmPasswordHelp.classList.add('d-none');
+        }
+
+        return valid;
+    }
+</script>
+<?= $this->endSection() ?>

quran_surahs_by_grade.csv

@@ -1,45 +0,0 @@
-Grade,Surah
-1,Al-Fatihah
-1,An-Nas
-1,Al-Falaq
-1,Al-Ikhlas
-2,Al-Masad
-2,An-Nasr
-2,Al-Kafirun
-2,Al-Kawthar
-2,Al-Ma'un
-3,Quraysh
-3,Al-Fil
-3,Al-Humazah
-3,Al-'Asr
-3,At-Takathur
-4,Al-Qari'ah
-4,Al-'Adiyat
-4,Az-Zalzalah
-4,Al-Bayyinah
-4,Al-Qadr
-5,Al-'Alaq
-5,At-Tin
-5,Ash-Sharh
-5,Ad-Duhaa
-5,Al-Layl
-6,Ash-Shams
-6,Al-Balad
-6,Al-Fajr
-6,Al-Ghashiyah
-6,Al-A'la
-7,At-Tariq
-7,Al-Buruj
-7,Al-Inshiqaq
-7,Al-Mutaffifin
-7,Al-Infitar
-8,At-Takwir
-8,Abasa
-8,Al-Mursalat
-8,An-Naba
-9,Al-Mulk
-9,Al-Qalam
-9,Al-Haqqah
-9,Al-Ma'arij
-9,Nuh
-9,Al-Jinn