fix logs issues

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

See merge request root/alrahma_sunday_school!5

.env

@@ -1,184 +0,0 @@
-#--------------------------------------------------------------------
-# Example Environment Configuration file
-#
-# This file can be used as a starting point for your own
-# custom .env files, and contains most of the possible settings
-# available in a default install.
-#
-# By default, all of the settings are commented out. If you want
-# to override the setting, you must un-comment it by removing the '#'
-# at the beginning of the line.
-#--------------------------------------------------------------------
-
-#--------------------------------------------------------------------
-# ENVIRONMENT
-#--------------------------------------------------------------------
-
-CI_ENVIRONMENT = development
-
-# Which profile to use if none is supplied to sendEmail()
-# Options: default, communication, payment, ...
-MAIL_PROFILE_DEFAULT=default
-
-# ===== DEFAULT (system) =====
-# ---- Legacy fallbacks (kept for compatibility) ----
-SMTP_HOST = smtp.gmail.com
-SMTP_USER = alrahma.sunday.school@gmail.com
-SMTP_PASS = "psnp emdq dykw ypul"
-SMTP_PORT = 587
-SMTP_ENCRYPTION = tls  # was ssl; use tls for port 587
-
-# Reply-To for all mail profiles
-MAIL_DEFAULT_REPLY_TO=alrahma.isgl@gmail.com
-MAIL_DEFAULT_REPLY_TO_NAME="Al Rahma Sunday School"
-MAIL_COMMUNICATION_REPLY_TO=alrahma.isgl@gmail.com
-MAIL_COMMUNICATION_REPLY_TO_NAME="School Communications"
-MAIL_PAYMENT_REPLY_TO=alrahma.isgl@gmail.com
-MAIL_PAYMENT_REPLY_TO_NAME="School Payments"
-
-# Optional sender directory you already use elsewhere
-MAIL_SENDERS="{\"general\":{\"email\":\"alrahma.isgl@gmail.com\",\"name\":\"Al Rahma No-Reply\"},\
-\"registration\":{\"email\":\"alrahma.isgl@gmail.com\",\"name\":\"Al Rahma Register Office\"},\
-\"notifications\":{\"email\":\"alrahma.isgl@gmail.com\",\"name\":\"Al Rahma Notifications\"},\
-\"finance\":{\"email\":\"alrahma.isgl@gmail.com\",\"name\":\"Al Rahma Finance Office\"}}"
-
-# Principal notification recipient for TimeOff requests (comma-separated allowed)
-PRINCIPAL_EMAIL="melabidi@alrahmaisgl.org"
-MAIL_PARENT_REPORT_TO="alrahma.isgl@gmail.com"
-MAIL_FROM_ADDRESS = "alrahma.sunday.school@gmail.com"
-
-session.expiration = 43200
-#--------------------------------------------------------------------
-# APP
-#--------------------------------------------------------------------
-
-# If you have trouble with `.`, you could also use `_`.
- app_baseURL = 'http://localhost:8080/'
-# app.forceGlobalSecureRequests = true
-# app.CSPEnabled = false
-
-#--------------------------------------------------------------------
-# DATABASE
-#--------------------------------------------------------------------
-database.default.hostname = 127.0.0.1
-database.default.database = school
-database.default.username = root
-database.default.password = 
-database.default.DBDriver = MySQLi
-database.default.DBPrefix =
-database.default.port = 3306
-
-
-#--------------------------------------------------------------------
-# CONTENT SECURITY POLICY
-#--------------------------------------------------------------------
-
-# contentsecuritypolicy.reportOnly = false
-# contentsecuritypolicy.defaultSrc = 'none'
-# contentsecuritypolicy.scriptSrc = 'self'
-# contentsecuritypolicy.styleSrc = 'self'
-# contentsecuritypolicy.imageSrc = 'self'
-# contentsecuritypolicy.baseURI = null
-# contentsecuritypolicy.childSrc = null
-# contentsecuritypolicy.connectSrc = 'self'
-# contentsecuritypolicy.fontSrc = null
-# contentsecuritypolicy.formAction = null
-# contentsecuritypolicy.frameAncestors = null
-# contentsecuritypolicy.frameSrc = null
-# contentsecuritypolicy.mediaSrc = null
-# contentsecuritypolicy.objectSrc = null
-# contentsecuritypolicy.pluginTypes = null
-# contentsecuritypolicy.reportURI = null
-# contentsecuritypolicy.sandbox = false
-# contentsecuritypolicy.upgradeInsecureRequests = false
-# contentsecuritypolicy.styleNonceTag = '{csp-style-nonce}'
-# contentsecuritypolicy.scriptNonceTag = '{csp-script-nonce}'
-# contentsecuritypolicy.autoNonce = true
-
-#--------------------------------------------------------------------
-# COOKIE
-#--------------------------------------------------------------------
-
-# cookie.prefix = ''
-# cookie.expires = 0
-# cookie.path = '/'
-# cookie.domain = ''
-# cookie.secure = false
-# cookie.httponly = false
-# cookie.samesite = 'Lax'
-# cookie.raw = false
-
-#--------------------------------------------------------------------
-# ENCRYPTION
-#--------------------------------------------------------------------
-
-# encryption.key =
-# encryption.driver = OpenSSL
-# encryption.blockSize = 16
-# encryption.digest = SHA512
-
-#--------------------------------------------------------------------
-# HONEYPOT
-#--------------------------------------------------------------------
-
-# honeypot.hidden = 'true'
-# honeypot.label = 'Fill This Field'
-# honeypot.name = 'honeypot'
-# honeypot.template = '<label>{label}</label><input type="text" name="{name}" value=""/>'
-# honeypot.container = '<div style="display:none">{template}</div>'
-
-#--------------------------------------------------------------------
-# SECURITY
-#--------------------------------------------------------------------
-
-# security.csrfProtection = 'cookie'
-# security.tokenRandomize = false
-# security.tokenName = 'csrf_token_name'
-# security.headerName = 'X-CSRF-TOKEN'
-# security.cookieName = 'csrf_cookie_name'
-# security.expires = 7200
-# security.regenerate = true
-# security.redirect = false
-# security.samesite = 'Lax'
-
-#--------------------------------------------------------------------
-# SESSION
-#--------------------------------------------------------------------
-
-# session.driver = 'CodeIgniter\Session\Handlers\FileHandler'
-# session.cookieName = 'ci_session'
-# session.expiration = 7200
-# session.savePath = null
-# session.matchIP = false
-# session.timeToUpdate = 300
-# session.regenerateDestroy = false
-
-#--------------------------------------------------------------------
-# LOGGER
-#--------------------------------------------------------------------
-
-logger.threshold = 4
-MAIL_DEBUG = true
-MAIL_TIMEOUT = 15
-
-#--------------------------------------------------------------------
-# CURLRequest
-#--------------------------------------------------------------------
-
-# curlrequest.shareOptions = false
-
-
-
-
-
-mail.protocol  = smtp
-mail.SMTPHost  = ${SMTP_HOST}
-mail.SMTPUser  = ${SMTP_USER}
-mail.SMTPPass  = ${SMTP_PASS}
-mail.SMTPPort  = ${SMTP_PORT}
-mail.SMTPCrypto = tls
-
-mail.fromEmail = ${SMTP_USER}
-mail.fromName  = "Al Rahma Sunday School"
-mail.mailType  = text
-mail.charset   = UTF-8

.gitignore

@@ -1 +1,54 @@
+.env
+.env.*
+!.env.example
+
+/vendor/
+/node_modules/
+
+/writable/cache/*
+/writable/debugbar/*
+/writable/logs/*
+/writable/session/*
+/writable/uploads/*
+/writable/tmp/*
+/writable/*.log
+
+!/writable/.gitkeep
+!/writable/cache/.gitkeep
+!/writable/debugbar/.gitkeep
+!/writable/logs/.gitkeep
+!/writable/session/.gitkeep
+!/writable/uploads/.gitkeep
+!/writable/tmp/.gitkeep
+
+/public/build/
+/public/hot/
+/public/uploads/**
+!/public/uploads/**/index.html
+!/public/uploads/.gitkeep
+
+/uploads/**
+!/uploads/**/index.html
+!/uploads/.gitkeep
+
+docker-compose.override.yml
+docker-compose.local.yml
+
 *.log
+.swp
+.swo
+*~
+.tmp
+.DS_Store
+Thumbs.db
+.idea/
+.vscode/
+.codex/
+
+/coverage/
+/build/
+/builds
+/phpunit.xml.cache
+/.phpunit.result.cache
+/writable/reports/*
+/writable/test.txt

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 = [
-        'DSN'      => '',
-        '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 $default = [];
+    public array $tests = [];
 
-    public array $tests = [
-        'DSN'      => '',
-        'hostname' => 'localhost',
-        'username' => 'u280815660_melabidi',
-        'password' => '>tNxlRzP/W8',
-        'database' => 'u280815660_school',
-        'DBDriver' => 'MySQLi',
-        'DBPrefix' => 'db_',
-        'pConnect' => false,
-        'DBDebug'  => true,
-        'charset'  => 'utf8',
-        'DBCollat' => 'utf8_general_ci',
-        'swapPre'  => '',
-        'encrypt'  => false,
-        'compress' => false,
-        'strictOn' => false,
-        'failover' => [],
-        'port'     => 3306,
-    ];
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->default = [
+            'DSN'      => '',
+            'hostname' => env('database.default.hostname'),
+            'username' => env('database.default.username'),
+            'password' => env('database.default.password'),
+            'database' => env('database.default.database'),
+            'DBDriver' => env('database.default.DBDriver', 'MySQLi'),
+            'DBPrefix' => '',
+            'pConnect' => false,
+            'DBDebug'  => (ENVIRONMENT !== 'development'),
+            'charset'  => 'utf8',
+            'DBCollat' => 'utf8_general_ci',
+            'swapPre'  => '',
+            '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']);
@@ -499,6 +506,7 @@ $routes->get('grading/project/(:num)', 'View\ProjectController::showProjectMngt/
 $routes->post('grading/updateProject', 'View\ProjectController::updateProject');
 
 $routes->get('grading/below-60', 'View\GradingController::belowSixty', ['filter' => 'auth:read']);
+$routes->get('grading/below-60/email/edit', 'View\GradingController::editBelowSixtyEmail', ['filter' => 'auth:read']);
 $routes->post('grading/below-60/email', 'View\GradingController::sendBelowSixtyEmail', ['filter' => 'auth:read']);
 $routes->post('grading/below-60/status', 'View\GradingController::updateBelowSixtyStatus', ['filter' => 'auth:read']);
 $routes->get('grading/below-60/schedule', 'View\GradingController::scheduleBelowSixty', ['filter' => 'auth:read']);
@@ -527,9 +535,11 @@ $routes->post('payment/event_charges', 'View\EventController::eventUpdate');
 
 // Parent event participation
 $routes->get('administrator/event-charges', 'View\EventController::eventShow');
+$routes->post('administrator/event-charges/remove/(:num)', 'View\EventController::removeCharge/$1');
+$routes->post('administrator/event-charges/payment/(:num)', 'View\EventController::toggleEventPayment/$1');
 $routes->get('administrator/get-students-with-charges', 'View\EventController::getStudentsWithCharges');
 
-$routes->get('parent/events', 'View\ParentController::parentEventPage');
+$routes->get('parent/events', 'View\ParentController::parentEventPage', ['filter' => 'auth:parent']);
 // parent event participation page
 $routes->post('parent/updateParticipation', 'View\ParentController::updateParticipation'); // handle parent participation updates
 
@@ -1002,6 +1012,8 @@ $routes->group('family',  static function ($routes) {
     $routes->get('index', 'View\FamilyAdminController::index');
     $routes->get('search', 'View\FamilyAdminController::search');
     $routes->get('card', 'View\FamilyAdminController::card');
+    $routes->get('compose-email', 'View\FamilyAdminController::composeEmail');
+    $routes->post('compose-email/send', 'View\FamilyAdminController::sendComposeEmail');
 });
 // Convenience alias
 $routes->get('family', 'View\FamilyAdminController::index');

app/Controllers/AdminProgressController.php

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

app/Controllers/AuthController.php

@@ -56,13 +56,32 @@ class AuthController extends Controller
    
     public function loginMask()
     {
-        // Serve the login view directly here
-        return view('user/login');  // Adjust the view path as needed
+        $redirectTo = $this->sanitizeRedirectTarget((string) ($this->request->getGet('redirect_to') ?? ''));
+
+        if (session()->get('is_logged_in')) {
+            if ($redirectTo !== null) {
+                return redirect()->to($redirectTo);
+            }
+
+            $roles = session()->get('roles') ?? [];
+            if (empty($roles) && session()->get('role')) {
+                $roles = [session()->get('role')];
+            }
+
+            if (!empty($roles)) {
+                return $this->redirectToDashboard($roles);
+            }
+        }
+
+        return view('user/login', [
+            'redirect_to' => $redirectTo ?? '',
+        ]);
     }
     
     public function login()
     {
         log_message('info', 'Processing login form submission.');
+        $redirectTo = $this->sanitizeRedirectTarget((string) ($this->request->getPost('redirect_to') ?? $this->request->getGet('redirect_to') ?? ''));
 
         // Step 1: Get email, password, and IP from the request
         $email = $this->request->getPost('email');
@@ -98,7 +117,7 @@ class AuthController extends Controller
                 $this->logLoginAttempt($user['id'], $user['email'], $ip, $this->request->getUserAgent());
 
                 // ✅ Step 7: Call loginUser() to set session and redirect
-                return $this->loginUser($user);
+                return $this->loginUser($user, $redirectTo);
             } else {
                 // Step 8: Password mismatch — log failed attempt
                 $this->handleFailedLogin($user['id'], $user['email'], $ip);
@@ -469,6 +488,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 +497,7 @@ class AuthController extends Controller
         $passwordResetModel = new PasswordResetModel();
         $passwordResetModel->insert([
             'email'      => $email,
-            'token'      => $token,
+            'token'      => $tokenHash,
             'created_at' => Time::now(),
             'expires_at' => $expires_at,
         ]);
@@ -490,7 +510,7 @@ class AuthController extends Controller
         return true;
     }
 
-    private function loginUser($user)
+    private function loginUser($user, ?string $redirectTo = null)
     {
         $userRoleModel = new UserRoleModel();
         $roles = $userRoleModel->select('roles.name')
@@ -524,9 +544,17 @@ class AuthController extends Controller
         if (count($roleNames) === 1) {
             // One role → set and redirect directly
             session()->set('role', $roleNames[0]);
+            if ($redirectTo !== null) {
+                return redirect()->to($redirectTo);
+            }
             return $this->redirectToDashboard([$roleNames[0]]);
         } else {
             // Multiple roles → redirect to role selection view
+            if ($redirectTo !== null) {
+                session()->set('post_login_redirect', $redirectTo);
+            } else {
+                session()->remove('post_login_redirect');
+            }
             return redirect()->to('/select-role');
         }
 
@@ -591,12 +619,17 @@ private function redirectToDashboard(array $roles)
     {
         $selectedRole = $this->request->getPost('selected_role');
         $availableRoles = session()->get('roles');
+        $redirectTo = $this->sanitizeRedirectTarget((string) ($this->request->getPost('redirect_to') ?? session()->get('post_login_redirect') ?? ''));
 
         if (!$selectedRole || !in_array($selectedRole, $availableRoles)) {
             return redirect()->to('/select-role')->with('error', 'Invalid role selected.');
         }
 
         session()->set('role', $selectedRole);
+        session()->remove('post_login_redirect');
+        if ($redirectTo !== null) {
+            return redirect()->to($redirectTo);
+        }
         return $this->redirectToDashboard([$selectedRole]);
     }
 
@@ -608,7 +641,44 @@ private function redirectToDashboard(array $roles)
             return redirect()->to('/login')->with('error', 'No roles available.');
         }
 
-        return view('auth/select_role', ['roles' => $roles]);
+        return view('auth/select_role', [
+            'roles' => $roles,
+            'redirect_to' => (string) (session()->get('post_login_redirect') ?? ''),
+        ]);
+    }
+
+    private function sanitizeRedirectTarget(string $redirectTo): ?string
+    {
+        $redirectTo = trim($redirectTo);
+        if ($redirectTo === '') {
+            return null;
+        }
+
+        if (preg_match('#^https?://#i', $redirectTo)) {
+            $appHost = (string) parse_url(base_url('/'), PHP_URL_HOST);
+            $targetHost = (string) parse_url($redirectTo, PHP_URL_HOST);
+            $targetPath = (string) parse_url($redirectTo, PHP_URL_PATH);
+            $targetQuery = (string) parse_url($redirectTo, PHP_URL_QUERY);
+
+            if ($appHost === '' || $targetHost === '' || strcasecmp($appHost, $targetHost) !== 0) {
+                return null;
+            }
+
+            $redirectTo = $targetPath !== '' ? $targetPath : '/';
+            if ($targetQuery !== '') {
+                $redirectTo .= '?' . $targetQuery;
+            }
+        }
+
+        if (!str_starts_with($redirectTo, '/')) {
+            $redirectTo = '/' . ltrim($redirectTo, '/');
+        }
+
+        if (str_starts_with($redirectTo, '//')) {
+            return null;
+        }
+
+        return $redirectTo;
     }
 
 }

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

app/Controllers/View/AdministratorController.php

@@ -28,6 +28,8 @@ use App\Models\ScoreCommentModel;
 use App\Models\SemesterScoreModel;
 use App\Models\TeacherClassModel;
 use App\Models\TeacherSubmissionNotificationHistoryModel;
+use App\Models\ExamDraftModel;
+use App\Models\HomeworkModel;
 use App\Services\SemesterRangeService;
 
 use CodeIgniter\Events\Events;
@@ -416,8 +418,10 @@ class AdministratorController extends BaseController
         $totalStudents = (int) (
             $this->db->table('student_class')
                 ->select('COUNT(DISTINCT student_class.student_id) AS cnt')
+                ->join('students', 'students.id = student_class.student_id', 'inner')
                 ->where('student_class.school_year', $this->schoolYear)
                 ->where('student_class.class_section_id IS NOT NULL', null, false)
+                ->where('students.is_active', 1)
                 ->get()
                 ->getRow('cnt')
             ?? 0
@@ -694,15 +698,26 @@ class AdministratorController extends BaseController
 
     public function teacherSubmissionsReport()
     {
-        $semester = (string)($this->semester ?? '');
-        $schoolYear = (string)($this->schoolYear ?? '');
+        $semester = (string)($this->configModel->getConfig('semester') ?? $this->semester ?? '');
+        $schoolYear = (string)($this->configModel->getConfig('school_year') ?? $this->schoolYear ?? '');
+        $semesterResolver = new SemesterRangeService($this->configModel);
+        $semesterNorm = $semesterResolver->normalizeSemester($semester);
+        $semesterFilter = $semesterNorm !== '' ? $semesterNorm : $semester;
+        $semesterCandidates = $this->buildSemesterCandidates($semesterFilter);
+        $lowProgressRaw = (string) $this->request->getGet('low_progress_sections');
+        $lowProgressSectionIds = array_values(array_unique(array_filter(array_map(
+            'intval',
+            preg_split('/\s*,\s*/', $lowProgressRaw, -1, PREG_SPLIT_NO_EMPTY)
+        ))));
 
         $scoreComments = new ScoreCommentModel();
         $semesterScores = new SemesterScoreModel();
         $attendanceDays = new AttendanceDayModel();
+        $examDrafts = new ExamDraftModel();
+        $homeworkModel = new HomeworkModel();
         $historyModel = new TeacherSubmissionNotificationHistoryModel();
 
-        $assignmentRows = $this->db->table('teacher_class tc')
+        $assignmentQuery = $this->db->table('teacher_class tc')
             ->select([
                 'tc.class_section_id',
                 'cs.class_section_name',
@@ -713,11 +728,97 @@ class AdministratorController extends BaseController
             ])
             ->join('classSection cs', 'cs.class_section_id = tc.class_section_id', 'left')
             ->join('users u', 'u.id = tc.teacher_id', 'left')
-            ->where('tc.school_year', $schoolYear)
-            ->where('tc.semester', $semester)
-            ->orderBy('cs.class_section_name', 'ASC')
-            ->get()
-            ->getResultArray();
+            ->orderBy('cs.class_section_name', 'ASC');
+
+        $filteredQuery = clone $assignmentQuery;
+        if ($schoolYear !== '') {
+            $filteredQuery = $filteredQuery->where('tc.school_year', $schoolYear);
+        }
+        if (!empty($semesterCandidates)) {
+            $filteredQuery = $filteredQuery->whereIn('tc.semester', $semesterCandidates);
+        }
+
+        $assignmentRows = $filteredQuery->get()->getResultArray();
+        if (empty($assignmentRows) && ($schoolYear !== '' || $semester !== '')) {
+            $assignmentRows = $assignmentQuery->get()->getResultArray();
+        }
+
+        $studentCounts = $this->studentClassModel->getStudentCountsBySection($schoolYear !== '' ? $schoolYear : null);
+        $sectionRows = $this->classSectionModel
+            ->select('class_section_id, class_section_name')
+            ->orderBy('class_section_name', 'ASC')
+            ->findAll();
+        $sectionMap = [];
+        foreach ($sectionRows as $sectionRow) {
+            $sectionId = (int) ($sectionRow['class_section_id'] ?? 0);
+            if ($sectionId <= 0) {
+                continue;
+            }
+            if (empty($studentCounts[$sectionId])) {
+                continue;
+            }
+            $sectionMap[$sectionId] = $sectionRow['class_section_name'] ?? "Section {$sectionId}";
+        }
+        $sectionIds = array_keys($sectionMap);
+
+        [$progressExpectedWeeks, $progressSubmittedBySection] = $this->buildClassProgressStats($sectionIds);
+        $examDraftCounts = [];
+        $examDraftDeadline = $this->resolveTeacherDashboardExamDraftDeadline($semester, $schoolYear);
+        $examDraftDeadlineConfig = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        $examDraftDeadlineFormatted = '';
+        if ($examDraftDeadlineConfig !== '') {
+            $parsedUi = $this->parseExamDraftDeadlineConfigValue();
+            $examDraftDeadlineFormatted = $parsedUi !== null ? $parsedUi->format('M j, Y') : '';
+        }
+        $homeworkCounts = [];
+        if (! empty($sectionIds)) {
+            $draftBuilder = $examDrafts
+                ->select('class_section_id')
+                ->whereIn('class_section_id', $sectionIds);
+            if ($schoolYear !== '') {
+                $draftBuilder->where('school_year', $schoolYear);
+            }
+            if (!empty($semesterCandidates)) {
+                $draftBuilder->whereIn('semester', $semesterCandidates);
+            }
+            if ($this->db->fieldExists('is_legacy', 'exam_drafts')) {
+                $draftBuilder->where('is_legacy', 0);
+            }
+            $draftRows = $draftBuilder->findAll();
+            foreach ($draftRows as $draft) {
+                $sectionId = (int) ($draft['class_section_id'] ?? 0);
+                if ($sectionId <= 0) {
+                    continue;
+                }
+                $examDraftCounts[$sectionId] = ($examDraftCounts[$sectionId] ?? 0) + 1;
+            }
+
+            $homeworkBuilder = $homeworkModel
+                ->select('class_section_id, homework_index')
+                ->whereIn('class_section_id', $sectionIds);
+            if ($schoolYear !== '') {
+                $homeworkBuilder->where('school_year', $schoolYear);
+            }
+            if (!empty($semesterCandidates)) {
+                $homeworkBuilder->whereIn('semester', $semesterCandidates);
+            }
+            $homeworkRows = $homeworkBuilder
+                ->where('score IS NOT NULL', null, false)
+                ->where('score !=', '')
+                ->groupBy('class_section_id, homework_index')
+                ->findAll();
+            foreach ($homeworkRows as $row) {
+                $sectionId = (int) ($row['class_section_id'] ?? 0);
+                if ($sectionId <= 0) {
+                    continue;
+                }
+                $homeworkCounts[$sectionId] = ($homeworkCounts[$sectionId] ?? 0) + 1;
+            }
+        }
+
+        if (empty($lowProgressSectionIds)) {
+            $lowProgressSectionIds = $this->resolveLowProgressSectionIds($sectionIds);
+        }
 
         $teachersBySection = [];
         foreach ($assignmentRows as $assignment) {
@@ -743,7 +844,7 @@ class AdministratorController extends BaseController
             $entry = &$teachersBySection[$sectionId];
             if (!isset($entry)) {
                 $entry = [
-                    'class_section' => $assignment['class_section_name'] ?? "Section {$sectionId}",
+                    'class_section' => $assignment['class_section_name'] ?? ($sectionMap[$sectionId] ?? "Section {$sectionId}"),
                     'teachers' => [],
                 ];
             }
@@ -763,35 +864,49 @@ class AdministratorController extends BaseController
         $missingItemCount = 0;
         $allTeacherIds = [];
         $allClassSectionIds = [];
-        foreach ($teachersBySection as $classSectionId => $section) {
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreField = $examTerm === 'final' ? 'final_exam_score' : 'midterm_exam_score';
+
+        foreach ($sectionMap as $classSectionId => $sectionName) {
             $classSectionId = (int)$classSectionId;
             if ($classSectionId <= 0) {
                 continue;
             }
 
-            $studentEntries = $this->studentClassModel
+            $studentQuery = $this->studentClassModel
                 ->select('student_id')
                 ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
-                ->where('school_year', $schoolYear)
-                ->findAll();
+                ->where('school_year', $schoolYear);
+            if (!empty($semesterCandidates)) {
+                $studentQuery->whereIn('semester', $semesterCandidates);
+            }
+            $studentEntries = $studentQuery->findAll();
+            if (empty($studentEntries)) {
+                $studentEntries = $this->studentClassModel
+                    ->select('student_id')
+                    ->where('class_section_id', $classSectionId)
+                    ->where('school_year', $schoolYear)
+                    ->findAll();
+            }
             $studentIds = array_filter(array_map(static fn($entry) => (int)($entry['student_id'] ?? 0), $studentEntries));
             $expected = count($studentIds);
 
             $midtermStudents = [];
             $participationStudents = [];
             if ($classSectionId > 0) {
-                $scoreRecords = $semesterScores
+                $scoreQuery = $semesterScores
                     ->where('class_section_id', $classSectionId)
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->findAll();
+                    ->where('school_year', $schoolYear);
+                if (!empty($semesterCandidates)) {
+                    $scoreQuery->whereIn('semester', $semesterCandidates);
+                }
+                $scoreRecords = $scoreQuery->findAll();
                 foreach ($scoreRecords as $score) {
                     $sid = (int)($score['student_id'] ?? 0);
                     if ($sid <= 0 || ($expected > 0 && !in_array($sid, $studentIds, true))) {
                         continue;
                     }
-                    $midtermValue = trim((string)($score['midterm_exam_score'] ?? ''));
+                    $midtermValue = trim((string)($score[$examScoreField] ?? ''));
                     if ($midtermValue !== '') {
                         $midtermStudents[$sid] = true;
                     }
@@ -805,13 +920,15 @@ class AdministratorController extends BaseController
             $midtermCommentStudents = [];
             $ptapCommentStudents = [];
             if (!empty($studentIds)) {
-                $comments = $scoreComments
+                $commentQuery = $scoreComments
                     ->select('student_id, score_type, comment')
                     ->whereIn('student_id', $studentIds)
-                    ->where('semester', $semester)
                     ->where('school_year', $schoolYear)
-                    ->whereIn('score_type', ['midterm', 'ptap'])
-                    ->findAll();
+                    ->whereIn('score_type', [$examTerm, 'ptap']);
+                if (!empty($semesterCandidates)) {
+                    $commentQuery->whereIn('semester', $semesterCandidates);
+                }
+                $comments = $commentQuery->findAll();
                 foreach ($comments as $comment) {
                     $sid = (int)($comment['student_id'] ?? 0);
                     if ($sid <= 0) {
@@ -822,7 +939,7 @@ class AdministratorController extends BaseController
                         continue;
                     }
                     $type = strtolower(trim((string)($comment['score_type'] ?? '')));
-                    if ($type === 'midterm') {
+                    if ($type === $examTerm) {
                         $midtermCommentStudents[$sid] = true;
                     }
                     if ($type === 'ptap') {
@@ -831,14 +948,17 @@ class AdministratorController extends BaseController
                 }
             }
 
-            $attendanceRow = $attendanceDays
+            $attendanceQuery = $attendanceDays
                 ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
                 ->where('school_year', $schoolYear)
-                ->where('date', $today)
-                ->first();
+                ->where('date', $today);
+            if (!empty($semesterCandidates)) {
+                $attendanceQuery->whereIn('semester', $semesterCandidates);
+            }
+            $attendanceRow = $attendanceQuery->first();
             $attendanceSubmitted = $attendanceRow && in_array(strtolower((string)($attendanceRow['status'] ?? '')), ['submitted', 'published', 'finalized'], true);
 
+            $section = $teachersBySection[$classSectionId] ?? ['teachers' => []];
             $teacherList = $section['teachers'] ?? [];
             if (!empty($teacherList)) {
                 usort($teacherList, function ($a, $b) {
@@ -859,18 +979,27 @@ class AdministratorController extends BaseController
             $participationStatus = $this->submissionStatus(count($participationStudents), $expected);
             $ptapCommentStatus = $this->submissionStatus(count($ptapCommentStudents), $expected);
             $attendanceStatus = $this->attendanceStatus($attendanceSubmitted);
+            $progressSubmitted = (int) ($progressSubmittedBySection[$classSectionId] ?? 0);
+            $classProgressStatus = $this->progressStatus($progressSubmitted, $progressExpectedWeeks);
+            $draftSubmitted = (int) ($examDraftCounts[$classSectionId] ?? 0);
+            $examDraftStatus = $this->draftStatus($draftSubmitted, $examDraftDeadline);
+            $homeworkSubmitted = (int) ($homeworkCounts[$classSectionId] ?? 0);
+            $homeworkStatus = $this->homeworkStatus($homeworkSubmitted);
             $statusDetails = [
                 'midterm_score_status' => $midtermScoreStatus,
                 'midterm_comment_status' => $midtermCommentStatus,
                 'participation_status' => $participationStatus,
                 'ptap_comment_status' => $ptapCommentStatus,
+                'class_progress_status' => $classProgressStatus,
+                'exam_draft_status' => $examDraftStatus,
+                'homework_status' => $homeworkStatus,
             ];
-            $missingItemsForSection = $this->buildMissingItems($statusDetails);
+            $missingItemsForSection = $this->buildMissingItems($statusDetails, $semester);
             $missingItemCount += count($missingItemsForSection);
             $totalStatuses += count($statusDetails);
 
             $rows[] = [
-                'class_section' => $section['class_section'] ?? "Section {$classSectionId}",
+                'class_section' => $sectionMap[$classSectionId] ?? ($section['class_section'] ?? "Section {$classSectionId}"),
                 'class_section_id' => $classSectionId,
                 'teachers' => $teacherList,
                 'midterm_score_status' => $midtermScoreStatus,
@@ -878,6 +1007,9 @@ class AdministratorController extends BaseController
                 'participation_status' => $participationStatus,
                 'ptap_comment_status' => $ptapCommentStatus,
                 'attendance_status' => $attendanceStatus,
+                'class_progress_status' => $classProgressStatus,
+                'exam_draft_status' => $examDraftStatus,
+                'homework_status' => $homeworkStatus,
                 'missing_items' => $missingItemsForSection,
                 'student_count' => $expected,
             ];
@@ -939,15 +1071,183 @@ class AdministratorController extends BaseController
             'schoolYear' => $schoolYear,
             'notificationHistory' => $historyMap,
             'summary' => $summary,
+            'lowProgressSectionIds' => $lowProgressSectionIds,
+            'examDraftDeadlineConfig' => $examDraftDeadlineConfig,
+            'examDraftDeadlineFormatted' => $examDraftDeadlineFormatted,
         ]);
     }
 
+    private function resolveLowProgressSectionIds(array $sectionIds): array
+    {
+        [$expectedWeeks, $submittedBySection] = $this->buildClassProgressStats($sectionIds);
+        if ($expectedWeeks <= 0) {
+            return [];
+        }
+
+        $lowProgressSectionIds = [];
+        foreach ($sectionIds as $sectionId) {
+            $submitted = (int) ($submittedBySection[$sectionId] ?? 0);
+            $percent = ($submitted / $expectedWeeks) * 100;
+            if ($percent < 50) {
+                $lowProgressSectionIds[] = $sectionId;
+            }
+        }
+
+        return $lowProgressSectionIds;
+    }
+
+    private function buildClassProgressStats(array $sectionIds): array
+    {
+        $sectionIds = array_values(array_unique(array_filter(array_map('intval', $sectionIds))));
+        if (empty($sectionIds)) {
+            return [0, []];
+        }
+
+        $semesterResolver = new SemesterRangeService($this->configModel);
+        $schoolYear = (string)($this->configModel->getConfig('school_year') ?? '');
+        $semester = (string)($this->configModel->getConfig('semester') ?? '');
+        $schoolYearForRange = $schoolYear !== '' ? $schoolYear : (string)($this->configModel->getConfig('school_year') ?? '');
+        [$rangeStart, $rangeEnd] = $semesterResolver->getSchoolYearRange($schoolYearForRange);
+        $semesterNorm = $semesterResolver->normalizeSemester($semester);
+        if ($semesterNorm !== '' && $schoolYearForRange !== '') {
+            $semRange = $semesterResolver->getSemesterRange($schoolYearForRange, $semesterNorm);
+            if ($semRange) {
+                [$rangeStart, $rangeEnd] = $semRange;
+            }
+        }
+
+        $dateList = [];
+        try {
+            $start = new \DateTimeImmutable($rangeStart);
+            $end = new \DateTimeImmutable($rangeEnd);
+            $cursor = $start;
+            $w = (int) $cursor->format('w');
+            if ($w !== 0) {
+                $cursor = $cursor->modify('next sunday');
+            }
+            while ($cursor <= $end) {
+                $dateList[] = $cursor->format('Y-m-d');
+                $cursor = $cursor->modify('+7 days');
+            }
+        } catch (\Throwable $e) {
+            $dateList = [];
+        }
+
+        $noSchoolDays = [];
+        $events = [];
+        try {
+            $calendarModel = new \App\Models\CalendarModel();
+            $events = $calendarModel->getEvents();
+        } catch (\Throwable $e) {
+            $events = [];
+        }
+        foreach ($events as $event) {
+            $d = substr((string) ($event['date'] ?? ''), 0, 10);
+            if ($d === '' || empty($event['no_school'])) {
+                continue;
+            }
+            if ($d < $rangeStart || $d > $rangeEnd) {
+                continue;
+            }
+            $eventYear = trim((string) ($event['school_year'] ?? ''));
+            if ($schoolYearForRange !== '' && $eventYear !== '' && $eventYear !== $schoolYearForRange) {
+                continue;
+            }
+            $noSchoolDays[$d] = true;
+        }
+
+        $anchorSundayYmd = '';
+        try {
+            $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
+            $tzObj = new \DateTimeZone($tzName ?: 'UTC');
+        } catch (\Throwable $e) {
+            try {
+                $tzObj = new \DateTimeZone(user_timezone() ?: 'UTC');
+            } catch (\Throwable $e2) {
+                $tzObj = new \DateTimeZone('UTC');
+            }
+        }
+        try {
+            $nowDate = new \DateTime('now', $tzObj);
+        } catch (\Throwable $e) {
+            $nowDate = new \DateTime('now');
+        }
+        $weekday = (int) $nowDate->format('w');
+        $anchorSundayYmd = $weekday === 0
+            ? $nowDate->format('Y-m-d')
+            : $nowDate->modify('next sunday')->format('Y-m-d');
+
+        $activeDatesSet = [];
+        if (! empty($dateList) && $anchorSundayYmd !== '') {
+            foreach ($dateList as $d) {
+                if ($d <= $anchorSundayYmd && empty($noSchoolDays[$d])) {
+                    $activeDatesSet[$d] = true;
+                }
+            }
+        }
+        $expectedWeeks = count($activeDatesSet);
+        if ($expectedWeeks === 0) {
+            return [0, []];
+        }
+
+        $builder = $this->db->table('class_progress_reports')
+            ->select('class_section_id, week_start')
+            ->whereIn('class_section_id', $sectionIds);
+        if (! empty($activeDatesSet)) {
+            $builder->whereIn('week_start', array_keys($activeDatesSet));
+        }
+        $rows = $builder->get()->getResultArray();
+
+        $submittedBySection = [];
+        foreach ($rows as $row) {
+            $sectionId = (int) ($row['class_section_id'] ?? 0);
+            $weekStart = (string) ($row['week_start'] ?? '');
+            if ($sectionId === 0 || $weekStart === '' || empty($activeDatesSet[$weekStart])) {
+                continue;
+            }
+            $submittedBySection[$sectionId][$weekStart] = true;
+        }
+
+        $counts = [];
+        foreach ($sectionIds as $sectionId) {
+            $counts[$sectionId] = isset($submittedBySection[$sectionId])
+                ? count($submittedBySection[$sectionId])
+                : 0;
+        }
+
+        return [$expectedWeeks, $counts];
+    }
+
     public function sendTeacherSubmissionNotifications()
     {$notify = $this->request->getPost('notify');
         if (!is_array($notify)) {
             return redirect()->back()->with('info', 'Select at least one teacher to notify.');
         }
+        $semester = (string)($this->configModel->getConfig('semester') ?? $this->semester ?? '');
         $missingItemsPayload = $this->request->getPost('missing_items') ?? [];
+        $homeworkNotifyAll = (bool) $this->request->getPost('homework_notify_all');
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreLabel = $examTerm === 'final' ? 'final scores' : 'midterm scores';
+        $examCommentLabel = $examTerm === 'final' ? 'final comments' : 'midterm comments';
+        $forcedItems = [];
+        if ($this->request->getPost('notify_midterm_score')) {
+            $forcedItems[] = $examScoreLabel;
+        }
+        if ($this->request->getPost('notify_midterm_comment')) {
+            $forcedItems[] = $examCommentLabel;
+        }
+        if ($this->request->getPost('notify_participation')) {
+            $forcedItems[] = 'participation';
+        }
+        if ($this->request->getPost('notify_ptap_comment')) {
+            $forcedItems[] = 'PTAP comments';
+        }
+        if ($this->request->getPost('notify_class_progress')) {
+            $forcedItems[] = 'class progress';
+        }
+        if ($this->request->getPost('notify_exam_draft')) {
+            $forcedItems[] = 'exam draft';
+        }
 
         $targets = [];
         foreach ($notify as $sectionIdRaw => $teachers) {
@@ -1004,6 +1304,10 @@ class AdministratorController extends BaseController
 
         $historyModel = new TeacherSubmissionNotificationHistoryModel();
         $scoreUrl = site_url('/');
+        $progressUrl = site_url('teacher/progress/history');
+        $examDraftUrl = site_url('teacher/exam-drafts');
+        $homeworkUrl = site_url('teacher/addHomework');
+        $examDraftDeadlineEmailHtml = $this->buildExamDraftDeadlineEmailHtml();
         $sentCount = 0;
         $failCount = 0;
 
@@ -1019,6 +1323,13 @@ class AdministratorController extends BaseController
             $subject = "Reminder: Complete submissions for {$sectionName}";
             $missingPayload = $missingItemsPayload[$classSectionId][$teacherId] ?? '';
             $missingItems = $this->parseMissingItemsPayload((string)$missingPayload);
+            $selectedItems = $forcedItems;
+            if ($homeworkNotifyAll && !in_array('homework', $selectedItems, true)) {
+                $selectedItems[] = 'homework';
+            }
+            if (!empty($selectedItems)) {
+                $missingItems = array_values(array_unique($selectedItems));
+            }
             if (!empty($missingItems)) {
                 $missingText = htmlspecialchars(
                     $this->formatMissingItemsText($missingItems),
@@ -1031,10 +1342,46 @@ class AdministratorController extends BaseController
             }
 
             $subject = "Reminder: Complete submissions for {$sectionName}";
+            $progressNote = '';
+            if (in_array('class progress', $missingItems, true)) {
+                $progressNote = "<p>Class progress submissions can be updated at <a href=\"{$progressUrl}\">Teacher Progress History</a>.</p>";
+            }
+            $examDraftNote = '';
+            if (in_array('exam draft', $missingItems, true)) {
+                $semesterLabel = strtolower(trim((string) $semester));
+                if ($semesterLabel === 'fall') {
+                    $draftLabel = 'midterm exam draft';
+                } elseif ($semesterLabel === 'spring') {
+                    $draftLabel = 'final exam draft';
+                } else {
+                    $draftLabel = 'exam draft';
+                }
+                $examDraftNote = "<p>" . ucfirst($draftLabel) . " submissions can be updated at <a href=\"{$examDraftUrl}\">Teacher Exam Drafts</a>.</p>"
+                    . $examDraftDeadlineEmailHtml;
+            }
+            $homeworkNote = '';
+            if (in_array('homework', $missingItems, true)) {
+                $homeworkNote = "<p>Homework scores can be submitted at <a href=\"{$homeworkUrl}\">Teacher Homework</a>.</p>";
+            }
+            $hasScoreItems = (bool) array_intersect($missingItems, [
+                'midterm scores',
+                'midterm comments',
+                'final scores',
+                'final comments',
+                'participation',
+                'PTAP comments',
+                'homework',
+            ]);
+            $nonScoreOnly = ! empty($missingItems) && ! $hasScoreItems;
             $body = "<p>Dear {$teacherName},</p>"
-                . "<p>Administration is gently reminding you to wrap up any remaining score submissions and/or comments for {$sectionName}.</p>"
+                . "<p>Administration is gently reminding you to wrap up any remaining "
+                . ($nonScoreOnly ? "submissions for {$sectionName}." : "score submissions, comments, and related items for {$sectionName}.")
+                . "</p>"
                 . $missingNote
-                . "<p>Visit <a href=\"{$scoreUrl}\">Teacher Score Submission</a> to address any remaining items.</p>"
+                . $progressNote
+                . $examDraftNote
+                . $homeworkNote
+                . ($nonScoreOnly ? '' : "<p>Visit <a href=\"{$scoreUrl}\">Teacher Score Submission</a> to address any remaining items.</p>")
                 . "<p>Thank you,<br>Al Rahma Administration</p>";
 
             $email = $teacher['email'] ?? '';
@@ -1096,6 +1443,170 @@ class AdministratorController extends BaseController
         ];
     }
 
+    private function progressStatus(int $submitted, int $expected): array
+    {
+        if ($expected <= 0) {
+            return [
+                'label' => 'N/A',
+                'badge' => 'bg-secondary',
+                'detail' => '',
+                'completed' => true,
+            ];
+        }
+        $completed = $submitted >= $expected;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => "{$submitted}/{$expected}",
+            'completed' => $completed,
+        ];
+    }
+
+    private function homeworkStatus(int $submitted): array
+    {
+        $completed = $submitted > 0;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => $completed ? (string) $submitted : '0',
+            'completed' => $completed,
+        ];
+    }
+
+    private function draftStatus(int $submitted, ?\DateTimeImmutable $deadline): array
+    {
+        if ($deadline !== null) {
+            $today = new \DateTimeImmutable('today');
+            if ($today < $deadline) {
+                return [
+                    'label' => 'Pending',
+                    'badge' => 'bg-secondary',
+                    'detail' => 'Not due',
+                    'completed' => true,
+                ];
+            }
+        }
+        $completed = $submitted > 0;
+        return [
+            'label' => $completed ? 'Submitted' : 'Missing',
+            'badge' => $completed ? 'bg-success' : 'bg-danger',
+            'detail' => $completed ? (string) $submitted : '0',
+            'completed' => $completed,
+        ];
+    }
+
+    /**
+     * Exam draft due date for the teacher submissions dashboard: prefers the configuration key
+     * `exam_draft_deadline` (same as automated reminders); otherwise fall/spring exam deadlines.
+     */
+    private function resolveTeacherDashboardExamDraftDeadline(string $semester, string $schoolYear): ?\DateTimeImmutable
+    {
+        $fromExamDraftKey = $this->parseExamDraftDeadlineConfigValue();
+        if ($fromExamDraftKey !== null) {
+            return $fromExamDraftKey;
+        }
+
+        return $this->resolveExamDraftDeadline($semester, $schoolYear);
+    }
+
+    /**
+     * Parses the `exam_draft_deadline` configuration value using the application timezone (midnight that calendar day).
+     */
+    private function parseExamDraftDeadlineConfigValue(): ?\DateTimeImmutable
+    {
+        $raw = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        if ($raw === '') {
+            return null;
+        }
+        $tz = new \DateTimeZone(config('App')->appTimezone ?? 'UTC');
+        try {
+            $deadline = new \DateTimeImmutable($raw, $tz);
+        } catch (\Throwable $e) {
+            return null;
+        }
+
+        return $deadline->setTime(0, 0, 0);
+    }
+
+    /**
+     * HTML snippet for reminder emails when exam draft is included (deadline from exam_draft_deadline config).
+     */
+    private function buildExamDraftDeadlineEmailHtml(): string
+    {
+        $raw = trim((string) ($this->configModel->getConfig('exam_draft_deadline') ?? ''));
+        if ($raw === '') {
+            return '';
+        }
+        $parsed = $this->parseExamDraftDeadlineConfigValue();
+        $display = $parsed !== null
+            ? htmlspecialchars($parsed->format('l, F j, Y'), ENT_QUOTES, 'UTF-8')
+            : htmlspecialchars($raw, ENT_QUOTES, 'UTF-8');
+        $rawEsc = htmlspecialchars($raw, ENT_QUOTES, 'UTF-8');
+
+        return '<p><strong>Exam draft submission deadline</strong> (<code>exam_draft_deadline</code>): '
+            . "<strong>{$display}</strong>"
+            . ($parsed !== null && $rawEsc !== $display ? " <span style=\"color:#555;\">(configured value: {$rawEsc})</span>" : '')
+            . '.</p>';
+    }
+
+    private function resolveExamDraftDeadline(string $semester, string $schoolYear): ?\DateTimeImmutable
+    {
+        $semesterKey = strtolower(trim($semester));
+        if ($semesterKey === 'fall') {
+            $deadlineValue = (string)($this->configModel->getConfig('fall_exam_deadline') ?? '');
+        } elseif ($semesterKey === 'spring') {
+            $deadlineValue = (string)($this->configModel->getConfig('spring_exam_deadline') ?? '');
+        } else {
+            return null;
+        }
+        $deadlineValue = trim($deadlineValue);
+        if ($deadlineValue === '') {
+            return null;
+        }
+        try {
+            $deadline = new \DateTimeImmutable($deadlineValue);
+        } catch (\Throwable $e) {
+            return null;
+        }
+        if ($schoolYear !== '' && preg_match('/^\d{4}-\d{4}$/', $schoolYear)) {
+            $deadlineYear = $deadline->format('Y');
+            if ($deadlineYear === '1970') {
+                return null;
+            }
+        }
+        return $deadline->setTime(0, 0, 0);
+    }
+
+    private function resolveExamTermLabel(string $semester): string
+    {
+        $semesterKey = strtolower(trim($semester));
+        if ($semesterKey === '') {
+            return 'midterm';
+        }
+        if (str_contains($semesterKey, 'spring')) {
+            return 'final';
+        }
+        if (str_contains($semesterKey, 'fall')) {
+            return 'midterm';
+        }
+        return 'midterm';
+    }
+
+    private function buildSemesterCandidates(string $semester): array
+    {
+        $semester = trim((string) $semester);
+        if ($semester === '') {
+            return [];
+        }
+        $candidates = [
+            $semester,
+            strtolower($semester),
+            strtoupper($semester),
+            ucfirst(strtolower($semester)),
+        ];
+        $candidates = array_values(array_unique(array_filter($candidates, static fn ($v) => $v !== '')));
+        return $candidates;
+    }
     private function attendanceStatus(bool $submitted): array
     {
         return [
@@ -1105,14 +1616,20 @@ class AdministratorController extends BaseController
         ];
     }
 
-    private function buildMissingItems(array $statusMap): array
+    private function buildMissingItems(array $statusMap, string $semester): array
     {
+        $examTerm = $this->resolveExamTermLabel($semester);
+        $examScoreLabel = $examTerm === 'final' ? 'final scores' : 'midterm scores';
+        $examCommentLabel = $examTerm === 'final' ? 'final comments' : 'midterm comments';
         $labels = [
-            'midterm_score_status' => 'midterm scores',
-            'midterm_comment_status' => 'midterm comments',
+            'midterm_score_status' => $examScoreLabel,
+            'midterm_comment_status' => $examCommentLabel,
             'participation_status' => 'participation',
             'ptap_comment_status' => 'PTAP comments',
             'attendance_status' => 'attendance',
+            'class_progress_status' => 'class progress',
+            'exam_draft_status' => 'exam draft',
+            'homework_status' => 'homework',
         ];
 
         $items = [];

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
-        $this->authorizedUserModel->update($authorizedUser['id'], ['status' => 'Active', 'token' => null]);
+        // Mark the authorized user as active and rotate token for password setup
+        $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()
+    public function savePassword($authorizedUserId = null)
     {
-        // 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 = $this->request->getPost('user_id');
-        $password = $this->request->getPost('password');
+        $userId = (int) $this->request->getPost('user_id');
+        $token  = (string) $this->request->getPost('token');
+        $authorizedUserId = $authorizedUserId !== null ? (int) $authorizedUserId : $userId;
 
-        $model = new UserModel();
-        $user = $model->find($userId);
+        if ($userId <= 0 || $authorizedUserId <= 0 || $userId !== $authorizedUserId) {
+            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
-        $model->update($userId, ['password' => password_hash($password, PASSWORD_DEFAULT)]);
+        $password = (string) $this->request->getPost('password');
+        $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/DiscountController.php

@@ -750,7 +750,9 @@ class DiscountController extends BaseController
             }
         } catch (\Throwable $e) {}
 
-        $newTotal = round($tuitionSubtotal + $eventSubtotal + $additionalSubtotal, 2);
+        $discountableTotal = $tuitionSubtotal + $additionalSubtotal;
+        $nonDiscountableTotal = $eventSubtotal;
+        $newTotal = round($discountableTotal + $nonDiscountableTotal, 2);
 
         // ---- Payments / Discounts / Refunds ----
         $db        = $this->db;
@@ -794,7 +796,8 @@ class DiscountController extends BaseController
             ->get()->getRowArray();
         $totalRefundPaid = (float)($refundRow['total_refund_paid'] ?? 0);
 
-        $newBalance = max(0.0, $newTotal - $totalDisc - $totalPaid - $totalRefundPaid);
+        $appliedDiscount = min($totalDisc, $discountableTotal);
+        $newBalance = max(0.0, $newTotal - $appliedDiscount - $totalPaid - $totalRefundPaid);
         $newStatus  = ($newBalance <= 0.00001) ? 'Paid' : (($totalPaid > 0) ? 'Partially Paid' : 'Unpaid');
 
         $updateData = [

app/Controllers/View/EmailController.php

@@ -170,6 +170,163 @@ class EmailController extends Controller
         }
     }
 
+    /**
+     * Send one email with a single To recipient and many CC recipients.
+     *
+     * @param string      $recipient
+     * @param string[]    $ccRecipients
+     * @param string      $subject
+     * @param string      $htmlMessage
+     * @param string|null $profile
+     * @param string|null $replyToEmail
+     * @param string|null $replyToName
+     * @param array       $attachments
+     */
+    public function sendEmailWithCc(
+        string $recipient,
+        array $ccRecipients,
+        string $subject,
+        string $htmlMessage,
+        ?string $profile = null,
+        ?string $replyToEmail = null,
+        ?string $replyToName  = null,
+        array $attachments = []
+    ): bool {
+        $ccRecipients = array_values(array_unique(array_filter(array_map(static function ($email) {
+            $email = trim((string) $email);
+            return filter_var($email, FILTER_VALIDATE_EMAIL) ? $email : null;
+        }, $ccRecipients))));
+
+        if ($ccRecipients === []) {
+            return $this->sendEmail($recipient, $subject, $htmlMessage, $profile, $replyToEmail, $replyToName, $attachments);
+        }
+
+        $autoload = APPPATH . '../vendor/autoload.php';
+        if (is_file($autoload)) {
+            require_once $autoload;
+        }
+
+        $profile = $this->resolveProfile($profile);
+        $cfg     = $this->getProfileConfig($profile);
+
+        if (empty($cfg['host']) || empty($cfg['user']) || $cfg['pass'] === '') {
+            log_message('error', "[mail:$profile] Missing SMTP config (host/user/pass). Check .env MAIL_{$this->envKeyFromProfile($profile)}_* or MAIL_DEFAULT_*.");
+            return false;
+        }
+
+        $debugEnabled = (bool) env('MAIL_DEBUG', false);
+        $timeout      = (int) env('MAIL_TIMEOUT', 15);
+        $keepAlive    = (bool) env('MAIL_KEEPALIVE', false);
+        $verifyPeer   = filter_var(env('MAIL_VERIFY_PEER', 'true'), FILTER_VALIDATE_BOOLEAN);
+
+        $targetHost = $cfg['host'];
+        $targetPort = (int) $cfg['port'];
+
+        $resolved = @gethostbyname($targetHost);
+        if (!$resolved || $resolved === $targetHost) {
+            log_message('debug', "[mail:$profile] DNS resolve note: host=$targetHost, resolved=$resolved");
+        }
+
+        $sockOk = @fsockopen($targetHost, $targetPort, $errno, $errstr, 5);
+        if (!$sockOk) {
+            log_message('error', "[mail:$profile] Socket preflight failed to {$targetHost}:{$targetPort} (errno=$errno, err=$errstr). Likely firewall/port/encryption mismatch or wrong host.");
+        } else {
+            fclose($sockOk);
+        }
+
+        $mail = new PHPMailer(true);
+
+        try {
+            if ($debugEnabled) {
+                ob_start();
+            }
+
+            $mail->isSMTP();
+            $mail->Host          = $cfg['host'];
+            $mail->Port          = $cfg['port'];
+            $mail->SMTPAuth      = true;
+            $mail->Username      = $cfg['user'];
+            $mail->Password      = $cfg['pass'];
+            $mail->CharSet       = 'UTF-8';
+            $mail->Timeout       = $timeout;
+            $mail->SMTPKeepAlive = $keepAlive;
+            $mail->SMTPAutoTLS   = true;
+
+            if ($cfg['encryption'] === 'ssl') {
+                $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS;
+            } else {
+                $mail->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
+            }
+
+            $mail->SMTPOptions = [
+                'ssl' => [
+                    'verify_peer'       => $verifyPeer,
+                    'verify_peer_name'  => $verifyPeer,
+                    'allow_self_signed' => !$verifyPeer,
+                ],
+            ];
+
+            $mail->SMTPDebug   = $debugEnabled ? 3 : 0;
+            $mail->Debugoutput = 'error_log';
+
+            $mail->setFrom($cfg['fromEmail'], $cfg['fromName']);
+            if (!empty($cfg['returnPath'])) {
+                $mail->Sender = $cfg['returnPath'];
+            }
+
+            $mail->clearReplyTos();
+            $rtEmail = env('MAIL_DEFAULT_REPLY_TO');
+            $rtName  = env('MAIL_DEFAULT_REPLY_TO_NAME');
+            if (!$rtEmail || !filter_var($rtEmail, FILTER_VALIDATE_EMAIL)) {
+                $rtEmail = $replyToEmail ?: ($cfg['replyTo'] ?: $cfg['fromEmail']);
+            }
+            if (!$rtName) {
+                $rtName = $replyToName ?: ($cfg['replyToName'] ?: $cfg['fromName']);
+            }
+            $rtName = $this->sanitizeReplyToName($rtName, $cfg['fromName']);
+            if ($rtEmail) {
+                $mail->addReplyTo($rtEmail, $rtName);
+            }
+
+            if (!empty($cfg['dkim']['domain']) && !empty($cfg['dkim']['private']) && !empty($cfg['dkim']['selector'])) {
+                $mail->DKIM_domain   = $cfg['dkim']['domain'];
+                $mail->DKIM_private  = $cfg['dkim']['private'];
+                $mail->DKIM_selector = $cfg['dkim']['selector'];
+                $mail->DKIM_identity = $cfg['fromEmail'];
+            }
+
+            $mail->addAddress($recipient);
+            foreach ($ccRecipients as $ccRecipient) {
+                $mail->addCC($ccRecipient);
+            }
+
+            foreach ($attachments as $att) {
+                if (!empty($att['path']) && is_file($att['path'])) {
+                    $mail->addAttachment($att['path'], $att['name'] ?? '');
+                }
+            }
+
+            $mail->isHTML(true);
+            $mail->Subject = $subject;
+            $mail->Body    = $htmlMessage;
+
+            $ok = $mail->send();
+
+            $dbg = $debugEnabled ? (ob_get_clean() ?: '') : '';
+            if ($ok) {
+                log_message('info', "[mail:$profile] Sent to {$recipient} with " . count($ccRecipients) . " CC recipient(s), subj='{$subject}' via {$cfg['host']}:{$cfg['port']}/{$cfg['encryption']}");
+                return true;
+            }
+
+            log_message('error', "[mail:$profile] Failed: {$mail->ErrorInfo}. Debug: {$dbg}");
+            return false;
+        } catch (Exception $e) {
+            $dbg = $debugEnabled ? (ob_get_clean() ?: '') : '';
+            log_message('error', "[mail:$profile] Exception: {$e->getMessage()} | PHPMailer: {$mail->ErrorInfo} | Debug: {$dbg}");
+            return false;
+        }
+    }
+
     /** Resolve null/alias profile names to a canonical env prefix. */
     private function resolveProfile(?string $profile): string
     {

app/Controllers/View/EventController.php

@@ -6,8 +6,18 @@ use App\Models\EventModel;
 use App\Models\EventChargesModel;
 use App\Models\UserModel;
 use App\Models\StudentModel;
+use App\Models\StudentClassModel;
 use App\Models\ConfigurationModel;
 use App\Models\EnrollmentModel;
+use App\Models\InvoiceModel;
+use App\Models\InvoiceEventModel;
+use App\Models\ClassSectionModel;
+use App\Models\ParentModel;
+use App\Models\PaymentModel;
+use App\Models\CalendarModel;
+use App\Services\EmailService;
+use Config\Database;
+#use ??? 
 use App\Controllers\View\InvoiceController;
 use CodeIgniter\RESTful\ResourceController;
 
@@ -19,10 +29,18 @@ class EventController extends ResourceController
     protected $configModel;
     protected $eventModel;
     protected $invoiceController;
+    protected $invoiceModel;
+    protected $invoiceEventModel;
+    protected $studentClassModel;
+    protected $classSectionModel;
+    protected $paymentModel;
+    protected $parentModel;
+    protected $emailService;
     protected $schoolYear;
     protected $semester;
     protected $categories;
     protected $enrollmentModel;
+    private ?bool $eventChargesHasCreatedBy = null;
 
     public function __construct()
     {
@@ -32,7 +50,14 @@ class EventController extends ResourceController
         $this->userModel = new UserModel(); // Add this
         $this->eventModel = new EventModel();
         $this->invoiceController = new InvoiceController();
+        $this->invoiceModel = new InvoiceModel();
+        $this->invoiceEventModel = new InvoiceEventModel();
+        $this->studentClassModel = new StudentClassModel();
+        $this->classSectionModel = new ClassSectionModel();
+        $this->paymentModel = new PaymentModel();
         $this->enrollmentModel = new EnrollmentModel();
+        $this->parentModel = new ParentModel();
+        $this->emailService = new EmailService();
 
         $this->schoolYear = $this->configModel->getConfig('school_year');
         $this->semester = $this->configModel->getConfig('semester');
@@ -44,6 +69,22 @@ class EventController extends ResourceController
         ];
     }
 
+    private function eventChargesSupportsCreatedBy(): bool
+    {
+        if ($this->eventChargesHasCreatedBy !== null) {
+            return $this->eventChargesHasCreatedBy;
+        }
+
+        try {
+            $db = Database::connect();
+            $this->eventChargesHasCreatedBy = $db->fieldExists('created_by', 'event_charges');
+        } catch (\Throwable $e) {
+            $this->eventChargesHasCreatedBy = false;
+        }
+
+        return $this->eventChargesHasCreatedBy;
+    }
+
     public function index()
     {
         $eventModel = new EventModel();
@@ -93,59 +134,52 @@ 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);
+            if ($eventId && $this->request->getPost('add_to_calendar')) {
+                $calendarModel = new CalendarModel();
 
-                $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();
+                $title = trim((string)$this->request->getPost('event_name'));
+                $date  = (string)$this->request->getPost('expiration_date');
+                $schoolYear = (string)$this->request->getPost('school_year');
+                $semester   = (string)$this->request->getPost('semester');
 
-                $parentIds = [];
-                foreach ($enrollments as $row) {
-                    $studentId = (int) ($row['student_id'] ?? 0);
-                    $parentId = (int) ($row['parent_id'] ?? 0);
-                    if ($studentId <= 0 || $parentId <= 0) {
-                        continue;
+                if ($title !== '' && $date !== '' && $schoolYear !== '') {
+                    $data = [
+                        'title'          => $title,
+                        'description'    => (string)$this->request->getPost('description'),
+                        'event_type'     => 'Event',
+                        'date'           => $date,
+                        'notify_parent'  => $this->request->getPost('notify_parent') ? 1 : 0,
+                        'notify_teacher' => $this->request->getPost('notify_teacher') ? 1 : 0,
+                        'notify_admin'   => $this->request->getPost('notify_admin') ? 1 : 0,
+                        'no_school'      => 0,
+                        'school_year'    => $schoolYear,
+                        'semester'       => $semester ?: $this->semester,
+                    ];
+                    if (!$calendarModel->supportsEventType()) {
+                        unset($data['event_type']);
                     }
 
-                    $exists = $this->eventChargesModel
-                        ->where('event_id', $eventId)
-                        ->where('student_id', $studentId)
-                        ->where('school_year', $schoolYear)
-                        ->where('semester', $semester)
-                        ->first();
-
-                    if ($exists) {
-                        continue;
+                    $dupQuery = $calendarModel
+                        ->where('school_year', $data['school_year'])
+                        ->where('date', $data['date'])
+                        ->where('title', $data['title']);
+                    if ($calendarModel->supportsEventType() && isset($data['event_type'])) {
+                        $dupQuery = $dupQuery->where('event_type', $data['event_type']);
+                    }
+                    $existing = $dupQuery->first();
+                    if (!$existing) {
+                        $calendarModel->save($data);
                     }
-
-                    $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');
+            $redirect = redirect()->to('/administrator/events')->with('success', 'Event created successfully');
+            if ($eventId && $this->request->getPost('send_email_parent')) {
+                $emailStatus = $this->broadcastEventToParents((int) $eventId);
+                $redirect = $this->applyEventEmailFlash($redirect, $emailStatus);
+            }
+
+            return $redirect;
         }
 
         return view('administrator/events/create_event', [
@@ -186,7 +220,12 @@ class EventController extends ResourceController
             ]);
 
             if ($updated) {
-                return redirect()->to('/administrator/events')->with('success', 'Event updated successfully');
+                $redirect = redirect()->to('/administrator/events')->with('success', 'Event updated successfully');
+                if ($this->request->getPost('send_email_parent')) {
+                    $emailStatus = $this->broadcastEventToParents((int) $id);
+                    $redirect = $this->applyEventEmailFlash($redirect, $emailStatus);
+                }
+                return $redirect;
             } else {
                 log_message('debug', 'GET detected');
                 return redirect()->back()->with('error', 'Failed to update event');
@@ -199,6 +238,106 @@ class EventController extends ResourceController
         ]);
     }
 
+    private function broadcastEventToParents(int $eventId): array
+    {
+        $event = $this->eventModel->find($eventId);
+        if (!$event) {
+            return ['ok' => false, 'count' => 0, 'message' => 'Event email was skipped because the event could not be loaded.'];
+        }
+
+        $emails = $this->collectParentBroadcastEmails((string) ($event['school_year'] ?? ''));
+        if ($emails === []) {
+            return ['ok' => false, 'count' => 0, 'message' => 'Event email was skipped because no parent email addresses were found.'];
+        }
+
+        $subject = 'School Event: ' . trim((string) ($event['event_name'] ?? 'Upcoming Event'));
+        $innerBody = view('emails/event_broadcast', [
+            'event' => $event,
+            'eventUrl' => base_url('parent/events'),
+            'flyerUrl' => !empty($event['flyer']) ? base_url('uploads/' . ltrim((string) $event['flyer'], '/')) : null,
+        ]);
+        $body = view('emails/_wrap_layout', [
+            'title'     => $subject,
+            'subject'   => $subject,
+            'body_html' => $innerBody,
+        ]);
+
+        $ok = $this->emailService->sendCc($emails, $subject, $body, 'general');
+        $batchCount = $this->emailService->getLastCcBatchCount();
+
+        return [
+            'ok' => $ok,
+            'count' => count($emails),
+            'batches' => $batchCount,
+            'message' => $ok
+                ? 'Event email was sent in ' . $batchCount . ' CC batch(es) for ' . count($emails) . ' recipient(s).'
+                : 'The event was saved, but sending the parent CC email failed.',
+        ];
+    }
+
+    private function collectParentBroadcastEmails(string $schoolYear = ''): array
+    {
+        $emails = [];
+
+        $db = Database::connect();
+
+        $parentRole = $db->table('roles')
+            ->select('id')
+            ->where('LOWER(name)', 'parent')
+            ->get()
+            ->getRow();
+
+        if ($parentRole) {
+            $firstParentQuery = $db->table('users')
+                ->select('users.email')
+                ->join('user_roles', 'user_roles.user_id = users.id')
+                ->where('user_roles.role_id', (int) $parentRole->id)
+                ->where('users.email IS NOT NULL', null, false)
+                ->where('users.email !=', '');
+
+            if ($schoolYear !== '' && $db->fieldExists('school_year', 'users')) {
+                $firstParentQuery->where('users.school_year', $schoolYear);
+            }
+
+            foreach ($firstParentQuery->get()->getResultArray() as $row) {
+                $email = trim((string) ($row['email'] ?? ''));
+                if ($email !== '' && filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                    $emails[strtolower($email)] = $email;
+                }
+            }
+        }
+
+        $secondParentQuery = $db->table('parents')
+            ->select('secondparent_email')
+            ->where('secondparent_email IS NOT NULL', null, false)
+            ->where('secondparent_email !=', '');
+
+        if ($schoolYear !== '' && $db->fieldExists('school_year', 'parents')) {
+            $secondParentQuery->where('school_year', $schoolYear);
+        }
+
+        foreach ($secondParentQuery->get()->getResultArray() as $row) {
+            $email = trim((string) ($row['secondparent_email'] ?? ''));
+            if ($email !== '' && filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                $emails[strtolower($email)] = $email;
+            }
+        }
+
+        return array_values($emails);
+    }
+
+    private function applyEventEmailFlash($redirect, array $emailStatus)
+    {
+        if (!empty($emailStatus['message'])) {
+            return $redirect->with(
+                ($emailStatus['ok'] ?? false) ? 'email_status' : 'email_error',
+                $emailStatus['message']
+            );
+        }
+
+        return $redirect;
+    }
+
 
     public function delete($id = null)
     {
@@ -218,6 +357,19 @@ class EventController extends ResourceController
             $parentIds[] = $charge['parent_id'];
         }
 
+        // Also remove any invoice_event rows tied to this event
+        $eventName = $event['event_name'] ?? null;
+        if ($eventName) {
+            $builder = $this->invoiceEventModel->where('event_name', $eventName);
+            if (!empty($event['school_year'])) {
+                $builder->where('school_year', $event['school_year']);
+            }
+            if (!empty($event['semester'])) {
+                $builder->where('semester', $event['semester']);
+            }
+            $builder->delete();
+        }
+
         // Delete event
         $this->eventModel->delete($id);
         
@@ -239,27 +391,102 @@ class EventController extends ResourceController
         $semester = $this->request->getGet('semester') ?? $this->semester;
 
         $parents = $this->userModel->getParents();
-        $events = $this->eventModel->getActiveEvents($this->schoolYear);
+        $events = $this->eventModel->getActiveEvents($schoolYear);
+        $filterEventId = (int) ($this->request->getGet('event_id') ?? 0);
+        $filterParentId = (int) ($this->request->getGet('parent_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();
 
+        foreach ($charges as &$charge) {
+            if (empty($charge['class_section_id']) && !empty($charge['student_id'])) {
+                $sections = $this->studentClassModel->getClassSectionIdsByStudentId(
+                    (int)$charge['student_id'],
+                    $schoolYear
+                );
+                if (!empty($sections)) {
+                    $charge['class_section_id'] = $sections[0];
+                }
+            }
+        }
+        unset($charge);
+
+        $parentBalances = [];
+        try {
+            $balanceRows = $this->invoiceModel
+                ->select('parent_id, COALESCE(SUM(balance),0) AS total_balance')
+                ->where('school_year', $schoolYear)
+                ->where('semester', $semester)
+                ->groupBy('parent_id')
+                ->findAll();
+
+            foreach ($balanceRows as $row) {
+                $parentBalances[(int)($row['parent_id'] ?? 0)] = (float)($row['total_balance'] ?? 0.0);
+            }
+        } catch (\Throwable $e) {
+            log_message('error', 'Failed to load parent balances: ' . $e->getMessage());
+        }
+
+        $sectionIds = array_unique(array_filter(array_column($charges, 'class_section_id')));
+        $classSectionNames = [];
+        if (!empty($sectionIds)) {
+            $sections = $this->classSectionModel
+                ->select('class_section_id, class_section_name')
+                ->whereIn('class_section_id', $sectionIds)
+                ->findAll();
+            foreach ($sections as $section) {
+                $classSectionNames[(int)($section['class_section_id'] ?? 0)] = $section['class_section_name'] ?? '';
+            }
+        }
+
+        $semesterOptions = (new EventChargesModel())
+            ->select('semester')
+            ->distinct()
+            ->orderBy('semester', 'ASC')
+            ->findColumn('semester');
+        $semesterOptions = array_values(array_filter(array_unique($semesterOptions ?? [])));
+        if (empty($semesterOptions)) {
+            $semesterOptions = [$this->semester];
+        }
+
+        $schoolYearOptions = (new EventChargesModel())
+            ->select('school_year')
+            ->distinct()
+            ->orderBy('school_year', 'ASC')
+            ->findColumn('school_year');
+        $schoolYearOptions = array_values(array_filter(array_unique($schoolYearOptions ?? [])));
+        if (empty($schoolYearOptions)) {
+            $schoolYearOptions = [$this->schoolYear];
+        }
+
         return view('administrator/events/event_charges', [
             'charges' => $charges,
             'parents' => $parents,
             'events'  => $events,
             'school_year' => $schoolYear,
             'semester' => $semester,
+            'filterEventId' => $filterEventId,
+            'filterParentId' => $filterParentId,
+            'parentBalances' => $parentBalances,
+            'classSectionNames' => $classSectionNames,
+            'semesterOptions' => $semesterOptions,
+            'schoolYearOptions' => $schoolYearOptions,
         ]);
     }
 
@@ -272,13 +499,24 @@ class EventController extends ResourceController
         $parentId = $this->request->getPost('parent_id');
         $eventId = $this->request->getPost('event_id');
         $participations = $this->request->getPost('participation') ?? [];
+        $externalParticipants = $this->request->getPost('external_participants') ?? [];
 
-        if (!$parentId || !$eventId || empty($participations)) {
+        // Allow "external only" submissions (no enrolled students selected).
+        if (!$eventId || (empty($participations) && empty($externalParticipants))) {
             return redirect()->back()->with('error', 'Missing required information.');
         }
+        if (!empty($participations) && !$parentId) {
+            return redirect()->back()->with('error', 'Select a parent when adding enrolled students.');
+        }
 
         $userId = session()->get('user_id');
         $event = $this->eventModel->getEvent($eventId, $schoolYear);
+        if (!$event) {
+            return redirect()->back()->with('error', 'Selected event not found for the chosen school year.');
+        }
+
+        $parentsForInvoice = [];
+        $supportsCreatedBy = $this->eventChargesSupportsCreatedBy();
 
         foreach ($participations as $studentId => $value) {
             $existing = $this->eventChargesModel->where([
@@ -296,33 +534,392 @@ class EventController extends ResourceController
                 continue;
             }
 
-            // value is 'yes'
+            $sectionIds = $this->studentClassModel->getClassSectionIdsByStudentId($studentId, $schoolYear);
+            $classSectionId = !empty($sectionIds) ? $sectionIds[0] : null;
+
             if ($existing) {
-                $this->eventChargesModel->update($existing['id'], [
-                    'participation' => 'yes',
-                    'charged'       => $event['amount'],
-                    'updated_by'    => $userId
-                ]);
+                $updateData = [
+                    'participation'   => 'yes',
+                    'updated_by'      => $userId,
+                    'class_section_id'=> $classSectionId,
+                ];
+                if (isset($event['amount']) && ((float)$event['amount'] !== (float)($existing['charged'] ?? 0))) {
+                    $updateData['charged'] = $event['amount'];
+                }
+                $this->eventChargesModel->update($existing['id'], $updateData);
+                continue;
             } else {
-                $this->eventChargesModel->insert([
+                $insertData = [
                     'parent_id'     => $parentId,
                     'student_id'    => $studentId,
                     'event_id'      => $eventId,
                     'participation' => 'yes',
                     'charged'       => $event['amount'],
+                    'event_paid'    => 0,
+                    'class_section_id' => $classSectionId,
                     'school_year'   => $schoolYear,
                     'semester'      => $semester,
-                    'created_by'    => $userId,
                     'updated_by'    => $userId
-                ]);
+                ];
+                if ($supportsCreatedBy) {
+                    $insertData['created_by'] = $userId;
+                }
+                $this->eventChargesModel->insert($insertData);
             }
         }
 
-        $this->invoiceController->generateInvoice($parentId);
+        foreach ($externalParticipants as $pieces) {
+            $firstname = $this->normalizeExternalName($pieces['firstname'] ?? '');
+            $lastname = $this->normalizeExternalName($pieces['lastname'] ?? '');
+            $note = trim($pieces['note'] ?? '');
+            $parentFirst = $this->normalizeExternalName($pieces['parent_firstname'] ?? '');
+            $parentLast = $this->normalizeExternalName($pieces['parent_lastname'] ?? '');
+            $parentPhone = trim($pieces['parent_phone'] ?? '');
+            $parentEmail = trim((string)($pieces['parent_email'] ?? ''));
+            $markPaid = (string)($pieces['paid'] ?? '0') === '1';
+
+            if (!$firstname && !$lastname) {
+                continue;
+            }
+
+            $matchedParentId = $this->findExistingParentIdByExternalContact(
+                $parentFirst,
+                $parentLast,
+                $parentEmail,
+                $parentPhone
+            );
+
+            // Match external participants by kid name + event context.
+            // Parent contact info can change (or be fixed later) and should be updated, not used for matching.
+            $matchConditions = [
+                'event_id' => $eventId,
+                'external_firstname' => $firstname,
+                'external_lastname' => $lastname,
+                'school_year' => $schoolYear,
+                'semester' => $semester,
+            ];
+            if ($matchedParentId) {
+                $matchConditions['parent_id'] = $matchedParentId;
+            } else {
+                // External-only parent: match by external parent contact to avoid duplicates.
+                $matchConditions['parent_id'] = null;
+                $matchConditions['external_parent_firstname'] = $parentFirst ?: null;
+                $matchConditions['external_parent_lastname'] = $parentLast ?: null;
+                $matchConditions['external_parent_phone'] = $parentPhone ?: null;
+                $matchConditions['external_parent_email'] = $parentEmail ?: null;
+            }
+            $existingExternal = $this->eventChargesModel->where($matchConditions)->first();
+
+            if ($existingExternal) {
+                $this->eventChargesModel->update($existingExternal['id'], [
+                    'participation' => 'yes',
+                    'charged' => $event['amount'],
+                    'updated_by' => $userId,
+                    // Preserve existing payment status; only update contact fields when provided.
+                    'external_note' => $note !== '' ? $note : ($existingExternal['external_note'] ?? null),
+                    'external_parent_firstname' => $parentFirst !== '' ? $parentFirst : ($existingExternal['external_parent_firstname'] ?? null),
+                    'external_parent_lastname' => $parentLast !== '' ? $parentLast : ($existingExternal['external_parent_lastname'] ?? null),
+                    'external_parent_phone' => $parentPhone !== '' ? $parentPhone : ($existingExternal['external_parent_phone'] ?? null),
+                    'external_parent_email' => $parentEmail !== '' ? $parentEmail : ($existingExternal['external_parent_email'] ?? null),
+                ]);
+                continue;
+            }
+
+            $insertData = [
+                'parent_id' => $matchedParentId ?: null,
+                'student_id' => null,
+                'event_id' => $eventId,
+                'participation' => 'yes',
+                'charged' => $event['amount'],
+                'event_paid' => $markPaid ? 1 : 0,
+                'external_firstname' => $firstname,
+                'external_lastname' => $lastname,
+                'external_note' => $note,
+                'external_parent_firstname' => $parentFirst,
+                'external_parent_lastname' => $parentLast,
+                'external_parent_phone' => $parentPhone,
+                'external_parent_email' => $parentEmail,
+                'school_year' => $schoolYear,
+                'semester' => $semester,
+                'updated_by' => $userId,
+            ];
+            if ($supportsCreatedBy) {
+                $insertData['created_by'] = $userId;
+            }
+            $this->eventChargesModel->insert($insertData);
+
+            $newChargeId = (int)$this->eventChargesModel->getInsertID();
+            if ($markPaid && $newChargeId > 0) {
+                $this->applyEventPaymentStatus($newChargeId, true);
+            }
+
+            if ($matchedParentId && $this->parentHasEnrollment($matchedParentId, (string)$schoolYear)) {
+                $parentsForInvoice[$matchedParentId] = true;
+            }
+        }
+
+        if ($parentId && $this->parentHasEnrollment((int)$parentId, (string)$schoolYear)) {
+            $parentsForInvoice[(int)$parentId] = true;
+        }
+
+        foreach (array_keys($parentsForInvoice) as $pid) {
+            $this->invoiceController->generateInvoice((string)$pid, (string)$schoolYear, (string)$semester, false);
+            $this->fixInvoiceStatusAfterCharge((int)$pid, (string)$schoolYear);
+        }
 
         return redirect()->back()->with('success', 'Event charges updated successfully.');
     }
 
+    public function removeCharge($chargeId = null)
+    {
+        if (!$chargeId) {
+            return redirect()->back()->with('error', 'Invalid charge.');
+        }
+
+        $charge = $this->eventChargesModel->find($chargeId);
+        if (!$charge) {
+            return redirect()->back()->with('error', 'Charge not found.');
+        }
+
+        $paymentId = (int)($charge['event_payment_id'] ?? 0);
+        if ($paymentId > 0) {
+            $this->paymentModel->delete($paymentId);
+        }
+
+        $this->eventChargesModel->delete($chargeId);
+        if (!empty($charge['parent_id']) && $this->parentHasEnrollment((int)$charge['parent_id'], (string)($charge['school_year'] ?? ''))) {
+            $this->invoiceController->generateInvoice((string)$charge['parent_id'], (string)($charge['school_year'] ?? $this->schoolYear), (string)($charge['semester'] ?? $this->semester), false);
+        }
+
+        return redirect()->back()->with('success', 'Participation removed, invoices updated.');
+    }
+
+    public function toggleEventPayment($chargeId = null)
+    {
+        if (!$chargeId) {
+            return redirect()->back()->with('error', 'Invalid charge.');
+        }
+
+        $isPaid = $this->request->getPost('paid') === '1';
+        $meta = $this->applyEventPaymentStatus((int)$chargeId, $isPaid);
+        if (!$meta) {
+            return redirect()->back()->with('error', 'Charge not found.');
+        }
+
+        if (!empty($meta['invoice_id'])) {
+            $this->invoiceController->generateInvoice((string)$meta['parent_id'], (string)$meta['school_year'], (string)($meta['semester'] ?? $this->semester), false);
+            $this->fixInvoiceStatusAfterCharge((int)$meta['parent_id'], (string)$meta['school_year']);
+        }
+
+        return redirect()->back()->with('success', 'Event payment status updated.');
+    }
+
+    private function parentHasEnrollment(int $parentId, string $schoolYear): bool
+    {
+        if ($parentId <= 0 || $schoolYear === '') {
+            return false;
+        }
+
+        try {
+            return $this->enrollmentModel
+                ->where('parent_id', $parentId)
+                ->where('school_year', $schoolYear)
+                ->countAllResults() > 0;
+        } catch (\Throwable $e) {
+            return false;
+        }
+    }
+
+    private function findExistingParentIdByExternalContact(string $first, string $last, string $email, string $phone): ?int
+    {
+        $first = trim($first);
+        $last = trim($last);
+        $email = trim($email);
+        $phoneDigits = preg_replace('/\D+/', '', (string)$phone);
+
+        if ($first === '' || $last === '' || $email === '' || $phoneDigits === '') {
+            return null;
+        }
+
+        try {
+            $db = Database::connect();
+            $expr = "REPLACE(REPLACE(REPLACE(REPLACE(cellphone, '(', ''), ')', ''), '-', ''), ' ', '') =";
+
+            $row = $this->userModel
+                ->select('id')
+                ->where('LOWER(firstname)', strtolower($first))
+                ->where('LOWER(lastname)', strtolower($last))
+                ->where('LOWER(email)', strtolower($email))
+                ->where($expr, $db->escapeString($phoneDigits), false)
+                ->first();
+
+            $id = (int)($row['id'] ?? 0);
+            return $id > 0 ? $id : null;
+        } catch (\Throwable $e) {
+            log_message('error', 'Failed to match external parent to users: ' . $e->getMessage());
+            return null;
+        }
+    }
+
+    private function syncInvoicePaymentSummary(int $invoiceId): void
+    {
+        if ($invoiceId <= 0) {
+            return;
+        }
+
+        $invoice = $this->invoiceModel->find($invoiceId);
+        if (!$invoice) {
+            return;
+        }
+
+        $db = \Config\Database::connect();
+        $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
+
+        $paidSum = 0.0;
+        try {
+            $qb = $db->table('payments')
+                ->select('COALESCE(SUM(paid_amount),0) AS tot')
+                ->where('invoice_id', $invoiceId)
+                ->where('paid_amount >', 0);
+
+            if ($db->fieldExists('status', 'payments')) {
+                $qb->groupStart()
+                    ->whereNotIn('status', $exclude)
+                    ->orWhere('status IS NULL', null, false)
+                    ->groupEnd();
+            }
+            if ($db->fieldExists('is_void', 'payments')) {
+                $qb->groupStart()
+                    ->where('is_void', 0)
+                    ->orWhere('is_void IS NULL', null, false)
+                    ->groupEnd();
+            }
+
+            $row = $qb->get()->getRowArray();
+            $paidSum = (float)($row['tot'] ?? 0.0);
+        } catch (\Throwable $e) {
+            log_message('error', 'Failed to sum payments for invoice ' . $invoiceId . ': ' . $e->getMessage());
+        }
+
+        $discountSum = 0.0;
+        try {
+            $row = $db->table('discount_usages')
+                ->select('COALESCE(SUM(discount_amount),0) AS tot')
+                ->where('invoice_id', $invoiceId)
+                ->get()
+                ->getRowArray();
+            $discountSum = (float)($row['tot'] ?? 0.0);
+        } catch (\Throwable $e) {
+            log_message('error', 'Failed to sum discounts for invoice ' . $invoiceId . ': ' . $e->getMessage());
+        }
+
+        $refundSum = 0.0;
+        try {
+            $row = $db->table('refunds')
+                ->select('COALESCE(SUM(refund_paid_amount),0) AS tot')
+                ->where('invoice_id', $invoiceId)
+                ->whereIn('status', ['Partial', 'Paid'])
+                ->get()
+                ->getRowArray();
+            $refundSum = (float)($row['tot'] ?? 0.0);
+        } catch (\Throwable $e) {
+            log_message('error', 'Failed to sum refunds for invoice ' . $invoiceId . ': ' . $e->getMessage());
+        }
+
+        $total = (float)($invoice['total_amount'] ?? 0.0);
+        $newBalance = round($total - $discountSum - $refundSum - $paidSum, 2);
+        $newStatus = ($newBalance <= 0.00001)
+            ? 'Paid'
+            : (($paidSum > 0) ? 'Partially Paid' : 'Unpaid');
+
+        $this->invoiceModel->update($invoiceId, [
+            'paid_amount' => $paidSum,
+            'balance' => $newBalance,
+            'status' => $newStatus,
+            'updated_at' => utc_now(),
+        ]);
+    }
+
+    private function applyEventPaymentStatus(int $chargeId, bool $isPaid): ?array
+    {
+        if ($chargeId <= 0) {
+            return null;
+        }
+
+        $charge = $this->eventChargesModel->find($chargeId);
+        if (!$charge) {
+            return null;
+        }
+
+        $event = $this->eventModel->find($charge['event_id']);
+        $eventAmount = max(0.0, (float)($event['amount'] ?? 0));
+        $paymentId = (int)($charge['event_payment_id'] ?? 0);
+
+        $parentId = (int)($charge['parent_id'] ?? 0);
+        $schoolYear = (string)($charge['school_year'] ?? $this->schoolYear);
+        $semester = (string)($charge['semester'] ?? $this->semester);
+
+        if ($parentId > 0 && $eventAmount > 0) {
+            $hasEnrollment = $this->parentHasEnrollment($parentId, $schoolYear);
+            $invoiceQuery = $this->invoiceModel
+                ->where('parent_id', $parentId)
+                ->where('school_year', $schoolYear)
+                ->orderBy('id', 'DESC');
+            $invoice = $invoiceQuery->first();
+
+            if (!$invoice && $hasEnrollment) {
+                $this->invoiceController->generateInvoice((string)$parentId, $schoolYear, $semester, false);
+                $invoice = $invoiceQuery->first();
+            }
+
+            if ($invoice) {
+                $invoiceId = (int)($invoice['id'] ?? 0);
+                if ($invoiceId > 0) {
+                    $this->syncInvoicePaymentSummary($invoiceId);
+                    $invoice = $this->invoiceModel->find($invoiceId) ?? $invoice;
+                }
+
+                if ($isPaid && !$paymentId) {
+                    $paymentSchoolYear = (string)($invoice['school_year'] ?? $schoolYear);
+                    $paymentSemester = (string)($invoice['semester'] ?? $semester);
+                    $paymentId = (int)($this->createEventPayment(
+                        $parentId,
+                        (int)$invoice['id'],
+                        $eventAmount,
+                        $paymentSchoolYear,
+                        $paymentSemester,
+                        (float)($invoice['total_amount'] ?? 0.0),
+                        (float)($invoice['paid_amount'] ?? 0.0),
+                        (float)($invoice['balance'] ?? 0.0)
+                    ) ?? 0);
+                } elseif (!$isPaid && $paymentId > 0) {
+                    $this->paymentModel->delete($paymentId);
+                    $paymentId = 0;
+                }
+
+                if (!empty($invoiceId)) {
+                    $this->syncInvoicePaymentSummary($invoiceId);
+                }
+            } elseif (!$hasEnrollment) {
+                // External-only parent: do not create an invoice/payment row; just persist the paid flag on the charge.
+                $paymentId = 0;
+            }
+        }
+
+        $this->eventChargesModel->update($chargeId, [
+            'event_paid' => $isPaid ? 1 : 0,
+            'charged' => $eventAmount,
+            'event_payment_id' => $paymentId > 0 ? $paymentId : null,
+        ]);
+
+        return [
+            'parent_id' => $parentId,
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+            'invoice_id' => isset($invoiceId) && $invoiceId > 0 ? $invoiceId : null,
+        ];
+    }
+
 
 
 
@@ -336,10 +933,18 @@ class EventController extends ResourceController
         $students = $this->studentModel->where('parent_id', $parentId)->findAll();
 
         // Get student_ids that already have charges
-        $chargedStudentIds = $this->eventChargesModel
+        $eventId = $this->request->getGet('event_id');
+
+        $chargesBuilder = $this->eventChargesModel
             ->where('parent_id', $parentId)
             ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
+            ->where('school_year', $schoolYear);
+
+        if (!empty($eventId)) {
+            $chargesBuilder->where('event_id', $eventId);
+        }
+
+        $chargedStudentIds = $chargesBuilder
             ->groupBy('student_id')
             ->select('student_id')
             ->findColumn('student_id');
@@ -356,5 +961,98 @@ class EventController extends ResourceController
         return $this->response->setJSON($data);
     }
 
+    private function createEventPayment(
+        int $parentId,
+        int $invoiceId,
+        float $amount,
+        string $schoolYear,
+        ?string $semester,
+        float $invoiceTotal = 0.0,
+        float $invoicePaid = 0.0,
+        float $invoiceBalance = 0.0
+    ): ?int
+    {
+        if ($amount <= 0 || $invoiceId <= 0 || $parentId <= 0) {
+            return null;
+        }
+
+        $monthSemester = $semester ?: $this->semester;
+        $newPaid = (float)$invoicePaid + $amount;
+        $newBalance = (float)$invoiceBalance - $amount;
+        $paymentStatus = ($newBalance <= 0.00001)
+            ? 'Paid'
+            : (($newPaid > 0) ? 'Partially Paid' : 'Unpaid');
+
+        $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
+        $priorCount = $this->paymentModel
+            ->where('invoice_id', $invoiceId)
+            ->where('paid_amount >', 0)
+            ->whereNotIn('status', $exclude)
+            ->countAllResults();
+        $installmentSeq = $priorCount + 1;
+
+        $data = [
+            'parent_id' => $parentId,
+            'invoice_id' => $invoiceId,
+            'total_amount' => $invoiceTotal > 0 ? $invoiceTotal : $amount,
+            'paid_amount' => $amount,
+            'balance' => $newBalance,
+            'number_of_installments' => $installmentSeq,
+            'payment_method' => 'cash',
+            'payment_date' => utc_now(),
+            'school_year' => $schoolYear,
+            'semester' => $monthSemester,
+            'status' => $paymentStatus,
+            'transaction_id' => $this->paymentModel->generateNewTransactionId(),
+            'updated_by' => session()->get('user_id'),
+        ];
+
+        if (!$this->paymentModel->insert($data)) {
+            log_message('error', 'Failed to insert event payment: ' . json_encode($this->paymentModel->errors()));
+            return null;
+        }
+
+        return (int)$this->paymentModel->getInsertID();
+    }
+
+    private function normalizeExternalName(?string $value): string
+    {
+        $raw = trim((string)$value);
+        if ($raw === '') {
+            return '';
+        }
+        $parts = preg_split('/\s+/', $raw);
+        $formatted = array_map(function ($part) {
+            $part = trim($part);
+            if ($part === '') {
+                return '';
+            }
+            return mb_strtoupper(mb_substr($part, 0, 1)) . mb_strtolower(mb_substr($part, 1));
+        }, $parts);
+        return implode(' ', array_filter($formatted, fn($p) => $p !== ''));
+    }
+
+    private function fixInvoiceStatusAfterCharge($parentId, $schoolYear)
+    {
+        if (!$parentId || !$schoolYear) {
+            return;
+        }
+
+        $invoices = $this->invoiceModel
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->findAll();
+
+        foreach ($invoices as $invoice) {
+            $status = strtolower(trim($invoice['status'] ?? ''));
+            $balance = (float)($invoice['balance'] ?? 0.0);
+
+            if ($balance <= 0.00001 && $status !== 'paid') {
+                $this->invoiceModel->update($invoice['id'], ['status' => 'Paid']);
+            } elseif ($status === 'paid' && $balance > 0) {
+                $this->invoiceModel->update($invoice['id'], ['status' => 'Unpaid']);
+            }
+        }
+    }
 
 }

app/Controllers/View/FamilyAdminController.php

@@ -406,4 +406,82 @@ class FamilyAdminController extends BaseController
 
         return service('response')->setBody(view('family/card', ['f' => $family]));
     }
+
+    public function composeEmail()
+    {
+        $to = trim((string)$this->request->getGet('to'));
+        $name = trim((string)$this->request->getGet('name'));
+        $returnUrl = trim((string)$this->request->getGet('return_url'));
+        if ($returnUrl === '') {
+            $returnUrl = trim((string)$this->request->getServer('HTTP_REFERER'));
+        }
+        if ($returnUrl === '') {
+            $returnUrl = site_url('family');
+        }
+
+        return view('family/compose_email', [
+            'to' => $to,
+            'name' => $name,
+            'return_url' => $returnUrl,
+        ]);
+    }
+
+    public function sendComposeEmail()
+    {
+        if (!$this->request->is('post')) {
+            return redirect()->to(site_url('family'));
+        }
+
+        $to = trim((string)$this->request->getPost('to'));
+        $subject = trim((string)$this->request->getPost('subject'));
+        $html = (string)($this->request->getPost('html') ?? '');
+        $returnUrl = trim((string)$this->request->getPost('return_url'));
+
+        if ($returnUrl === '' || !$this->isLocalReturnUrl($returnUrl)) {
+            $returnUrl = site_url('family');
+        }
+
+        if ($to === '' || !filter_var($to, FILTER_VALIDATE_EMAIL)) {
+            return redirect()->back()->withInput()->with('error', 'Please enter a valid email address.');
+        }
+        if ($subject === '') {
+            return redirect()->back()->withInput()->with('error', 'Subject is required.');
+        }
+        if (trim($html) === '') {
+            return redirect()->back()->withInput()->with('error', 'Email body is required.');
+        }
+
+        $wrapped = view('emails/custom_html', [
+            'subject' => $subject,
+            'body_html' => $html,
+        ]);
+
+        $mailer = new \App\Controllers\View\EmailController();
+        $ok = $mailer->sendEmail($to, $subject, $wrapped, 'communication');
+
+        if ($ok) {
+            return redirect()->to($returnUrl)->with('status', 'Email sent.');
+        }
+
+        return redirect()->to($returnUrl)->with('error', 'Unable to send email.');
+    }
+
+    private function isLocalReturnUrl(string $url): bool
+    {
+        $url = trim($url);
+        if ($url === '') return false;
+
+        $parts = parse_url($url);
+        if ($parts === false) return false;
+
+        if (!empty($parts['scheme']) || !empty($parts['host'])) {
+            $base = parse_url(site_url('/'));
+            if (!$base || empty($base['host'])) return false;
+            $hostMatch = strcasecmp((string)($parts['host'] ?? ''), (string)$base['host']) === 0;
+            return $hostMatch;
+        }
+
+        // Relative URL (e.g., /family?x=1 or family?x=1)
+        return true;
+    }
 }

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

@@ -68,17 +68,45 @@ public function financialReport()
     }
 
     // === Invoices ===
-    $invoices = $invoiceModel
-        ->select("invoices.*, CONCAT(users.firstname, ' ', users.lastname) AS parent_name")
-        ->join('users', 'users.id = invoices.parent_id')
-        ->findAll();
+    // Business rule: one active invoice per parent per school year.
+    // If legacy data has multiple invoices, show only the latest one to avoid reporting older invoices as "Unpaid"
+    // after new charges/payments update the current invoice.
+    $db = \Config\Database::connect();
+    if (!empty($schoolYear)) {
+        $latestSub = $db->table('invoices')
+            ->select('parent_id, MAX(id) AS max_id')
+            ->where('school_year', $schoolYear)
+            ->groupBy('parent_id')
+            ->getCompiledSelect();
+
+        $invBuilder = $db->table('invoices')
+            ->select("invoices.*, CONCAT(users.firstname, ' ', users.lastname) AS parent_name", false)
+            ->join("($latestSub) latest", 'latest.max_id = invoices.id', 'inner', false)
+            ->join('users', 'users.id = invoices.parent_id', 'left');
+
+        if ($hasFrom) {
+            $invBuilder->where('DATE(COALESCE(invoices.issue_date, invoices.created_at)) >=', $dateFrom);
+        }
+        if ($hasTo) {
+            $invBuilder->where('DATE(COALESCE(invoices.issue_date, invoices.created_at)) <=', $dateTo);
+        }
+
+        $invoices = $invBuilder->get()->getResultArray();
+    } else {
+        $invoices = $invoiceModel
+            ->select("invoices.*, CONCAT(users.firstname, ' ', users.lastname) AS parent_name")
+            ->join('users', 'users.id = invoices.parent_id')
+            ->findAll();
+    }
+
+    $invoiceIds = array_values(array_unique(array_filter(array_map(static function ($inv) {
+        $id = (int)($inv['id'] ?? 0);
+        return $id > 0 ? $id : null;
+    }, $invoices))));
 
     // Helper to build a fresh, filtered PaymentModel each time (so filters don't get lost between queries)
     $buildPaymentModel = function () use ($schoolYear, $dateFrom, $dateTo) {
         $pm = new PaymentModel();
-        if ($schoolYear) {
-            $pm->where('school_year', $schoolYear);
-        }
         if (!empty($dateFrom)) {
             $pm->where('DATE(payment_date) >=', $dateFrom);
         }
@@ -114,7 +142,13 @@ public function financialReport()
     };
 
     // === Payments aggregated by invoice_id (for the "Paid" column) ===
-    $payments = $applyPaymentFilters($buildPaymentModel())
+    $paymentsQuery = $applyPaymentFilters($buildPaymentModel());
+    if (!empty($invoiceIds)) {
+        $paymentsQuery->whereIn('invoice_id', $invoiceIds);
+    } else {
+        $paymentsQuery->where('invoice_id', -1);
+    }
+    $payments = $paymentsQuery
         ->select('invoice_id, SUM(paid_amount) AS paid_amount')
         ->where('invoice_id IS NOT NULL')
         ->groupBy('invoice_id')
@@ -138,6 +172,7 @@ public function financialReport()
             SUM(paid_amount) AS amount
         ")
         ->where('invoice_id IS NOT NULL')
+        ->whereIn('invoice_id', $invoiceIds ?: [-1])
         ->groupBy('invoice_id, method')
         ->findAll();
 
@@ -161,6 +196,7 @@ public function financialReport()
             SUM(CASE WHEN LOWER(TRIM(payment_method)) IN ('credit','card','credit card','debit','debit card','visa','mastercard') THEN paid_amount ELSE 0 END) AS total_credit
         ")
         ->where('invoice_id IS NOT NULL')
+        ->whereIn('invoice_id', $invoiceIds ?: [-1])
         ->first() ?? [];
 
     $paymentTotals = [
@@ -216,25 +252,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([
-            'ok'               => true,
-            'selectedYear'     => $schoolYear,
-            'dateFrom'         => $dateFrom,
-            'dateTo'           => $dateTo,
+      return $this->response->setJSON([
+        'ok'               => true,
+        'selectedYear'     => $schoolYear,
+        'dateFrom'         => $dateFrom,
+        'dateTo'           => $dateTo,
             'schoolYears'      => $schoolYears,
             'invoices'         => $invoices,
             'payments'         => $payments,
             'paymentBreakdown' => $paymentBreakdown,
             'paymentTotals'    => $paymentTotals,
-            'refunds'          => $refunds,
-            'expenses'         => $expenses,
-            'reimbursements'   => $reimbursements,
-            'discounts'        => $discounts,
-            'csrf_token'       => csrf_token(),
-            'csrf_hash'        => csrf_hash(),
-        ]);
+        'refunds'          => $refunds,
+        'expenses'         => $expenses,
+        'reimbursements'   => $reimbursements,
+        'discounts'        => $discounts,
+        'eventFeesTotal'   => $eventFeesTotal,
+        'csrf_token'       => csrf_token(),
+        'csrf_hash'        => csrf_hash(),
+      ]);
     }
 
     return view('payment/financial_report', [
@@ -246,6 +285,7 @@ public function financialReport()
         'expenses'         => $expenses,
         'reimbursements'   => $reimbursements,
         'discounts'        => $discounts,
+        'eventFeesTotal'   => $eventFeesTotal,
         'selectedYear'     => $schoolYear,
         'schoolYears'      => $schoolYears,
         'dateFrom'         => $dateFrom,
@@ -1058,6 +1098,7 @@ public function financialReport()
         $amountCollected = $totalPaid;
         $netAmount = ($totalCharges - $totalDiscounts - $totalRefunds);
 
+        $totalEventFees = $this->getEventFeesTotal($schoolYear, $invoiceDateFrom, $invoiceDateTo);
         return [
             'schoolYear' => $schoolYear,
             'dateFrom' => $dateFrom,
@@ -1073,9 +1114,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 +1286,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 = [];
@@ -1283,10 +1360,11 @@ public function financialReport()
         $parentIds = array_values(array_unique(array_map(static fn($r) => (int)($r['parent_id'] ?? 0), $rows)));
         $hasPayments = [];
         $paidTotals  = [];
+        $paymentCounts = [];
         if (!empty($parentIds)) {
             try {
                 $pRows = $db->table('payments')
-                    ->select('parent_id, SUM(paid_amount) AS total_paid')
+                    ->select('parent_id, SUM(paid_amount) AS total_paid, COUNT(*) AS payment_count')
                     ->whereIn('parent_id', $parentIds)
                     ->where('school_year', $schoolYear)
                     ->groupBy('parent_id')
@@ -1296,6 +1374,7 @@ public function financialReport()
                     if ($pid > 0) {
                         $hasPayments[$pid] = true;
                         $paidTotals[$pid]  = (float)($pr['total_paid'] ?? 0);
+                        $paymentCounts[$pid] = (int)($pr['payment_count'] ?? 0);
                     }
                 }
             } catch (\Throwable $e) {
@@ -1303,7 +1382,7 @@ public function financialReport()
             }
         }
 
-        $dataRows = array_map(function(array $r) use ($hasPayments, $paidTotals, $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 [
@@ -1317,8 +1396,10 @@ public function financialReport()
                 'installment_amount'     => (float)($r['installment_amount'] ?? 0),
                 'type'          => isset($hasPayments[$pid]) ? 'installment' : 'no_payment',
                 'total_paid'    => isset($paidTotals[$pid]) ? (float)$paidTotals[$pid] : 0.0,
+                '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

@@ -28,6 +28,7 @@ use App\Models\PlacementLevelModel;
 use App\Models\PlacementBatchModel;
 use App\Models\PlacementScoreModel;
 use App\Models\GradingLockModel;
+use App\Services\NavbarService;
 
 //use App\Models\ScoreModel;
 
@@ -277,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 = [];
@@ -423,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
@@ -1079,19 +1080,22 @@ class GradingController extends Controller
         $schoolYears = $this->getSchoolYearsForScores($schoolYear);
         $rows = $this->fetchBelowSixtyRows($schoolYear, $semester);
 
+        $canViewGrading = $this->userHasMenuUrl('grading');
+
         return view('grading/below_sixty', [
             'rows' => $rows,
             'semester' => $semester,
             'schoolYear' => $schoolYear,
             'schoolYears' => $schoolYears,
+            'canViewGrading' => $canViewGrading,
         ]);
     }
 
-    public function sendBelowSixtyEmail()
+    public function editBelowSixtyEmail()
     {
-        $studentId = (int)$this->request->getPost('student_id');
-        $semester = trim((string)$this->request->getPost('semester'));
-        $schoolYear = trim((string)$this->request->getPost('school_year'));
+        $studentId = (int)$this->request->getGet('student_id');
+        $semester = trim((string)$this->request->getGet('semester'));
+        $schoolYear = trim((string)$this->request->getGet('school_year'));
 
         if ($studentId <= 0 || $semester === '' || $schoolYear === '') {
             return redirect()->back()->with('error', 'Missing student or term.');
@@ -1103,6 +1107,65 @@ class GradingController extends Controller
         }
 
         $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+        $subject = $this->buildBelowSixtySubject($studentName, $semester, $schoolYear);
+        $parentName = $this->fetchBelowSixtyParentName($studentId);
+
+        $scores = [
+            'homework_avg' => $row['homework_avg'] ?? null,
+            'project_avg' => $row['project_avg'] ?? null,
+            'participation_score' => $row['participation_score'] ?? null,
+            'test_avg' => $row['test_avg'] ?? null,
+            'ptap_score' => $row['ptap_score'] ?? null,
+            'attendance_score' => $row['attendance_score'] ?? null,
+            'midterm_exam_score' => $row['midterm_exam_score'] ?? null,
+            'semester_score' => $row['semester_score'] ?? null,
+        ];
+
+        $emailData = [
+            'title'              => $subject,
+            'parent_name'        => $parentName,
+            'student_name'       => $studentName !== '' ? $studentName : 'your student',
+            'class_section_name' => $row['class_section_name'] ?? '',
+            'semester'           => $semester,
+            'school_year'        => $schoolYear,
+            'scores'             => $scores,
+            'comment'            => $row['comment'] ?? '',
+            'sent_at'            => utc_now(),
+        ];
+
+        $html = view('emails/below_sixty_performance', $emailData, ['saveData' => true]);
+
+        return view('grading/below_sixty_email_editor', [
+            'studentId' => $studentId,
+            'studentName' => $studentName,
+            'semester' => $semester,
+            'schoolYear' => $schoolYear,
+            'subject' => $subject,
+            'html' => $html,
+        ]);
+    }
+
+    public function sendBelowSixtyEmail()
+    {
+        $studentId = (int)$this->request->getPost('student_id');
+        $semester = trim((string)$this->request->getPost('semester'));
+        $schoolYear = trim((string)$this->request->getPost('school_year'));
+        $subjectInput = trim((string)$this->request->getPost('subject'));
+        $htmlInput = (string)($this->request->getPost('html') ?? '');
+
+        if ($studentId <= 0 || $semester === '' || $schoolYear === '') {
+            return redirect()->back()->with('error', 'Missing student or term.');
+        }
+
+        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
+        if (empty($row)) {
+            return redirect()->back()->with('error', 'Student record not found for the selected term.');
+        }
+
+        $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+        $subject = $subjectInput !== ''
+            ? $subjectInput
+            : $this->buildBelowSixtySubject($studentName, $semester, $schoolYear);
         $scores = [
             'homework_avg' => $row['homework_avg'] ?? null,
             'project_avg' => $row['project_avg'] ?? null,
@@ -1122,8 +1185,13 @@ class GradingController extends Controller
             'school_year' => $schoolYear,
             'scores' => $scores,
             'comment' => $row['comment'] ?? '',
+            'subject' => $subject,
         ];
 
+        if (trim($htmlInput) !== '') {
+            $payload['html'] = $htmlInput;
+        }
+
         Events::trigger('below60.email', $payload);
 
         return redirect()->back()->with('status', 'Email sent to parent(s).');
@@ -1148,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)
@@ -1158,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') {
@@ -1178,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'] ?? ''));
@@ -1201,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()
@@ -1487,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([
@@ -1515,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(
@@ -1729,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)
@@ -1742,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,
+                ];
             }
         }
 
@@ -1750,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);
 
@@ -1799,6 +1906,91 @@ class GradingController extends Controller
         return $row;
     }
 
+    private function userHasMenuUrl(string $needle): bool
+    {
+        $needle = strtolower(trim($needle));
+        if ($needle === '') {
+            return false;
+        }
+
+        $rawRole = session()->get('role');
+        $roles = is_array($rawRole) ? $rawRole : [$rawRole ?? 'guest'];
+        $roles = array_values(array_filter(array_map('strval', $roles)));
+        if (empty($roles)) {
+            return false;
+        }
+
+        $service = new NavbarService();
+        $menu = $service->getMenuForRoles($roles);
+        if (empty($menu)) {
+            return false;
+        }
+
+        $normalize = static function (string $url) use ($needle): string {
+            $url = strtolower(trim($url));
+            if ($url === '') return '';
+            $url = preg_replace('#^https?://[^/]+/#i', '', $url);
+            $url = ltrim($url, '/');
+            return $url;
+        };
+
+        $target = $normalize($needle);
+        $stack = $menu;
+        while (!empty($stack)) {
+            $node = array_shift($stack);
+            if (!empty($node['url'])) {
+                $url = $normalize((string)$node['url']);
+                if ($url !== '' && $url === $target) {
+                    return true;
+                }
+            }
+            if (!empty($node['children']) && is_array($node['children'])) {
+                foreach ($node['children'] as $child) {
+                    $stack[] = $child;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private function fetchBelowSixtyParentName(int $studentId): string
+    {
+        $parentName = 'Parent/Guardian';
+        try {
+            $rows = $this->db->query(
+                "SELECT u.firstname, u.lastname
+                   FROM family_students fs
+                   JOIN family_guardians fg ON fg.family_id = fs.family_id
+                   JOIN users u ON u.id = fg.user_id
+                  WHERE fs.student_id = ?
+                  ORDER BY fg.is_primary DESC, u.lastname, u.firstname
+                  LIMIT 1",
+                [$studentId]
+            )->getResultArray();
+            if (!empty($rows[0])) {
+                $candidate = trim((string)($rows[0]['firstname'] ?? '') . ' ' . (string)($rows[0]['lastname'] ?? ''));
+                if ($candidate !== '') {
+                    $parentName = $candidate;
+                }
+            }
+        } catch (\Throwable $e) {
+        }
+        return $parentName;
+    }
+
+    private function buildBelowSixtySubject(string $studentName, string $semester, string $schoolYear): string
+    {
+        $subject = 'Student Performance Alert';
+        if ($studentName !== '') {
+            $subject .= ' — ' . $studentName;
+        }
+        if ($semester !== '' || $schoolYear !== '') {
+            $subject .= ' (' . trim($semester . ' ' . $schoolYear) . ')';
+        }
+        return $subject;
+    }
+
     private function fetchBelowSixtyMeetingContext(int $studentId, string $schoolYear, string $semester): array
     {
         $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);

app/Controllers/View/HomeworkController.php

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

app/Controllers/View/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/InvoiceController.php

@@ -381,18 +381,24 @@ class InvoiceController extends ResourceController
         return false;
     }
 
-    public function generateInvoice(string $parentId = null)
+    public function generateInvoice(
+        string $parentId = null,
+        ?string $schoolYearOverride = null,
+        ?string $semesterOverride = null,
+        bool $recalculateDiscounts = true
+    )
     {
         $isAjax = $this->request->isAJAX() || str_contains(strtolower($this->request->getHeaderLine('Accept')), 'application/json');
         if ($parentId == null) {
             $parentId = (int)$this->request->getPost('parent_id');
         }
-        $schoolYear = (string) $this->schoolYear;
+        $schoolYear = (string) ($schoolYearOverride ?: $this->schoolYear);
+        $semester = (string) ($semesterOverride ?: $this->semester);
 
         // Fetch enrolled + withdrawn students
         $enrollments = $this->enrollmentModel
             ->where('parent_id', $parentId)
-            ->where('school_year', $this->schoolYear)
+            ->where('school_year', $schoolYear)
             ->findAll();
 
         if (empty($enrollments)) {
@@ -444,21 +450,23 @@ class InvoiceController extends ResourceController
         $tuitionFee = $fees['tuition_fee'];
 
         // ✅ Fetch event charges
-        $eventsList = $this->chargesModel->getChargesWithEventInfo($parentId, $this->schoolYear);
+        $eventsList = $this->chargesModel->getChargesWithEventInfo($parentId, $schoolYear);
         $eventchargeTotal = array_sum(array_column($eventsList, 'charged'));
 
-        $totalDiscount = $this->recalculateAndUpdateDiscount(
-            $parentId,
-            $this->schoolYear,
-            $tuitionFee,
-            $enrollments
-        );
+        $totalDiscount = 0.0;
+        if ($recalculateDiscounts) {
+            $totalDiscount = $this->recalculateAndUpdateDiscount(
+                $parentId,
+                $schoolYear,
+                $tuitionFee,
+                $enrollments
+            );
+        }
 
-        $semester = $this->semester;
         // ✅ Refunds PAID to the parent for this year (Partial/Paid)
-        $refundPaid = (float) $this->refundModel->getTotalApprovedRefundByParentIdAndSchoolYear($parentId, $this->schoolYear);
+        $refundPaid = (float) $this->refundModel->getTotalApprovedRefundByParentIdAndSchoolYear($parentId, $schoolYear);
 
-        $totalPaid = $this->paymentModel->getTotalPaidByParentId($parentId, $this->schoolYear);
+        $totalPaid = $this->paymentModel->getTotalPaidByParentId($parentId, $schoolYear);
 
         $discountedTuition = max(0, $tuitionFee);
         $totalAmount = $discountedTuition + $eventchargeTotal;
@@ -469,17 +477,22 @@ class InvoiceController extends ResourceController
             - $refundPaid              // approved refunds paid to parent
             - $totalPaid;              // payments received
 
-        // Your invoice fetch
-        $existingInvoices = $this->invoiceModel->getInvoicesByParentId($parentId, $this->schoolYear);
+        // Business rule: single invoice per parent per school year.
+        // If legacy duplicates exist, prefer the invoice that already has a discount applied,
+        // otherwise use the latest invoice for the parent/year.
+        $invoice = $this->selectActiveInvoiceForParentYear((int)$parentId, $schoolYear);
 
         $updated = false;
-
         $updatedIds = [];
-        if (!empty($existingInvoices)) {
-            foreach ($existingInvoices as $invoice) {
-                if (!isset($invoice['id'])) {
-                    continue;
-                }
+        if (!empty($invoice) && isset($invoice['id'])) {
+            $paymentExclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
+            $paymentsHasStatus = false;
+            $paymentsHasVoid = false;
+            try {
+                $paymentsHasStatus = $this->db->fieldExists('status', 'payments');
+                $paymentsHasVoid = $this->db->fieldExists('is_void', 'payments');
+            } catch (\Throwable $e) {
+            }
 
                 // Preserve applied additional charges and recalc this invoice only
                 $extrasSum = 0.0;
@@ -487,7 +500,7 @@ class InvoiceController extends ResourceController
                     $rows = $this->db->table('additional_charges')
                         ->select('charge_type, amount')
                         ->where('invoice_id', (int)$invoice['id'])
-                        ->where('school_year', $this->schoolYear)
+                        ->where('school_year', $schoolYear)
                         ->where('status', 'applied')
                         ->get()->getResultArray();
                     foreach ($rows as $r) {
@@ -520,7 +533,7 @@ class InvoiceController extends ResourceController
                     $r = $this->db->table('refunds')
                         ->select('COALESCE(SUM(refund_paid_amount),0) AS tot')
                         ->where('invoice_id', (int)$invoice['id'])
-                        ->where('school_year', $this->schoolYear)
+                        ->where('school_year', $schoolYear)
                         ->whereIn('status', ['Partial','Paid'])
                         ->get()->getRowArray();
                     $invRefunds = (float)($r['tot'] ?? 0.0);
@@ -528,8 +541,33 @@ class InvoiceController extends ResourceController
                     log_message('error', 'refund sum failed for invoice ' . (int)$invoice['id'] . ': ' . $e->getMessage());
                 }
 
-                // Payments recorded on this invoice (denormalized field kept in sync by PaymentController)
-                $paidOnInv  = (float)($invoice['paid_amount'] ?? 0.0);
+                // Payments recorded on this invoice (sum payments to avoid stale invoice.paid_amount)
+                $paidOnInv = 0.0;
+                try {
+                    $qb = $this->db->table('payments')
+                        ->select('COALESCE(SUM(paid_amount),0) AS tot')
+                        ->where('invoice_id', (int)$invoice['id'])
+                        ->where('paid_amount >', 0);
+
+                    if ($paymentsHasStatus) {
+                        $qb->groupStart()
+                            ->whereNotIn('status', $paymentExclude)
+                            ->orWhere('status IS NULL', null, false)
+                            ->groupEnd();
+                    }
+                    if ($paymentsHasVoid) {
+                        $qb->groupStart()
+                            ->where('is_void', 0)
+                            ->orWhere('is_void IS NULL', null, false)
+                            ->groupEnd();
+                    }
+
+                    $row = $qb->get()->getRowArray();
+                    $paidOnInv = (float)($row['tot'] ?? 0.0);
+                } catch (\Throwable $e) {
+                    log_message('error', 'payment sum failed for invoice ' . (int)$invoice['id'] . ': ' . $e->getMessage());
+                    $paidOnInv = (float)($invoice['paid_amount'] ?? 0.0);
+                }
 
                 $newBalance = $newTotal - $invDiscount - $invRefunds - $paidOnInv;
                 $newStatus  = ($newBalance <= 0.00001)
@@ -547,7 +585,6 @@ class InvoiceController extends ResourceController
                 $updatedIds[] = (int)$invoice['id'];
                 log_message('info', "Updated invoice ID {$invoice['id']} for parent ID {$parentId}.");
                 $updated = true;
-            }
         } else {
             // Generate invoice number
             $schoolId = $this->userModel->getSchoolIdByUserId($parentId);
@@ -578,7 +615,7 @@ class InvoiceController extends ResourceController
                 // Initial balance equals the created total; discounts/refunds/payments will adjust later
                 'balance'        => $totalAmount,
                 'status'         => 'Unpaid',
-                'school_year'    => $this->schoolYear,
+                'school_year'    => $schoolYear,
                 'semester'       => $semester,
                 'issue_date'     => $issueUtc,
                 'due_date'       => $dueUtc,
@@ -615,6 +652,47 @@ class InvoiceController extends ResourceController
             ->with('success', $updated ? 'Invoice updated.' : 'Invoice created.');
     }
 
+    private function selectActiveInvoiceForParentYear(int $parentId, string $schoolYear): ?array
+    {
+        if ($parentId <= 0 || $schoolYear === '') {
+            return null;
+        }
+
+        // Prefer invoices flagged as having discounts.
+        $invoice = $this->invoiceModel
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->where('has_discount', 1)
+            ->orderBy('id', 'DESC')
+            ->first();
+        if (!empty($invoice)) {
+            return $invoice;
+        }
+
+        // Fallback: prefer invoices with discount_usages rows.
+        try {
+            $row = $this->db->table('invoices i')
+                ->select('i.*')
+                ->join('discount_usages du', 'du.invoice_id = i.id', 'inner')
+                ->where('i.parent_id', $parentId)
+                ->where('i.school_year', $schoolYear)
+                ->orderBy('i.id', 'DESC')
+                ->get()
+                ->getRowArray();
+            if (!empty($row)) {
+                return $row;
+            }
+        } catch (\Throwable $e) {
+        }
+
+        // Final fallback: latest invoice for parent/year.
+        return $this->invoiceModel
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->orderBy('id', 'DESC')
+            ->first();
+    }
+
     private function recalculateAndUpdateDiscount(
         int $parentId,
         string $schoolYear,
@@ -678,7 +756,7 @@ class InvoiceController extends ResourceController
                 log_message('error', 'additional_charges sum failed for discount recalculation invoice ' . (int)$invoice['id'] . ': ' . $e->getMessage());
             }
 
-            $baseTotal = round($tuitionFee + $eventchargeTotal + $extrasSum, 2);
+            $baseTotal = round($tuitionFee + $extrasSum, 2);
 
             // Recalculate discount
             if ($discountUsage['discount_type'] === 'percent') {
@@ -1266,6 +1344,12 @@ class InvoiceController extends ResourceController
                     }
                 }
             }
+            if ($studentName === 'N/A') {
+                $externalName = trim((string)($event['external_firstname'] ?? '') . ' ' . (string)($event['external_lastname'] ?? ''));
+                if ($externalName !== '') {
+                    $studentName = $externalName . ' (external)';
+                }
+            }
 
             $dt        = $toLocal($event['created_at'] ?? null, false);
             $amount    = (float)($event['charged'] ?? 0.0);
@@ -1612,12 +1696,24 @@ private function getGradeLevel($grade): array
             $invoice['last_payment_date'] = $lastPayments[$invoice['id']]['last_payment_date'] ?? null;
         }
 
+        $invoiceEventCharges = [];
+        foreach ($invoices as $invoice) {
+            $year = $invoice['school_year'] ?? $this->schoolYear;
+            $sem = $invoice['semester'] ?? $this->semester;
+            $invoiceEventCharges[(int)$invoice['id']] = $this->chargesModel->getChargesWithEventInfo(
+                $invoice['parent_id'],
+                $year,
+                $sem
+            );
+        }
+
         return view('/parent/invoice_payment', [
             'invoices' => $invoices,
             'schoolYears' => $schoolYears,
             'selectedYear' => $selectedYear,
             'currentSchoolYear' => $currentSchoolYear,
-            'dueDate' => $this->dueDate
+            'dueDate' => $this->dueDate,
+            'invoiceEventCharges' => $invoiceEventCharges,
         ]);
     }
 

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
-        return session()->get('user_role', 'guest'); // Default to guest if not set
+        $active = session()->get('active_role');
+        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
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
+        $studentClasses = $studentClassModel->getClassStudents($classSectionId, $this->schoolYear, null);
         $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)
-            if (!empty($existingUser['token']) && $existingUser['is_verified'] == 0) {
-                // 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.');
-            }
+            return redirect()->back()->withInput()->with('error',
+                'This email address is already registered. Please check your email or log in.');
         }
 
         /* ───────────── 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,
-        spring.semester_score as spring_score');
-        // Also select class section for per-class trophy decision
-        $builder->select('sc.class_section_id as class_section_id');
+        MAX(fall.semester_score) as fall_score,
+        MAX(spring.semester_score) as spring_score');
+        // Reduce duplication from restored students while keeping a stable class section.
+        $builder->select('MAX(sc.class_section_id) as class_section_id');
         $yearEsc = $this->db->escape($selectedYear);
         $builder->join('student_class sc', 'sc.student_id = s.id AND sc.school_year = ' . $yearEsc, 'left');
         $builder->join('classSection cs', 'cs.class_section_id = sc.class_section_id', 'left');

app/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
-        $classSections = $classSectionModel
-            ->where('school_year', $schoolYear)
-            ->orderBy('class_section_name', 'ASC')
-            ->findAll();
-        if (empty($classSections)) {
+        // Prefer class sections for the selected year if the column exists, otherwise fallback to all.
+        if ($this->db->fieldExists('school_year', 'classSection')) {
+            $classSections = $classSectionModel
+                ->where('school_year', $schoolYear)
+                ->orderBy('class_section_name', 'ASC')
+                ->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 ---
-        if (!$user) {
-            session()->setFlashdata('error', 'If this email is registered, you will receive a reset link.');
-            log_message('info', "Password reset requested for non-existing user {$email}");
-            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}");
+        // --- Handle unknown or unverified email ---
+        if (!$user || (int) $user['is_verified'] === 0) {
+            session()->setFlashdata('success', 'If this email is registered, you will receive a reset link.');
+            log_message('info', "Password reset requested for {$email} (user missing or unverified).");
             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.');
 
-
-        $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');
@@ -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'].
-        $this->userModel->update($userId, ['role' => $roleKey]);
+        // Store the canonical name to avoid arbitrary role strings.
+        $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-10-000005_AddBelowSixtyNavItem.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddBelowSixtyNavItem extends Migration
+{
+    public function up()
+    {
+        $db = \Config\Database::connect();
+
+        if (!$db->tableExists('nav_items')) {
+            return;
+        }
+
+        $parentColumn = null;
+        if ($db->fieldExists('menu_parent_id', 'nav_items')) {
+            $parentColumn = 'menu_parent_id';
+        } elseif ($db->fieldExists('parent_id', 'nav_items')) {
+            $parentColumn = 'parent_id';
+        }
+
+        if ($parentColumn === null) {
+            return;
+        }
+
+        $navBuilder = $db->table('nav_items');
+        $now = date('Y-m-d H:i:s');
+
+        $communication = $navBuilder
+            ->select('id')
+            ->where('label', 'Communication')
+            ->where($parentColumn, null)
+            ->get()
+            ->getRowArray();
+
+        if ($communication) {
+            $communicationId = (int) $communication['id'];
+        } else {
+            $navBuilder->insert([
+                $parentColumn => null,
+                'label'        => 'Communication',
+                'url'          => null,
+                'sort_order'   => 80,
+                'is_enabled'   => 1,
+                'created_at'   => $now,
+                'updated_at'   => $now,
+            ]);
+            $communicationId = (int) $db->insertID();
+        }
+
+        $belowSixtyUrl = 'grading/below-60';
+        $existing = $navBuilder->select('id')
+            ->where('url', $belowSixtyUrl)
+            ->get()
+            ->getRowArray();
+
+        if (!$existing) {
+            $navBuilder->insert([
+                $parentColumn => $communicationId ?: null,
+                'label'        => 'Below 60 Summary',
+                'url'          => $belowSixtyUrl,
+                'sort_order'   => 4,
+                'is_enabled'   => 1,
+                'created_at'   => $now,
+                'updated_at'   => $now,
+            ]);
+            $belowSixtyId = (int) $db->insertID();
+        } else {
+            $belowSixtyId = (int) $existing['id'];
+        }
+
+        if (!$db->tableExists('role_nav_items') || !$db->tableExists('roles')) {
+            return;
+        }
+
+        if ($belowSixtyId <= 0) {
+            return;
+        }
+
+        $roleRows = $db->table('roles')
+            ->select('id, name')
+            ->whereIn('name', ['administrator', 'principal', 'vice_principal', 'admin'])
+            ->get()
+            ->getResultArray();
+
+        $roleMap = $db->table('role_nav_items');
+        foreach ($roleRows as $role) {
+            $roleId = (int) ($role['id'] ?? 0);
+            if ($roleId <= 0) {
+                continue;
+            }
+
+            $exists = $roleMap
+                ->where('role_id', $roleId)
+                ->where('nav_item_id', $belowSixtyId)
+                ->get()
+                ->getRowArray();
+
+            if ($exists) {
+                continue;
+            }
+
+            $roleMap->insert([
+                'role_id'     => $roleId,
+                'nav_item_id' => $belowSixtyId,
+                'created_at'  => $now,
+                'updated_at'  => $now,
+            ]);
+        }
+    }
+
+    public function down()
+    {
+        $db = \Config\Database::connect();
+
+        if (!$db->tableExists('nav_items')) {
+            return;
+        }
+
+        $belowSixtyUrl = 'grading/below-60';
+        $row = $db->table('nav_items')
+            ->select('id')
+            ->where('url', $belowSixtyUrl)
+            ->get()
+            ->getRowArray();
+
+        if ($row && $db->tableExists('role_nav_items')) {
+            $db->table('role_nav_items')
+                ->where('nav_item_id', (int) $row['id'])
+                ->delete();
+        }
+
+        $db->table('nav_items')
+            ->where('url', $belowSixtyUrl)
+            ->delete();
+    }
+}

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/Database/Migrations/2026-02-16-000001_AddEventPaidFlagToCharges.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddEventPaidFlagToCharges extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'event_paid' => [
+                'type' => 'TINYINT',
+                'constraint' => 1,
+                'default' => 0,
+                'after' => 'charged',
+            ],
+        ];
+
+        $this->forge->addColumn('event_charges', $fields);
+    }
+
+    public function down()
+    {
+        $this->forge->dropColumn('event_charges', 'event_paid');
+    }
+}

app/Database/Migrations/2026-04-13-000002_AddClassSectionToEventCharges.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddClassSectionToEventCharges extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'class_section_id' => [
+                'type' => 'INT',
+                'constraint' => 11,
+                'unsigned' => true,
+                'null' => true,
+                'after' => 'event_paid',
+            ],
+        ];
+
+        if (! $this->db->fieldExists('class_section_id', 'event_charges')) {
+            $this->forge->addColumn('event_charges', $fields);
+        }
+    }
+
+    public function down()
+    {
+        if ($this->db->fieldExists('class_section_id', 'event_charges')) {
+            $this->forge->dropColumn('event_charges', 'class_section_id');
+        }
+    }
+}

app/Database/Migrations/2026-04-13-000003_AddEventPaymentRefToEventCharges.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddEventPaymentRefToEventCharges extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'event_payment_id' => [
+                'type' => 'INT',
+                'constraint' => 11,
+                'unsigned' => true,
+                'null' => true,
+                'after' => 'class_section_id',
+            ],
+        ];
+
+        if (! $this->db->fieldExists('event_payment_id', 'event_charges')) {
+            $this->forge->addColumn('event_charges', $fields);
+        }
+    }
+
+    public function down()
+    {
+        if ($this->db->fieldExists('event_payment_id', 'event_charges')) {
+            $this->forge->dropColumn('event_charges', 'event_payment_id');
+        }
+    }
+}

app/Database/Migrations/2026-04-13-000004_AddExternalParticipantFieldsToEventCharges.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddExternalParticipantFieldsToEventCharges extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'external_firstname' => [
+                'type' => 'VARCHAR',
+                'constraint' => 150,
+                'null' => true,
+                'after' => 'event_payment_id',
+            ],
+            'external_lastname' => [
+                'type' => 'VARCHAR',
+                'constraint' => 150,
+                'null' => true,
+            ],
+            'external_note' => [
+                'type' => 'VARCHAR',
+                'constraint' => 254,
+                'null' => true,
+            ],
+        ];
+
+        if (! $this->db->fieldExists('external_firstname', 'event_charges')) {
+            $this->forge->addColumn('event_charges', $fields);
+        }
+    }
+
+    public function down()
+    {
+        foreach (['external_firstname', 'external_lastname', 'external_note'] as $field) {
+            if ($this->db->fieldExists($field, 'event_charges')) {
+                $this->forge->dropColumn('event_charges', $field);
+            }
+        }
+    }
+}

app/Database/Migrations/2026-04-13-000005_AddExternalParentInfoToEventCharges.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddExternalParentInfoToEventCharges extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'external_parent_firstname' => [
+                'type' => 'VARCHAR',
+                'constraint' => 150,
+                'null' => true,
+                'after' => 'external_note',
+            ],
+            'external_parent_lastname' => [
+                'type' => 'VARCHAR',
+                'constraint' => 150,
+                'null' => true,
+            ],
+            'external_parent_phone' => [
+                'type' => 'VARCHAR',
+                'constraint' => 50,
+                'null' => true,
+            ],
+        ];
+
+        if (! $this->db->fieldExists('external_parent_firstname', 'event_charges')) {
+            $this->forge->addColumn('event_charges', $fields);
+        }
+    }
+
+    public function down()
+    {
+        foreach (['external_parent_firstname', 'external_parent_lastname', 'external_parent_phone'] as $field) {
+            if ($this->db->fieldExists($field, 'event_charges')) {
+                $this->forge->dropColumn('event_charges', $field);
+            }
+        }
+    }
+}

app/Database/Migrations/2026-04-17-000001_AddExternalParentEmailToEventCharges.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddExternalParentEmailToEventCharges extends Migration
+{
+    public function up()
+    {
+        $fields = [
+            'external_parent_email' => [
+                'type' => 'VARCHAR',
+                'constraint' => 254,
+                'null' => true,
+                'after' => 'external_parent_phone',
+            ],
+        ];
+
+        if (! $this->db->fieldExists('external_parent_email', 'event_charges')) {
+            $this->forge->addColumn('event_charges', $fields);
+        }
+    }
+
+    public function down()
+    {
+        if ($this->db->fieldExists('external_parent_email', 'event_charges')) {
+            $this->forge->dropColumn('event_charges', 'external_parent_email');
+        }
+    }
+}
+

app/Filters/AuthFilter.php

@@ -41,7 +41,13 @@ class AuthFilter implements FilterInterface
 
         // Must be logged in
         if (empty($userRoles) || empty($userId)) {
-            return redirect()->to('/login');
+            $target = ltrim($request->getUri()->getPath(), '/');
+            $query = $request->getUri()->getQuery();
+            if ($query !== '') {
+                $target .= '?' . $query;
+            }
+
+            return redirect()->to('/login?redirect_to=' . rawurlencode('/' . ltrim($target, '/')));
         }
 
         // Enforce 12-hour session lifetime
@@ -110,7 +116,14 @@ class AuthFilter implements FilterInterface
                 ]);
         }
 
-        return redirect()->to('/login')->with('error', 'Your session has expired. Please log in again.');
+        $target = ltrim($request->getUri()->getPath(), '/');
+        $query = $request->getUri()->getQuery();
+        if ($query !== '') {
+            $target .= '?' . $query;
+        }
+
+        return redirect()->to('/login?redirect_to=' . rawurlencode('/' . ltrim($target, '/')))
+            ->with('error', 'Your session has expired. Please log in again.');
     }
 
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)

app/Helpers/auth_helper.php

@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/AuthHelper.php';

app/Listeners/BelowSixtyEmailListener.php

@@ -71,7 +71,10 @@ class BelowSixtyEmailListener
             'sent_at'            => utc_now(),
         ];
 
-        $html = view('emails/below_sixty_performance', $emailData, ['saveData' => true]);
+        $html = trim((string)($payload['html'] ?? ''));
+        if ($html === '') {
+            $html = view('emails/below_sixty_performance', $emailData, ['saveData' => true]);
+        }
 
         $okAny = false;
         foreach ($emails as $to) {

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
-        $result = $this->where('config_key', $key)
+        // Use a fresh builder to avoid stale state from shared model builder.
+        $builder = $this->db->table($this->table);
+        $result = $builder->where('config_key', $key)
             ->orderBy('id', 'DESC')
-            ->first();
-        return $result ? $result['config_value'] : null;
+            ->get(1)
+            ->getRowArray();
+        return $result['config_value'] ?? null;
     }
 
     /**

app/Models/EventChargesModel.php

@@ -15,8 +15,19 @@ class EventChargesModel extends Model
         'student_id',
         'participation',
         'charged',
+        'event_paid',
+        'event_payment_id',
+        'class_section_id',
+        'external_firstname',
+        'external_lastname',
+        'external_note',
+        'external_parent_firstname',
+        'external_parent_lastname',
+        'external_parent_phone',
+        'external_parent_email',
         'semester',
         'school_year',
+        'created_by',
         'updated_by',
         'created_at',
         'updated_at'
@@ -30,7 +41,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';
-    protected $updatedField = 'updated_at';
-    protected bool $updateOnlyChanged = false; // force updates even if CI thinks nothing changed
+
+    /**
+     * Applied on insert/update when validation runs (e.g. $model->insert($data, true)).
+     * Uses if_exist so partial updates still validate only keys present in $data.
+     */
+    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/EmailService.php

@@ -8,6 +8,7 @@ class EmailService
 {
     protected array $senders;
     protected EmailController $mailer;
+    protected int $lastCcBatchCount = 0;
 
     public function __construct()
     {
@@ -73,6 +74,45 @@ class EmailService
         return $allOk;
     }
 
+    /**
+     * Send one email with all recipients in CC.
+     */
+    public function sendCc(array $ccList, string $subject, string $message, string $fromKey = 'general', array $attachments = [], array $headers = []): bool
+    {
+        $this->lastCcBatchCount = 0;
+
+        if (empty($ccList)) {
+            return true;
+        }
+
+        $sender = $this->getSenderDetails($fromKey);
+        $to = trim((string) ($sender['email'] ?? ''));
+        if ($to === '' || !filter_var($to, FILTER_VALIDATE_EMAIL)) {
+            $fallback = trim((string) (getenv('SMTP_USER') ?: ''));
+            $to = filter_var($fallback, FILTER_VALIDATE_EMAIL) ? $fallback : 'no-reply@alrahmaisgl.org';
+        }
+
+        $attachmentsPayload = $this->normalizeAttachments($attachments);
+        $chunks = array_chunk(array_values($ccList), 10);
+        $this->lastCcBatchCount = count($chunks);
+        $allOk = true;
+
+        foreach ($chunks as $index => $chunk) {
+            $ok = $this->mailer->sendEmailWithCc($to, $chunk, $subject, $message, $fromKey, null, null, $attachmentsPayload);
+            if (!$ok) {
+                $allOk = false;
+                log_message('error', 'EmailService::sendCc failed for batch ' . ($index + 1) . ' of ' . count($chunks));
+            }
+        }
+
+        return $allOk;
+    }
+
+    public function getLastCcBatchCount(): int
+    {
+        return $this->lastCcBatchCount;
+    }
+
     /**
      * Normalize various attachment inputs to the format expected by EmailController.
      */

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/404.html

@@ -212,42 +212,42 @@
                 <div class="col-4">
                   <img
                     class="img-fluid rounded bg-light p-1"
-                    src=""assets/images/classes-1.jpg"
+                    src="assets/images/classes-1.jpg"
                     alt=""
                   />
                 </div>
                 <div class="col-4">
                   <img
                     class="img-fluid rounded bg-light p-1"
-                    src=""assets/images/classes-2.jpg"
+                    src="assets/images/classes-2.jpg"
                     alt=""
                   />
                 </div>
                 <div class="col-4">
                   <img
                     class="img-fluid rounded bg-light p-1"
-                    src=""assets/images/classes-3.jpg"
+                    src="assets/images/classes-3.jpg"
                     alt=""
                   />
                 </div>
                 <div class="col-4">
                   <img
                     class="img-fluid rounded bg-light p-1"
-                    src=""assets/images/classes-4.jpg"
+                    src="assets/images/classes-4.jpg"
                     alt=""
                   />
                 </div>
                 <div class="col-4">
                   <img
                     class="img-fluid rounded bg-light p-1"
-                    src=""assets/images/classes-5.jpg"
+                    src="assets/images/classes-5.jpg"
                     alt=""
                   />
                 </div>
                 <div class="col-4">
                   <img
                     class="img-fluid rounded bg-light p-1"
-                    src=""assets/images/classes-6.jpg"
+                    src="assets/images/classes-6.jpg"
                     alt=""
                   />
                 </div>

app/Views/about.php

@@ -170,22 +170,22 @@
                         <h3 class="text-white mb-4">Photo Gallery</h3>
                         <div class="row g-2 pt-2">
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-1.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-2.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-3.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-4.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-5.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-6.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
                             </div>
                         </div>
                     </div>
@@ -236,4 +236,4 @@
     <script src="<?= base_url('js/main.js') ?>"></script>
 </body>
 
-</html>
+</html>

app/Views/admin/class_progress_list.php

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

@@ -517,37 +517,28 @@
             <section class="mb-5">
                 <h2 class="mb-4 text-center">Statistics</h2>
                 <div class="stats-row">
-                    <!-- Students -->
                     <div class="stat-circle circle-primary">
-                        <div class="stat-icon"><i class="bi bi-people-fill"></i></div>
+                        <div class="stat-icon"><i class="fas fa-user-graduate"></i></div>
                         <div class="stat-value" data-stat="students">—</div>
                         <div class="stat-title">Students</div>
                     </div>
-
-                    <!-- Teachers -->
                     <div class="stat-circle circle-info">
-                        <div class="stat-icon"><i class="bi bi-person-video2"></i></div>
+                        <div class="stat-icon"><i class="fas fa-chalkboard-teacher"></i></div>
                         <div class="stat-value" data-stat="teachers">—</div>
                         <div class="stat-title">Teachers</div>
                     </div>
-
-                    <!-- Teacher Assistants -->
                     <div class="stat-circle circle-success">
-                        <div class="stat-icon"><i class="bi bi-person-badge-fill"></i></div>
+                        <div class="stat-icon"><i class="fas fa-user-cog"></i></div>
                         <div class="stat-value" data-stat="teacherAssistants">—</div>
-                        <div class="stat-title">Teachers' Assistants</div>
+                        <div class="stat-title">TAs</div>
                     </div>
-
-                    <!-- Admins -->
                     <div class="stat-circle circle-warning">
-                        <div class="stat-icon"><i class="bi bi-shield-lock-fill"></i></div>
+                        <div class="stat-icon"><i class="fas fa-user-shield"></i></div>
                         <div class="stat-value" data-stat="admins">—</div>
                         <div class="stat-title">Admins</div>
                     </div>
-
-                    <!-- Parents -->
                     <div class="stat-circle circle-light">
-                        <div class="stat-icon"><i class="bi bi-people"></i></div>
+                        <div class="stat-icon"><i class="fas fa-users"></i></div>
                         <div class="stat-value" data-stat="parents">—</div>
                         <div class="stat-title">Parents</div>
                     </div>

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

@@ -71,9 +71,20 @@
         max-height: none;
         overflow: visible;
       }
+      .attn-pie-wrap {
+        width: 320px;
+        height: 320px;
+        margin: 0 auto;
+      }
       @media (max-width: 1200px) {
         .attn-analysis-half { grid-column: span 12; }
       }
+      @media (max-width: 576px) {
+        .attn-pie-wrap {
+          width: 180px;
+          height: 180px;
+        }
+      }
     </style>
     <?= $this->endSection() ?>
 
@@ -239,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;
@@ -291,7 +350,9 @@
     <div class="attn-analysis-grid">
       <div class="attn-analysis-card attn-analysis-half">
         <h6>Overall Distribution</h6>
-        <canvas id="attnPieChart" height="50" aria-label="Overall attendance pie chart"></canvas>
+        <div class="attn-pie-wrap">
+          <canvas id="attnPieChart" aria-label="Overall attendance pie chart"></canvas>
+        </div>
         <table class="attn-analysis-table mt-3 no-mgmt-sticky" data-no-mgmt-sticky>
           <thead>
             <tr>
@@ -360,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>
@@ -415,6 +507,8 @@
         }]
       },
       options: {
+        responsive: true,
+        maintainAspectRatio: false,
         plugins: {
           tooltip: {
             callbacks: {
@@ -465,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>
@@ -51,9 +56,69 @@
             <input type="text" name="school_year" class="form-control" required>
         </div>
 
+        <div class="card mb-3">
+            <div class="card-header">School Calendar</div>
+            <div class="card-body">
+                <div class="form-check mb-2">
+                    <input class="form-check-input" type="checkbox" id="add_to_calendar" name="add_to_calendar" value="1">
+                    <label class="form-check-label" for="add_to_calendar">
+                        Add this event to the school calendar
+                    </label>
+                </div>
+
+                <div id="calendar_recipients" class="ms-3" style="display:none;">
+                    <div class="mb-2 fw-semibold">Visible On Calendars</div>
+                    <div class="d-flex flex-wrap gap-3">
+                        <label class="form-check-label">
+                            <input class="form-check-input me-1" type="checkbox" name="notify_parent" value="1" checked>
+                            Parents
+                        </label>
+                        <label class="form-check-label">
+                            <input class="form-check-input me-1" type="checkbox" name="notify_teacher" value="1" checked>
+                            Teachers
+                        </label>
+                        <label class="form-check-label">
+                            <input class="form-check-input me-1" type="checkbox" name="notify_admin" value="1" checked>
+                            Admins
+                        </label>
+                    </div>
+                    <div class="form-text">If none are selected, the event is visible to everyone.</div>
+                </div>
+            </div>
+        </div>
+
+        <div class="card mb-3">
+            <div class="card-header">Parent Email Broadcast</div>
+            <div class="card-body">
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" id="send_email_parent" name="send_email_parent" value="1">
+                    <label class="form-check-label" for="send_email_parent">
+                        Send one event email to all parents and add all parent emails in CC
+                    </label>
+                </div>
+                <div class="form-text">The email is sent once. The school sender address stays in To, and all parent emails are placed in CC.</div>
+            </div>
+        </div>
+
         <button type="submit" class="btn btn-success">Create Event</button>
         <a href="<?= site_url('administrator/events') ?>" class="btn btn-secondary">Cancel</a>
     </form>
 </div>
 
 <?= $this->endSection() ?>
+
+<?= $this->section('scripts') ?>
+<script>
+    (function () {
+        const toggle = document.getElementById('add_to_calendar');
+        const recipients = document.getElementById('calendar_recipients');
+        if (!toggle || !recipients) return;
+
+        function sync() {
+            recipients.style.display = toggle.checked ? '' : 'none';
+        }
+        toggle.addEventListener('change', sync);
+        sync();
+    })();
+</script>
+<?= $this->endSection() ?>

app/Views/administrator/events/edit_event.php

@@ -70,6 +70,19 @@
             <input type="text" name="school_year" class="form-control" value="<?= esc($event['school_year']) ?>" required>
         </div>
 
+        <div class="card mb-3">
+            <div class="card-header">Parent Email Broadcast</div>
+            <div class="card-body">
+                <div class="form-check">
+                    <input class="form-check-input" type="checkbox" id="send_email_parent" name="send_email_parent" value="1">
+                    <label class="form-check-label" for="send_email_parent">
+                        Send one event email to all parents and add all parent emails in CC
+                    </label>
+                </div>
+                <div class="form-text">Use this when you want to rebroadcast the updated event to all parents in a single email.</div>
+            </div>
+        </div>
+
         <button type="submit" class="btn btn-primary">Update Event</button>
         <a href="<?= site_url('administrator/events') ?>" class="btn btn-secondary">Cancel</a>
     </form>

app/Views/administrator/events/event_charges.php

@@ -11,104 +11,343 @@
         <div class="alert alert-danger"><?= session()->getFlashdata('error') ?></div>
     <?php endif; ?>
 
-    <!-- Add New Charge Form -->
-    <form action="<?= site_url('payment/event_charges') ?>" method="post">
-        <?= csrf_field() ?>
-        <div class="row">
-            <div class="col-md-3 mt-3">
-                <label for="event_id" class="form-label">Select Event</label>
-                <select name="event_id" id="event_id" class="form-select" required>
-                    <option value="">-- Select Event --</option>
-                    <?php foreach ($events as $event): ?>
-                        <option value="<?= esc($event['id']) ?>">
-                            <?= esc($event['event_name']) ?>
-                        </option>
-                    <?php endforeach; ?>
-                </select>
-            </div>
+    <?php
+        $classSectionNames = $classSectionNames ?? [];
+        $semesterOptions = $semesterOptions ?? [];
+        $schoolYearOptions = $schoolYearOptions ?? [];
+    ?>
 
-            <div class="col-md-3 mt-3">
-                <label for="parent_id" class="form-label">Parent</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 class="col-12 mt-3" id="studentCheckboxContainer" style="display: none;">
-                <label>Select Students:</label>
-                <div id="studentList" class="row"></div>
-            </div>           
+    <?php
+        $filterParentId = $filterParentId ?? 0;
+        $parentBalances = $parentBalances ?? [];
+        $selectedEvent = null;
+        if (!empty($filterEventId)) {
+            foreach ($events as $event) {
+                if ((int)$event['id'] === (int)$filterEventId) {
+                    $selectedEvent = $event;
+                    break;
+                }
+            }
+        }
+    ?>
+    <div class="card mb-4">
+        <div class="card-body">
+            <form method="get" action="<?= site_url('administrator/event-charges') ?>" class="row g-3 align-items-end">
+                <?php if ($filterEventId > 0): ?>
+                    <input type="hidden" name="event_id" value="<?= esc($filterEventId) ?>">
+                <?php endif; ?>
+                <?php if ($filterParentId > 0): ?>
+                    <input type="hidden" name="parent_id" value="<?= esc($filterParentId) ?>">
+                <?php endif; ?>
+                <div class="col-md-4">
+                    <label for="semester_filter" class="form-label">Semester</label>
+                    <select id="semester_filter" name="semester" class="form-select">
+                        <option value="">-- All semesters --</option>
+                        <?php foreach ($semesterOptions as $option): ?>
+                            <option value="<?= esc($option) ?>" <?= $semester === $option ? 'selected' : '' ?>>
+                                <?= esc($option) ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="col-md-4">
+                    <label for="school_year_filter" class="form-label">School Year</label>
+                    <select id="school_year_filter" name="school_year" class="form-select">
+                        <option value="">-- All school years --</option>
+                        <?php foreach ($schoolYearOptions as $option): ?>
+                            <option value="<?= esc($option) ?>" <?= $school_year === $option ? 'selected' : '' ?>>
+                                <?= esc($option) ?>
+                            </option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="col-auto">
+                    <button type="submit" class="btn btn-outline-primary">Filter</button>
+                </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>
+    <!-- Add New Charge Form -->
+    <div class="card mb-4">
+        <div class="card-body">
+            <form id="event-participant-form" action="<?= site_url('payment/event_charges') ?>" method="post">
+                <?= csrf_field() ?>
+                <input type="hidden" name="school_year" value="<?= esc($school_year) ?>">
+                <input type="hidden" name="semester" value="<?= esc($semester) ?>">
+                <div class="row g-3">
+                    <div class="col-md-4">
+                        <label for="event_id" class="form-label">Select Event</label>
+                        <select name="event_id" id="event_id" class="form-select" required>
+                            <option value="">-- All events --</option>
+                            <?php foreach ($events as $event): ?>
+                                <option value="<?= esc($event['id']) ?>" data-amount="<?= esc(number_format($event['amount'] ?? 0, 2, '.', '')) ?>" <?= isset($filterEventId) && $filterEventId == $event['id'] ? 'selected' : '' ?>>
+                                    <?= esc($event['event_name']) ?>
+                                </option>
+                            <?php endforeach; ?>
+                        </select>
+                    </div>
+
+                    <?php if ($selectedEvent): ?>
+                        <div class="col-md-8">
+                            <div class="border rounded bg-light p-3 h-100">
+                                <div class="d-flex justify-content-between align-items-center mb-2">
+                                    <h6 class="m-0"><?= esc($selectedEvent['event_name']) ?></h6>
+                                    <span class="badge bg-info text-dark">
+                                        $<?= esc(number_format($selectedEvent['amount'] ?? 0, 2)) ?> fee
+                                    </span>
+                                </div>
+                                <p class="mb-1 text-muted small">
+                                    <?= 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-md-4">
+                        <label for="parent_id" class="form-label">Parents List</label>
+                        <select id="parent_id" name="parent_id" class="form-select">
+                            <option value="">-- Select Parent --</option>
+                            <?php foreach ($parents as $parent): ?>
+                                <option value="<?= esc($parent['id']) ?>" <?= $filterParentId && $filterParentId == $parent['id'] ? 'selected' : '' ?>>
+                                    <?= 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="mt-4">
+                    <button type="button" class="btn btn-outline-primary" data-bs-toggle="modal" data-bs-target="#externalParticipantModal">
+                        Add non-school participant
+                    </button>
+                    <div class="form-text">After adding participants, click Submit to save them to the database.</div>
+                    <div id="externalParticipantsHidden"></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>
     <!-- Charge Tables grouped by event -->
     <?php
         $grouped = [];
         foreach ($charges as $charge) {
-            $label = $charge['event_name'] ?? 'N/A';
-            $grouped[$label][] = $charge;
+            $eventId = (int)($charge['event_id'] ?? 0);
+            if (!isset($grouped[$eventId])) {
+                $grouped[$eventId] = [
+                    'label' => $charge['event_name'] ?? 'N/A',
+                    'rows' => [],
+                ];
+            }
+            $grouped[$eventId]['rows'][] = $charge;
         }
     ?>
 
     <?php if (empty($grouped)): ?>
         <div class="alert alert-info">No charges found.</div>
     <?php else: ?>
-        <?php foreach ($grouped as $eventLabel => $rows): ?>
-            <div class="card mb-4">
+        <?php foreach ($grouped as $eventId => $data): ?>
+            <?php $eventLabel = $data['label']; ?>
+            <?php $rows = $data['rows']; ?>
+            <div class="card mb-4 event-card" data-event-id="<?= esc($eventId) ?>">
                 <div class="card-header bg-light fw-semibold">
                     <?= esc($eventLabel) ?>
                 </div>
                 <div class="card-body p-0">
+                    <?php
+                        $totalParticipants = 0;
+                        $totalCharged = 0.0;
+                    ?>
                     <div class="table-responsive">
-                        <table class="table table-bordered table-striped mb-0 no-mgmt-sticky">
+                        <table id="eventTable_<?= esc($eventId) ?>" class="table table-bordered table-striped mb-0 no-mgmt-sticky">
                             <thead class="table-light">
-                                <tr>
-                                    <th>ID</th>
-                                    <th>Parent Name</th>
-                                    <th>Student Name</th>
-                                    <th>Charged Amount</th>
-                                    <th>Is Participating</th>
-                                    <th>Semester</th>
-                                    <th>Year</th>
-                                    <th>Created</th>
-                                </tr>
+                            <tr>
+                                <th>ID</th>
+                                <th>Parent Name</th>
+                                <th>Student Name</th>
+                                <th>External Info</th>
+                                <th>Class Section</th>
+                                <th>Charged Amount</th>
+                                <th>Created</th>
+                                <th>Fees Paid</th>
+                                <th>Payment</th>
+                                <th>Actions</th>
+                            </tr>
                             </thead>
                             <tbody>
                                 <?php foreach ($rows as $charge): ?>
+                                    <?php
+                                        $isParticipating = ($charge['participation'] === 'yes');
+                                        $isEventPaid = !empty($charge['event_paid']);
+                                    ?>
                                     <tr>
                                         <td><?= esc($charge['id']) ?></td>
-                                        <td><?= esc($charge['parent_firstname'] . ' ' . $charge['parent_lastname']) ?></td>
+                                        <?php
+                                            $studentName = $charge['student_firstname']
+                                                ? trim($charge['student_firstname'] . ' ' . $charge['student_lastname'])
+                                                : '';
+                                            $externalName = trim(
+                                                ($charge['external_firstname'] ?? '') . ' ' .
+                                                ($charge['external_lastname'] ?? '')
+                                            );
+                                            $displayName = $studentName ?: ($externalName ?: '—');
+                                            $externalNote = $charge['external_note'] ?? '';
+                                            $externalParentLabel = trim(
+                                                ($charge['external_parent_firstname'] ?? '') . ' ' .
+                                                ($charge['external_parent_lastname'] ?? '')
+                                            );
+                                            $externalParentPhone = $charge['external_parent_phone'] ?? '';
+                                            $standardParentName = trim($charge['parent_firstname'] . ' ' . $charge['parent_lastname']);
+                                            $parentColumnName = $externalParentLabel ?: ($standardParentName ?: '—');
+                                        ?>
+                                        <td><?= esc($parentColumnName) ?></td>
                                         <td>
-                                            <?= $charge['student_firstname']
-                                                ? esc($charge['student_firstname'] . ' ' . $charge['student_lastname'])
-                                                : '-' ?>
+                                            <?= esc($displayName) ?>
+                                            <?php if ($externalNote): ?>
+                                                <small class="text-muted d-block"><?= esc($externalNote) ?></small>
+                                            <?php endif; ?>
                                         </td>
-                                        <td>$<?= esc(number_format($charge['charged'] ?? 0, 2)) ?></td>
                                         <td>
-                                            <?= $charge['participation']
-                                                ? '<span class="badge bg-success">Yes</span>'
-                                                : '<span class="badge bg-warning">No</span>' ?>
+                                            <?php if ($externalParentPhone): ?>
+                                                <div class="text-muted small"><?= esc($externalParentPhone) ?></div>
+                                            <?php else: ?>
+                                                <span class="text-muted small">—</span>
+                                            <?php endif; ?>
                                         </td>
-                                        <td><?= esc($charge['semester'] ?? '-') ?></td>
-                                        <td><?= esc($charge['school_year'] ?? '-') ?></td>
+                                        <td>
+                                            <?= esc($classSectionNames[$charge['class_section_id'] ?? ''] ?? '—') ?>
+                                        </td>
+                                        <td>$<?= esc(number_format($charge['event_amount'] ?? 0, 2)) ?></td>
                                         <td><?= esc(!empty($charge['created_at']) ? local_datetime($charge['created_at'], 'm-d-Y H:i') : '') ?></td>
+                                        <?php
+                                            $feeAmount = (float) ($charge['event_amount'] ?? 0);
+                                            $hasBalanceRecord = array_key_exists((int)$charge['parent_id'], $parentBalances);
+                                            $parentBalance = $hasBalanceRecord ? (float)$parentBalances[$charge['parent_id']] : null;
+                                            $feeIsPaid = $isParticipating && ($isEventPaid || ($hasBalanceRecord && $parentBalance <= 0));
+                                        ?>
+                                        <td class="text-center">
+                                            <?php if ($feeIsPaid): ?>
+                                                <span class="badge bg-success">Paid</span>
+                                            <?php else: ?>
+                                                <span class="badge bg-danger">Unpaid</span>
+                                            <?php endif; ?>
+                                        </td>
+                                        <td class="text-center">
+                                            <form method="post" action="<?= site_url('administrator/event-charges/payment/' . esc($charge['id'])) ?>" class="d-inline-flex align-items-center">
+                                                <?= csrf_field() ?>
+                                                <input type="hidden" name="paid" value="<?= $feeIsPaid ? '1' : '0' ?>">
+                                                <input type="checkbox" class="form-check-input" id="eventPayment_<?= esc($charge['id']) ?>"
+                                                       <?= $isEventPaid ? 'checked' : '' ?>
+                                                       onchange="this.form.paid.value = this.checked ? 1 : 0; this.form.submit();">
+                                                <label class="form-check-label ms-2" for="eventPayment_<?= esc($charge['id']) ?>" aria-hidden="true">Paid</label>
+                                            </form>
+                                        </td>
+                                        <td class="text-nowrap">
+                                            <div class="d-flex gap-1 align-items-center">
+                                                <a href="<?= site_url('administrator/event-charges') ?>?event_id=<?= esc($charge['event_id']) ?>&parent_id=<?= esc($charge['parent_id']) ?>#event-participant-form" class="btn btn-outline-primary btn-sm">
+                                                    Edit
+                                                </a>
+                                                <form action="<?= site_url('administrator/event-charges/remove/' . esc($charge['id'])) ?>" method="post" onsubmit="return confirm('Remove this participation and update the charge?');">
+                                                    <?= csrf_field() ?>
+                                                    <button type="submit" class="btn btn-outline-danger btn-sm">Remove</button>
+                                                </form>
+                                            </div>
+                                        </td>
                                     </tr>
+                                    <?php
+                                        if ($isParticipating) {
+                                            $totalParticipants++;
+                                            $totalCharged += (float) ($charge['event_amount'] ?? 0);
+                                        }
+                                    ?>
                                 <?php endforeach; ?>
                             </tbody>
+                            <tfoot class="table-light">
+                                <tr>
+                                    <th colspan="4">Totals</th>
+                                    <th>$<?= esc(number_format($totalCharged, 2)) ?></th>
+                                    <th colspan="5">
+                                        <span class="badge bg-secondary">
+                                            <?= esc($totalParticipants) ?> participating
+                                        </span>
+                                    </th>
+                                </tr>
+                            </tfoot>
                         </table>
                     </div>
                 </div>
             </div>
-        <?php endforeach; ?>
-    <?php endif; ?>
+<?php endforeach; ?>
+<?php endif; ?>
+</div>
+
+<div class="modal fade" id="externalParticipantModal" tabindex="-1" aria-labelledby="externalParticipantModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <form id="externalParticipantForm" class="needs-validation" novalidate>
+                <?= csrf_field() ?>
+                <div class="modal-header">
+                    <h5 class="modal-title" id="externalParticipantModalLabel">Add Non-School Participant</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <p class="small text-muted">Provide the student’s name and the accompanying guardian/contact details.</p>
+                    <div class="mb-3">
+                        <label class="form-label">Student / Kid Info</label>
+                        <div class="row g-3">
+                            <div class="col-md-6">
+                                <input type="text" class="form-control" id="modalExternalFirstName" placeholder="First name" required>
+                            </div>
+                            <div class="col-md-6">
+                                <input type="text" class="form-control" id="modalExternalLastName" placeholder="Last name" required>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="mb-3">
+                        <label class="form-label">Parent / Contact Info</label>
+                        <div class="row g-3">
+                            <div class="col-md-6">
+                                <input type="text" class="form-control" id="modalParentFirstName" placeholder="Parent first name" required>
+                            </div>
+                            <div class="col-md-6">
+                                <input type="text" class="form-control" id="modalParentLastName" placeholder="Parent last name" required>
+                            </div>
+                            <div class="col-12">
+                                <input type="text" class="form-control" id="modalParentPhone" placeholder="Parent phone or contact">
+                            </div>
+                            <div class="col-12">
+                                <input type="email" class="form-control" id="modalParentEmail" placeholder="Parent email" required>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="mb-3">
+                        <label class="form-label" for="modalExternalNote">Note <span class="text-muted small">(optional)</span></label>
+                        <textarea rows="2" class="form-control" id="modalExternalNote" placeholder="Additional info (e.g., guest, sibling, etc.)"></textarea>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary" id="externalParticipantSave">
+                        Add to list
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
 </div>
 
 <?= $this->endSection() ?>
@@ -156,7 +395,307 @@ function loadStudentsWithCharges() {
     }
 }
 
-$('#parent_id').on('change', loadStudentsWithCharges);
-$('#event_id').on('change', loadStudentsWithCharges);
+    const capitalizeName = (value) => {
+        if (!value) return '';
+        return value
+            .split(' ')
+            .map(part => {
+                const trimmed = part.trim();
+                if (!trimmed) return '';
+                return trimmed.charAt(0).toUpperCase() + trimmed.slice(1).toLowerCase();
+            })
+            .filter(Boolean)
+            .join(' ');
+    };
+
+    $(function() {
+    $('#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();
+    });
+
+    if ($('#event_id').val() && $('#parent_id').val()) {
+        loadStudentsWithCharges();
+    }
+
+    const $externalHidden = $('#externalParticipantsHidden');
+    const storageKey = 'eventChargesExternalParticipants';
+    let externalDrafts = [];
+    let editingKey = null;
+
+    const escapeHtml = (value) => {
+        const s = String(value ?? '');
+        return s.replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#39;');
+    };
+
+    function buildExternalRow(entry) {
+        const key = entry.key;
+        const isPaid = !!entry.paid;
+        const firstEsc = escapeHtml(entry.firstname);
+        const lastEsc = escapeHtml(entry.lastname);
+        const noteEsc = escapeHtml(entry.note);
+        const parentFirstEsc = escapeHtml(entry.parentFirstname);
+        const parentLastEsc = escapeHtml(entry.parentLastname);
+        const parentPhoneEsc = escapeHtml(entry.parentPhone);
+        const parentEmailEsc = escapeHtml(entry.parentEmail);
+        const label = (firstEsc || lastEsc)
+            ? `${firstEsc || ''} ${lastEsc || ''}`.trim()
+            : 'Unnamed participant';
+        const parentLabel = (parentFirstEsc || parentLastEsc)
+            ? `<div class="text-muted small">Parent: ${parentFirstEsc} ${parentLastEsc}</div>`
+            : '';
+        const phoneLabel = parentPhoneEsc
+            ? `<div class="text-muted small">${parentPhoneEsc}</div>`
+            : '';
+        const parentNameForRow = entry.parentDisplayName || '—';
+        const amountDisplay = ((entry.eventAmount ?? 0) || 0.0).toFixed(2);
+
+        const $wrapper = $(`
+            <div data-key="${key}">
+                <input type="hidden" name="external_participants[${key}][firstname]" value="${firstEsc}">
+                <input type="hidden" name="external_participants[${key}][lastname]" value="${lastEsc}">
+                <input type="hidden" name="external_participants[${key}][note]" value="${noteEsc}">
+                <input type="hidden" name="external_participants[${key}][parent_firstname]" value="${parentFirstEsc}">
+                <input type="hidden" name="external_participants[${key}][parent_lastname]" value="${parentLastEsc}">
+                <input type="hidden" name="external_participants[${key}][parent_phone]" value="${parentPhoneEsc}">
+                <input type="hidden" name="external_participants[${key}][parent_email]" value="${parentEmailEsc}">
+                <input type="hidden" name="external_participants[${key}][paid]" value="${isPaid ? '1' : '0'}">
+            </div>
+        `);
+        $externalHidden.append($wrapper);
+
+        const $tableBody = $(`#eventTable_${entry.eventId} tbody`);
+        if (!$tableBody.length) {
+            return;
+        }
+        const createdDisplay = new Date().toLocaleString();
+        const $previewRow = $(`
+            <tr class="external-preview table-warning" data-key="${key}" data-event-id="${entry.eventId}">
+                <td>—</td>
+                <td>${escapeHtml(parentNameForRow)}</td>
+                <td>
+                    <strong>${label}</strong>
+                    ${noteEsc ? `<div class="text-muted small">${noteEsc}</div>` : ''}
+                </td>
+                <td>
+                    ${phoneLabel}
+                    ${phoneLabel ? '' : '<span class="text-muted small">—</span>'}
+                </td>
+                <td>External</td>
+                <td>$${amountDisplay}</td>
+                <td>${createdDisplay}</td>
+                <td class="text-center">
+                    <span class="badge bg-warning text-dark">Pending</span>
+                    ${isPaid ? '<span class="badge bg-success ms-1 external-paid-badge">Paid on save</span>' : '<span class="badge bg-secondary ms-1 external-paid-badge d-none">Paid on save</span>'}
+                </td>
+                <td class="text-center">
+                    <div class="form-check d-inline-flex align-items-center gap-2 justify-content-center m-0">
+                        <input class="form-check-input external-paid-toggle" type="checkbox" data-key="${key}" ${isPaid ? 'checked' : ''}>
+                        <span class="small text-muted">On save</span>
+                    </div>
+                </td>
+                <td class="text-end d-flex gap-2">
+                    <button type="button" class="btn btn-outline-secondary btn-sm edit-external-participant" data-key="${key}">
+                        Edit
+                    </button>
+                    <button type="button" class="btn btn-outline-danger btn-sm remove-external-participant" data-key="${key}">
+                        Remove
+                    </button>
+                </td>
+            </tr>
+        `);
+        $tableBody.append($previewRow);
+    }
+
+    function persistDrafts() {
+        localStorage.setItem(storageKey, JSON.stringify(externalDrafts));
+    }
+
+    function saveExternalDraft(entry) {
+        entry.key = entry.key ?? `${Date.now()}_${Math.random().toString(36).slice(2)}`;
+        entry.paid = !!entry.paid;
+        removeExternalEntryFromDom(entry.key);
+        externalDrafts = externalDrafts.filter((existing) => existing.key !== entry.key);
+        externalDrafts.push(entry);
+        persistDrafts();
+        buildExternalRow(entry);
+    }
+
+    function removeExternalEntryFromDom(key) {
+        $(`tr.external-preview[data-key="${key}"]`).remove();
+        $externalHidden.find(`div[data-key="${key}"]`).remove();
+    }
+
+    function removeDraft(key) {
+        externalDrafts = externalDrafts.filter((entry) => entry.key !== key);
+        persistDrafts();
+    }
+
+    function loadDrafts() {
+        const raw = localStorage.getItem(storageKey);
+        if (!raw) {
+            return;
+        }
+        try {
+            const saved = JSON.parse(raw);
+            if (!Array.isArray(saved)) {
+                return;
+            }
+            externalDrafts = saved;
+            const currentEvent = $('#event_id').val();
+            externalDrafts.forEach((entry) => {
+                if (String(entry.eventId) === String(currentEvent)) {
+                    buildExternalRow(entry);
+                }
+            });
+        } catch (e) {
+            console.error('Failed to load external drafts', e);
+        }
+    }
+
+    function getDraftByKey(key) {
+        return externalDrafts.find((entry) => entry.key === key);
+    }
+
+    function openExternalModalForEntry(key) {
+        const entry = getDraftByKey(key);
+        if (!entry) {
+            return;
+        }
+        editingKey = key;
+        $('#modalExternalFirstName').val(entry.firstname);
+        $('#modalExternalLastName').val(entry.lastname);
+        $('#modalExternalNote').val(entry.note);
+        $('#modalParentFirstName').val(entry.parentFirstname);
+        $('#modalParentLastName').val(entry.parentLastname);
+        $('#modalParentPhone').val(entry.parentPhone);
+        $('#modalParentEmail').val(entry.parentEmail);
+        if (modalInstance) {
+            modalInstance.show();
+        }
+    }
+
+    const modalElement = document.getElementById('externalParticipantModal');
+    const modalInstance = modalElement ? new bootstrap.Modal(modalElement) : null;
+    if (modalElement) {
+        modalElement.addEventListener('hidden.bs.modal', () => {
+            editingKey = null;
+        });
+    }
+    function clearModalInputs() {
+        $('#modalExternalFirstName').val('');
+        $('#modalExternalLastName').val('');
+        $('#modalExternalNote').val('');
+        $('#modalParentFirstName').val('');
+        $('#modalParentLastName').val('');
+        $('#modalParentPhone').val('');
+        $('#modalParentEmail').val('');
+    }
+
+    $('#externalParticipantSave').on('click', function() {
+        const firstName = capitalizeName($('#modalExternalFirstName').val().trim());
+        const lastName = capitalizeName($('#modalExternalLastName').val().trim());
+        const note = $('#modalExternalNote').val().trim();
+        if (!firstName && !lastName) {
+            alert('Please provide at least a first or last name for the non-school participant.');
+            return;
+        }
+        const parentFirst = capitalizeName($('#modalParentFirstName').val().trim());
+        const parentLast = capitalizeName($('#modalParentLastName').val().trim());
+        const parentPhone = $('#modalParentPhone').val().trim();
+        const parentEmail = $('#modalParentEmail').val().trim();
+        const eventId = $('#event_id').val();
+        if (!eventId) {
+            alert('Select an event before adding a non-school participant.');
+            return;
+        }
+        const eventAmount = parseFloat($('#event_id option:selected').data('amount')) || 0;
+        const explicitParentName = `${parentFirst} ${parentLast}`.trim();
+        if (!explicitParentName) {
+            alert('Please enter the external kid parent name.');
+            return;
+        }
+        if (!parentEmail) {
+            alert('Please enter the external kid parent email.');
+            return;
+        }
+        const parentName = explicitParentName;
+        const draftEntry = editingKey ? getDraftByKey(editingKey) : null;
+        const entry = {
+            firstname: firstName,
+            lastname: lastName,
+            note: note,
+            parentFirstname: parentFirst,
+            parentLastname: parentLast,
+            parentPhone: parentPhone,
+            parentEmail: parentEmail,
+            eventId: (draftEntry && draftEntry.eventId) ? draftEntry.eventId : eventId,
+            eventAmount: (draftEntry && draftEntry.eventAmount) ? draftEntry.eventAmount : eventAmount,
+            parentDisplayName: (draftEntry && draftEntry.parentDisplayName) ? draftEntry.parentDisplayName : parentName,
+            paid: (draftEntry && typeof draftEntry.paid !== 'undefined') ? !!draftEntry.paid : false,
+        };
+        if (editingKey) {
+            entry.key = editingKey;
+        }
+        saveExternalDraft(entry);
+        editingKey = null;
+        clearModalInputs();
+        if (modalInstance) {
+            modalInstance.hide();
+        }
+    });
+
+    $(document).on('click', '.remove-external-participant', function() {
+        const $entry = $(this).closest('[data-key]');
+        const key = $entry.data('key');
+        removeExternalEntryFromDom(key);
+        if (key) {
+            removeDraft(key);
+        }
+    });
+    $(document).on('click', '.edit-external-participant', function() {
+        const key = $(this).data('key');
+        if (key) {
+            openExternalModalForEntry(key);
+        }
+    });
+    $(document).on('change', '.external-paid-toggle', function() {
+        const key = $(this).data('key');
+        const paid = !!this.checked;
+        if (!key) {
+            return;
+        }
+        const entry = getDraftByKey(key);
+        if (entry) {
+            entry.paid = paid;
+            persistDrafts();
+        }
+        $externalHidden
+            .find(`div[data-key="${key}"] input[name="external_participants[${key}][paid]"]`)
+            .val(paid ? '1' : '0');
+        const $badge = $(`tr.external-preview[data-key="${key}"] .external-paid-badge`);
+        if (paid) {
+            $badge.removeClass('d-none').addClass('bg-success').text('Paid on save');
+        } else {
+            $badge.addClass('d-none');
+        }
+    });
+    $('#event-participant-form').on('submit', function() {
+        localStorage.removeItem(storageKey);
+    });
+    loadDrafts();
+});
 </script>
 <?= $this->endSection() ?>

app/Views/administrator/events/event_list.php

@@ -12,6 +12,14 @@
         <div class="alert alert-danger"><?= session()->getFlashdata('error') ?></div>
     <?php endif; ?>
 
+    <?php if (session()->getFlashdata('email_status')): ?>
+        <div class="alert alert-info"><?= session()->getFlashdata('email_status') ?></div>
+    <?php endif; ?>
+
+    <?php if (session()->getFlashdata('email_error')): ?>
+        <div class="alert alert-warning"><?= session()->getFlashdata('email_error') ?></div>
+    <?php endif; ?>
+
 <?php if (empty($events)): ?>
         <div class="alert alert-info mb-3 d-inline-block">No events found.</div>
     <?php else: ?>
@@ -21,7 +29,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 +42,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">
-            <?= esc(session()->getFlashdata('success')) ?>
-        </div>
+        <div class="alert alert-success"><?= esc(session()->getFlashdata('success')) ?></div>
     <?php elseif (session()->getFlashdata('error')): ?>
-        <div class="alert alert-danger">
-            <?= esc(session()->getFlashdata('error')) ?>
-        </div>
+        <div class="alert alert-danger"><?= 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)): ?>
-                        <p class="text-muted mb-0">No exam drafts have been submitted yet.</p>
+                    <?php if (empty($visibleClasses)): ?>
+                        <p class="text-muted mb-0">No classes with enrolled students are available for this term.</p>
                     <?php else: ?>
-                        <div class="table-responsive">
-                            <table class="table table-striped table-bordered align-middle mb-0 exam-drafts-table no-mgmt-sticky">
-                                <thead class="table-light">
-                                    <tr>
-                                        <th>Teacher</th>
-                                        <th>Class</th>
-                                        <th>Title / Type</th>
-                                        <th>Version</th>
-                                        <th>Submitted</th>
-                                        <th>Status</th>
-                                        <th>Files</th>
-                                        <th>PDF</th>
-                                        <th>Review</th>
-                                    </tr>
-                                </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) ?>
+                        <div class="accordion exam-drafts-accordion" id="examDraftsAccordion">
+                            <?php foreach ($visibleClasses as $classSectionId => $classInfo): ?>
+                                <?php $classDraftsForSection = $classDraftGroups[$classSectionId] ?? []; ?>
+                                <?php $collapseId = 'classDraftGroup_' . $classSectionId; ?>
+                                <div class="accordion-item mb-3">
+                                    <h2 class="accordion-header" id="heading_<?= esc($collapseId) ?>">
+                                        <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) ?>">
+                                            <div class="d-flex flex-column flex-lg-row w-100 justify-content-between gap-2">
+                                                <div>
+                                                    <strong><?= esc($classInfo['class_section_name'] ?? ('Class ' . $classSectionId)) ?></strong>
+                                                    <div class="small text-muted">
+                                                        <?= esc($classInfo['student_count'] ?? 0) ?> students · <?= esc(count($classDraftsForSection)) ?> submissions
+                                                        <?php if (!empty($newSubmissionClasses[$classSectionId])): ?>
+                                                            <span class="badge bg-info text-dark ms-2">New submission</span>
                                                         <?php endif; ?>
                                                     </div>
-                                                <?php endif; ?>
-                                            </td>
-                                            <td>
-                                                <?php if (!empty($draft['teacher_file'])): ?>
-                                                    <div>
-                                                        <a href="<?= base_url('exam-drafts/files/teacher/' . $draft['teacher_file']) ?>" target="_blank">
-                                                            <?= esc($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'])): ?>
-                                                    <div class="mt-2">
-                                                        <a href="<?= base_url('exam-drafts/files/final/' . $draft['final_file']) ?>" target="_blank" class="link-success small">
-                                                            <?= esc($draft['final_filename'] ?? 'Final draft') ?>
-                                                        </a>
-                                                    </div>
-                                                <?php endif; ?>
-                                            </td>
-                                            <td class="text-nowrap">
-                                                <?php
-                                                    $pdfFile = $draft['final_pdf_file'] ?? null;
-                                                    // Fallback: if final_file itself is a pdf, use it
-                                                    if (empty($pdfFile) && !empty($draft['final_file']) && strtolower(pathinfo($draft['final_file'], PATHINFO_EXTENSION)) === 'pdf') {
-                                                        $pdfFile = $draft['final_file'];
-                                                    }
-                                                ?>
-                                                <?php if (!empty($pdfFile)): ?>
-                                                    <a href="<?= base_url('exam-drafts/files/final/' . $pdfFile) ?>" target="_blank" class="link-success small">
-                                                        PDF
-                                                    </a>
-                                                <?php else: ?>
-                                                    <span class="text-muted small">—</span>
-                                                <?php endif; ?>
-                                            </td>
-                                            <td>
-                                                <form method="post" action="<?= base_url('/administrator/exam-drafts/review') ?>" enctype="multipart/form-data">
-                                                    <?= csrf_field() ?>
-                                                    <input type="hidden" name="draft_id" value="<?= esc($draft['id']) ?>">
-                                                    <div class="mb-2">
-                                                        <textarea
-                                                            name="admin_comments"
-                                                            rows="2"
-                                                            class="form-control form-control-sm"
-                                                            placeholder="Optional note for the teacher"
-                                                        ><?= esc($draft['admin_comments'] ?? '') ?></textarea>
-                                                    </div>
-                                                    <div class="mb-2">
-                                                        <label class="form-label small mb-1">Status</label>
-                                                        <select name="review_status" class="form-select form-select-sm">
-                                                            <?php foreach ($statusOptions as $option): ?>
-                                                                <option value="<?= esc($option) ?>" <?= ($option === ($draft['status'] ?? '')) ? 'selected' : '' ?>>
-                                                                    <?= esc(ucfirst($option)) ?>
-                                                                </option>
+                                                </div>
+                                                <span class="badge bg-secondary align-self-start">
+                                                    <?= esc(count($classDraftsForSection)) ?>
+                                                    <?= count($classDraftsForSection) === 1 ? 'submission' : 'submissions' ?>
+                                                </span>
+                                            </div>
+                                        </button>
+                                    </h2>
+                                    <div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="heading_<?= esc($collapseId) ?>">
+                                        <div class="accordion-body pt-0 px-3">
+                                            <?php if (empty($classDraftsForSection)): ?>
+                                                <p class="text-muted mb-0">No submissions yet for this class.</p>
+                                            <?php else: ?>
+                                                <div class="table-responsive">
+                                                    <table class="table table-striped table-bordered align-middle mb-0 exam-drafts-table no-mgmt-sticky">
+                                                        <thead class="table-light">
+                                                            <tr>
+                                                                <th>Teacher</th>
+                                                                <th>Class</th>
+                                                                <th>Title & AuthorNote</th>
+                                                                <th>Version</th>
+                                                                <th>Date-Time</th>
+                                                                <th>Status</th>
+                                                                <th>Files</th>
+                                                                <th>Reviewer Action</th>
+                                                                <th>Final version</th>
+                                                            </tr>
+                                                        </thead>
+                                                        <tbody>
+                                                            <?php foreach ($classDraftsForSection 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');
+                                                                    }
+                                                                    $st = strtolower((string) ($draft['status'] ?? ''));
+                                                                    $adminName = trim(($draft['admin_first'] ?? '') . ' ' . ($draft['admin_last'] ?? ''));
+                                                                    $authorNote = $draft['author_comment'] ?? $draft['description'] ?? '';
+                                                                    $reviewerNote = $draft['reviewer_comment'] ?? $draft['admin_comments'] ?? '';
+                                                                ?>
+                                                                <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 ($authorNote !== ''): ?>
+                                                                            <div class="small mt-1">
+                                                                                <span class="text-muted fw-semibold">Author:</span>
+                                                                                <?= esc($authorNote) ?>
+                                                                            </div>
+                                                                        <?php endif; ?>
+                                                                        <?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>
-                                                    </div>
-                                                    <div class="mb-2">
-                                                        <label class="form-label small mb-1">Upload final draft</label>
-                                                        <input type="file" name="final_file" class="form-control form-control-sm">
-                                                    </div>
-                                                    <button type="submit" class="btn btn-sm btn-primary w-100">
-                                                        Save review
-                                                    </button>
-                                                </form>
-                                            </td>
-                                        </tr>
-                                    <?php endforeach; ?>
-                                </tbody>
-                            </table>
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
+                                    </div>
+                                </div>
+                            <?php endforeach; ?>
                         </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>
-                        <div class="small text-muted">Store historic exams as finalized records.</div>
+                        <strong>Upload old / legacy exam</strong>
+                        <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>
-                            <select name="class_section_id" class="form-select" required>
-                                <option value="">Select class</option>
+                            <label class="form-label small">Class sections</label>
+                            <select name="class_section_ids[]" class="form-select" multiple required size="6">
                                 <?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>
-                                <option value="Fall" <?= ($semester === 'Fall') ? 'selected' : '' ?>>Fall</option>
-                                <option value="Spring" <?= ($semester === 'Spring') ? 'selected' : '' ?>>Spring</option>
-                            </select>
+                            <input type="text" name="semester" class="form-control" value="<?= esc($semester) ?>" placeholder="Fall / Spring" required>
                         </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>
-                            <input type="file" name="old_exam_file" class="form-control" accept=".doc,.docx,.pdf" required>
+                            <label class="form-label small">Upload file</label>
+                            <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): ?>
-                                        <div class="list-group-item d-flex justify-content-between align-items-start">
+                                    <?php foreach ($group['items'] ?? [] as $item): ?>
+                                        <?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">
-                                                        Download
-                                                    </a>
+                                                    <a class="btn btn-sm btn-outline-primary" href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" rel="noopener">View</a>
+                                                    <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>
                                                 <?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/paypal_transactions.php

@@ -13,17 +13,19 @@
             </a>
         </div>
         <!-- Search Form -->
-        <!--form method="get" action="<--?= base_url('admin/paypal-transactions') ?>" class="mb-3">
-            <--?= csrf_field(); ?>
+        <!--
+        <form method="get" action="<?= base_url('admin/paypal-transactions') ?>" class="mb-3">
+            <?= csrf_field(); ?>
             <div class="input-group">
-                <input type="text" name="q" value="<--?= esc($keyword) ?>" class="form-control"
+                <input type="text" name="q" value="<?= esc($keyword) ?>" class="form-control"
                     placeholder="Search by transaction ID, email, order ID, or event type">
                 <button type="submit" class="btn btn-primary">Search</button>
-                <--?php if ($keyword): ?>
-                    <a href="<--?= base_url('admin/paypal-transactions') ?>" class="btn btn-secondary">Clear</a>
-                <--?php endif; ?>
+                <?php if ($keyword): ?>
+                    <a href="<?= base_url('admin/paypal-transactions') ?>" class="btn btn-secondary">Clear</a>
+                <?php endif; ?>
             </div>
-        </form-->
+        </form>
+        -->
 
         <!-- Transactions Table -->
         <table id="myTable" class="display table table-striped">

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">
-            <table class="table table-bordered table-hover align-middle mb-0" data-no-mgmt-sticky>
-              <thead class="table-light">
-                <tr>
-                  <th>Class</th>
-                  <th>Subject</th>
-                  <th>Unit</th>
-                  <th>Unit title</th>
-                  <th>Chapter / Surah</th>
-                  <th>Updated</th>
-                  <th style="min-width: 170px;">Actions</th>
-                </tr>
-              </thead>
-              <tbody>
-                <?php if (empty($entries)): ?>
-                  <tr>
-                    <td colspan="7" class="text-center text-muted">No curriculum records yet.</td>
-                  </tr>
-                <?php else: ?>
-                  <?php foreach ($entries as $entry): ?>
-                    <?php
-                      $subjectLabel = $subjectLabels[$entry['subject']] ?? ucfirst($entry['subject'] ?? '');
-                      $updatedAt = $entry['updated_at'] ?? $entry['created_at'] ?? '';
-                      $updatedDisplay = '';
-                      if ($updatedAt) {
-                        try {
-                          $updatedDisplay = (new \DateTime($updatedAt))->format('M d, Y H:i');
-                        } catch (\Exception $e) {
-                          $updatedDisplay = $updatedAt;
-                        }
-                      }
-                    ?>
-                    <tr>
-                      <td><?= esc(($entry['class_name'] ?? '') ?: '—') ?></td>
-                      <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; ?>
-                <?php endif; ?>
-              </tbody>
-            </table>
-          </div>
+          <?php if (empty($entries)): ?>
+            <div class="text-center text-muted">No curriculum records yet.</div>
+          <?php else: ?>
+            <?php
+              $entriesByClass = [];
+              foreach ($entries as $entry) {
+                $className = ($entry['class_name'] ?? '') ?: '—';
+                if (!isset($entriesByClass[$className])) {
+                  $entriesByClass[$className] = [];
+                }
+                $entriesByClass[$className][] = $entry;
+              }
+            ?>
+            <div class="accordion" id="curriculumAccordion">
+              <?php $accIndex = 0; ?>
+              <?php foreach ($entriesByClass as $className => $classEntries): ?>
+                <?php
+                  $accIndex++;
+                  $collapseId = 'curriculum-class-' . $accIndex;
+                  $headingId = 'curriculum-heading-' . $accIndex;
+                ?>
+                <div class="accordion-item mb-2">
+                  <h2 class="accordion-header" id="<?= esc($headingId) ?>">
+                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<?= esc($collapseId) ?>" aria-expanded="false" aria-controls="<?= esc($collapseId) ?>">
+                      <?= esc($className) ?>
+                      <span class="badge bg-secondary ms-2"><?= count($classEntries) ?> entries</span>
+                    </button>
+                  </h2>
+                  <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>
+                          <thead class="table-light">
+                            <tr>
+                              <th>Subject</th>
+                              <th>Unit</th>
+                              <th>Unit title</th>
+                              <th>Chapter / Surah</th>
+                              <th>Updated</th>
+                              <th style="min-width: 170px;">Actions</th>
+                            </tr>
+                          </thead>
+                          <tbody>
+                            <?php foreach ($classEntries as $entry): ?>
+                              <?php
+                                $subjectLabel = $subjectLabels[$entry['subject']] ?? ucfirst($entry['subject'] ?? '');
+                                $updatedAt = $entry['updated_at'] ?? $entry['created_at'] ?? '';
+                                $updatedDisplay = '';
+                                if ($updatedAt) {
+                                  try {
+                                    $updatedDisplay = (new \DateTime($updatedAt))->format('M d, Y H:i');
+                                  } 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">
-        <div class="d-flex flex-wrap gap-4 align-items-center">
-          <div>
-            <div class="text-uppercase small text-muted">Submission completion</div>
-            <div class="h4 fw-semibold mb-1"><?= esc($completionPercent) ?>%</div>
-            <div class="progress" style="height:6px;">
-              <div
-                class="progress-bar bg-primary"
-                role="progressbar"
-                style="width: <?= esc($completionPercent) ?>%;"
-                aria-valuenow="<?= esc($completionPercent) ?>"
-                aria-valuemin="0"
-                aria-valuemax="100"
-              ></div>
+      <?php
+        $termExamLabel = (isset($semester) && strtolower((string) $semester) === 'spring') ? 'Final' : 'Midterm';
+        $lowProgressSectionIds = $lowProgressSectionIds ?? [];
+        $flaggedClasses = count($lowProgressSectionIds);
+        $pageNotifications = [];
+        if ($missingItemsCount > 0) {
+            $pageNotifications[] = [
+                'level' => 'danger',
+                'message' => "{$missingItemsCount} missing item" . ($missingItemsCount === 1 ? '' : 's') . " awaiting teacher uploads.",
+            ];
+        }
+        if ($completionPercent < 70) {
+            $pageNotifications[] = [
+                '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 class="text-uppercase small text-muted">Missing items</div>
-            <div class="h4 fw-semibold text-danger mb-0"><?= esc($missingItemsCount) ?></div>
-          </div>
-          <div class="text-muted small">
-            <?= esc($submittedItems) ?> submitted / <?= esc($totalItems) ?> total items
+        </div>
+        <div class="col-lg-4">
+          <div class="card page-notifications-card h-100 shadow-sm">
+            <div class="card-header d-flex justify-content-between align-items-center">
+              <span>Page notifications</span>
+              <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">
-          <table
-            class="table table-striped table-bordered m-0 align-middle teacher-submissions-table"
-            data-no-mgmt-sticky
-            data-no-dt-fixedheader
-          >
-            <thead class="table-light">
-              <tr>
-                <th>Class Section</th>
-                <th>Teacher</th>
-                <th class="text-center">Midterm Score</th>
-                <th class="text-center">Midterm Comment</th>
-                <th class="text-center">Participation</th>
-                <th class="text-center">PTAP Comment</th>
-                <th class="text-center">Notifications</th>
-              </tr>
-            </thead>
-            <tbody>
-              <?php if (!empty($rows)): ?>
-                <?php foreach ($rows 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'
-                    ] 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; ?>
-                    <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 if (empty($rows)): ?>
+          <p class="text-center text-muted mt-4">No teacher-class assignments found for this term.</p>
+        <?php else: ?>
+          <div class="table-control-bar mb-3 d-flex flex-wrap align-items-center gap-3">
+            <div class="d-flex flex-wrap align-items-center gap-3">
+              <label class="form-check form-check-inline mb-0">
+                <input class="form-check-input" type="checkbox" name="notify_midterm_score" value="1">
+                <span class="form-check-label small">Include <?= esc($termExamLabel) ?> score</span>
+              </label>
+              <label class="form-check form-check-inline mb-0">
+                <input class="form-check-input" type="checkbox" name="notify_midterm_comment" value="1">
+                <span class="form-check-label small">Include <?= esc($termExamLabel) ?> comment</span>
+              </label>
+              <label class="form-check form-check-inline mb-0">
+                <input class="form-check-input" type="checkbox" name="notify_participation" value="1">
+                <span class="form-check-label small">Include participation</span>
+              </label>
+              <label class="form-check form-check-inline mb-0">
+                <input class="form-check-input" type="checkbox" name="notify_ptap_comment" value="1">
+                <span class="form-check-label small">Include PTAP comment</span>
+              </label>
+              <label class="form-check form-check-inline mb-0">
+                <input class="form-check-input" type="checkbox" name="notify_class_progress" value="1">
+                <span class="form-check-label small">Include class progress</span>
+              </label>
+              <label class="form-check form-check-inline mb-0">
+                <input class="form-check-input" type="checkbox" name="notify_exam_draft" value="1">
+                <span class="form-check-label small">Include exam draft</span>
+              </label>
+              <label class="form-check form-check-inline mb-0">
+                <input class="form-check-input" type="checkbox" name="homework_notify_all" value="1">
+                <span class="form-check-label small">Include homework</span>
+              </label>
+            </div>
+            <div class="small text-muted">
+              <span class="text-uppercase" style="font-size:0.65rem;">Exam draft deadline</span><br>
+              <?php if ($examDraftDeadlineConfig !== ''): ?>
+                <?= esc($examDraftDeadlineConfig) ?>
+                <?php if ($examDraftDeadlineFormatted !== ''): ?>
+                  <span class="text-muted"> → <?= esc($examDraftDeadlineFormatted) ?></span>
+                <?php endif; ?>
               <?php else: ?>
-                <tr>
-                  <td colspan="7" class="text-center">No teacher-class assignments found for this term.</td>
-                </tr>
+                <span class="text-warning">Not set</span>
               <?php endif; ?>
-            </tbody>
-          </table>
-        </div>
-        <div class="mt-3 text-end">
-          <button type="submit" class="btn btn-primary" <?= empty($rows) ? 'disabled' : '' ?>>
-            Send notifications to selected teachers
-          </button>
-        </div>
+            </div>
+          </div>
+          <div class="accordion" id="teacherSubmissionAccordion">
+            <?php foreach ($groupedRows as $sectionKey => $sectionRows): ?>
+              <?php
+                $firstRow = $sectionRows[0] ?? [];
+                $sectionLabel = esc($firstRow['class_section'] ?? 'Class section');
+                $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/appointment.php

@@ -195,22 +195,22 @@
                         <h3 class="text-white mb-4">Photo Gallery</h3>
                         <div class="row g-2 pt-2">
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-1.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-2.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-3.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-4.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-5.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-6.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
                             </div>
                         </div>
                     </div>
@@ -267,4 +267,4 @@
     <script src="js/main.js"></script>
 </body>
 
-</html>
+</html>

app/Views/auth/select_role.php

@@ -25,6 +25,7 @@
 
             <br>
             <input type="hidden" name="selected_role" id="selected_role">
+            <input type="hidden" name="redirect_to" value="<?= esc((string) ($redirect_to ?? '')) ?>">
 
             <div class="d-flex flex-wrap justify-content-center gap-3 mt-3">
                 <?php foreach ($roles as $role): ?>
@@ -68,4 +69,4 @@
         tooltipTriggerList.forEach(el => new bootstrap.Tooltip(el));
     });
 </script>
-<?= $this->endSection() ?>
+<?= $this->endSection() ?>

app/Views/call_to_action.php

@@ -155,22 +155,22 @@
                         <h3 class="text-white mb-4">Photo Gallery</h3>
                         <div class="row g-2 pt-2">
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-1.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-2.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-3.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-4.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-5.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-6.jpg" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
                             </div>
                         </div>
                     </div>
@@ -227,4 +227,4 @@
     <script src="js/main.js"></script>
 </body>
 
-</html>
+</html>

app/Views/classes.php

@@ -93,7 +93,7 @@
                     <div class="col-lg-4 col-md-6 wow fadeInUp" data-wow-delay="0.1s">
                         <div class="classes-item">
                             <div class="bg-light rounded-circle w-75 mx-auto p-3">
-                                <img class="img-fluid rounded-circle" src=""assets/images/classes-1.jpg" alt="">
+                                <img class="img-fluid rounded-circle" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
                             </div>
                             <div class="bg-light rounded p-4 pt-5 mt-n5">
                                 <a class="d-block text-center h3 mt-3 mb-4" href="">Quran Learning</a>
@@ -104,7 +104,7 @@
                     <div class="col-lg-4 col-md-6 wow fadeInUp" data-wow-delay="0.3s">
                         <div class="classes-item">
                             <div class="bg-light rounded-circle w-75 mx-auto p-3">
-                                <img class="img-fluid rounded-circle" src=""assets/images/classes-2.jpg" alt="">
+                                <img class="img-fluid rounded-circle" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
                             </div>
                             <div class="bg-light rounded p-4 pt-5 mt-n5">
                                 <a class="d-block text-center h3 mt-3 mb-4" href="">Islamic Studies</a>
@@ -114,7 +114,7 @@
                     <div class="col-lg-4 col-md-6 wow fadeInUp" data-wow-delay="0.5s">
                         <div class="classes-item">
                             <div class="bg-light rounded-circle w-75 mx-auto p-3">
-                                <img class="img-fluid rounded-circle" src=""assets/images/classes-3.jpg" alt="">
+                                <img class="img-fluid rounded-circle" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
                             </div>
                             <div class="bg-light rounded p-4 pt-5 mt-n5">
                                 <a class="d-block text-center h3 mt-3 mb-4" href="">Arabic Learning</a>
@@ -160,22 +160,22 @@
                         <h3 class="text-white mb-4">Photo Gallery</h3>
                         <div class="row g-2 pt-2">
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-1.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-2.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-3.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-4.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-5.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-6.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
                             </div>
                         </div>
                     </div>
@@ -228,4 +228,4 @@
     <script src="<?= base_url('js/main.js') ?>"></script>
 </body>
 
-</html>
+</html>

app/Views/contact.php

@@ -195,22 +195,22 @@
                         <h3 class="text-white mb-4">Photo Gallery</h3>
                         <div class="row g-2 pt-2">
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-1.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-2.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-3.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-4.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-5.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
                             </div>
                             <div class="col-4">
-                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-6.jpg') ?>" alt="">
+                                <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
                             </div>
                         </div>
                     </div>
@@ -280,4 +280,4 @@
 
 </body>
 
-</html>
+</html>

app/Views/emails/custom_html.php

@@ -0,0 +1,4 @@
+<?= $this->extend('layout/email_layout') ?>
+<?= $this->section('content') ?>
+<?= $body_html ?? '' ?>
+<?= $this->endSection() ?>

app/Views/emails/event_broadcast.php

@@ -0,0 +1,38 @@
+<?php
+$eventName = trim((string) ($event['event_name'] ?? 'Upcoming Event'));
+$eventCategory = trim((string) ($event['event_category'] ?? ''));
+$eventDateRaw = trim((string) ($event['expiration_date'] ?? ''));
+$eventDate = $eventDateRaw !== '' ? date('F j, Y', strtotime($eventDateRaw)) : 'TBD';
+$amountRaw = $event['amount'] ?? null;
+$amount = ($amountRaw !== null && $amountRaw !== '') ? number_format((float) $amountRaw, 2) : null;
+?>
+<div style="font-family: sans-serif; line-height: 1.6;">
+    <h1 style="font-size: 1.5rem; margin-bottom: 0.5rem;"><?= esc($eventName) ?></h1>
+    <p style="margin:0.25rem 0;"><strong>Date:</strong> <?= esc($eventDate) ?></p>
+    <?php if ($eventCategory !== ''): ?>
+        <p style="margin:0.25rem 0;"><strong>Category:</strong> <?= esc($eventCategory) ?></p>
+    <?php endif; ?>
+    <?php if ($amount !== null): ?>
+        <p style="margin:0.25rem 0;"><strong>Amount:</strong> $<?= esc($amount) ?></p>
+    <?php endif; ?>
+    <?php if (!empty($event['description'])): ?>
+        <p style="margin:0.75rem 0;"><?= nl2br(esc((string) $event['description'])) ?></p>
+    <?php endif; ?>
+    <?php if (!empty($flyerUrl)): ?>
+        <div style="margin:1rem 0;">
+            <img
+                src="<?= esc((string) $flyerUrl) ?>"
+                alt="Event flyer for <?= esc($eventName) ?>"
+                style="display:block; max-width:100%; height:auto; border:1px solid #ddd; border-radius:8px;"
+            >
+        </div>
+        <p style="margin:0.75rem 0;">
+            Flyer:
+            <a href="<?= esc((string) $flyerUrl) ?>"><?= esc((string) $flyerUrl) ?></a>
+        </p>
+    <?php endif; ?>
+    <p style="margin:0.75rem 0;">For more details, please contact the school office or review the parent event page.</p>
+    <p style="margin:0.25rem 0;">
+        <a href="<?= esc((string) $eventUrl) ?>"><?= esc((string) $eventUrl) ?></a>
+    </p>
+</div>

app/Views/expenses/index.php

@@ -80,10 +80,10 @@
                             <?php endif; ?>
                         </td>
                         <td><?= esc($e['approver_firstname'] . ' ' . $e['approver_lastname'] ?? '-') ?></td>
-                        <!--td><--?= esc($e['status_reason'] ?? '-') ?></td-->
+                        <!-- <td><?= esc($e['status_reason'] ?? '-') ?></td> -->
                         <td>
                             <?php if ($e['receipt_path']): ?>
-                                <!--a href="<--?= base_url('writable/' . $e['receipt_path']) ?>" target="_blank">View</a-->
+                                <!-- <a href="<?= base_url('writable/' . $e['receipt_path']) ?>" target="_blank">View</a> -->
                                 <a href="<?= site_url('receipts/' . $e['receipt_path']) ?>" target="_blank">View receipt</a>
                             <?php else: ?>
                                 N/A

app/Views/family/card.php

@@ -22,6 +22,10 @@ if ($title === '' || preg_match('/^\s*Family\s+of\s+User\s*\d+\s*$/i', $title))
   }
   $title = $lastName !== '' ? ('Family of ' . $lastName) : 'Family';
 }
+$returnUrl = trim((string)service('request')->getServer('HTTP_REFERER'));
+if ($returnUrl === '') {
+  $returnUrl = site_url('family');
+}
 ?>
 
 <div class="family-card-root" data-family-title="<?= esc($title) ?>">
@@ -187,7 +191,14 @@ if ($title === '' || preg_match('/^\s*Family\s+of\s+User\s*\d+\s*$/i', $title))
                     <td class="small" data-label="Contact">
                       <div>
                         <i class="bi bi-envelope me-1 text-muted"></i>
-                        <?= !empty($g['email']) ? ('<a href="mailto:'.esc($g['email']).'">'.esc($g['email']).'</a>') : '<span class="text-muted">—</span>' ?>
+                        <?php
+                          $gEmail = trim((string)($g['email'] ?? ''));
+                          $gName = trim((string)($g['firstname'] ?? '') . ' ' . (string)($g['lastname'] ?? ''));
+                          $composeUrl = $gEmail !== ''
+                            ? site_url('family/compose-email?to=' . rawurlencode($gEmail) . '&name=' . rawurlencode($gName) . '&return_url=' . rawurlencode($returnUrl))
+                            : '';
+                        ?>
+                        <?= $gEmail !== '' ? ('<a href="' . esc($composeUrl) . '" target="_blank" rel="noopener">' . esc($gEmail) . '</a>') : '<span class="text-muted">—</span>' ?>
                       </div>
                       <div class="mt-1">
                         <i class="bi bi-telephone me-1 text-muted"></i>

app/Views/family/compose_email.php

@@ -0,0 +1,87 @@
+<?= $this->extend('layout/management_layout') ?>
+<?= $this->section('content') ?>
+
+<div class="container my-4">
+  <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
+    <div>
+      <h2 class="h4 mb-1">Compose Email</h2>
+      <?php if (!empty($name)): ?>
+        <div class="text-muted"><?= esc($name) ?></div>
+      <?php endif; ?>
+    </div>
+    <a class="btn btn-outline-secondary btn-sm" href="<?= esc((string)($return_url ?? site_url('family'))) ?>">Back</a>
+  </div>
+
+  <form class="card shadow-sm" method="post" action="<?= site_url('family/compose-email/send') ?>">
+    <?= csrf_field() ?>
+    <input type="hidden" name="html" id="compose_html" value="">
+    <input type="hidden" name="return_url" value="<?= esc((string)($return_url ?? '')) ?>">
+
+    <div class="card-body">
+      <div class="mb-3">
+        <label class="form-label" for="composeTo">To</label>
+        <input type="email" class="form-control" id="composeTo" name="to" value="<?= esc((string)($to ?? '')) ?>" placeholder="parent@example.com" required>
+      </div>
+      <div class="mb-3">
+        <label class="form-label" for="composeSubject">Subject</label>
+        <input type="text" class="form-control" id="composeSubject" name="subject" placeholder="Subject" required>
+      </div>
+      <div class="mb-3">
+        <label class="form-label" for="composeEditor">Body (Rich Text)</label>
+        <textarea class="form-control" id="composeEditor" rows="14"></textarea>
+        <div class="form-text">Use the toolbar to format your message before sending.</div>
+        <noscript>
+          <div class="alert alert-warning mt-2">
+            JavaScript is disabled. The message will be sent from the hidden <code>html</code> field.
+          </div>
+        </noscript>
+      </div>
+      <div class="d-flex justify-content-end gap-2">
+        <button type="submit" class="btn btn-primary">Send Email</button>
+      </div>
+    </div>
+  </form>
+</div>
+
+<?= $this->endSection() ?>
+
+<?= $this->section('scripts') ?>
+<script src="<?= base_url('assets/tinymce/tinymce.min.js') ?>"></script>
+<script>
+(function () {
+  const form = document.querySelector('form[action$="family/compose-email/send"]');
+  const hiddenHtml = document.getElementById('compose_html');
+
+  tinymce.init({
+    selector: '#composeEditor',
+    base_url: '<?= base_url('assets/tinymce') ?>',
+    suffix: '.min',
+    license_key: 'gpl',
+    height: 420,
+    menubar: true,
+    branding: false,
+    promotion: false,
+    plugins: 'advlist autolink lists link image charmap preview anchor ' +
+             'searchreplace visualblocks code fullscreen insertdatetime media table ' +
+             'help wordcount emoticons codesample',
+    toolbar: 'undo redo | blocks fontfamily fontsize | bold italic underline strikethrough forecolor backcolor | ' +
+             'alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | ' +
+             'link image media table | emoticons codesample | removeformat | preview code',
+    convert_urls: false,
+    paste_data_images: true,
+    image_caption: true,
+    content_style: 'body { font-family: system-ui, -apple-system, Segoe UI, Roboto, Helvetica, Arial, sans-serif; font-size: 14px; }',
+    setup(editor) {
+      editor.on('keyup change undo redo SetContent', function () {
+        if (hiddenHtml) hiddenHtml.value = editor.getContent({ format: 'html' });
+      });
+      if (form) {
+        form.addEventListener('submit', function () {
+          if (hiddenHtml) hiddenHtml.value = editor.getContent({ format: 'html' });
+        });
+      }
+    }
+  });
+})();
+</script>
+<?= $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/footer.php

@@ -26,22 +26,22 @@
                 <h3 class="text-white mb-4">Photo Gallery</h3>
                 <div class="row g-2 pt-2">
                     <div class="col-4">
-                        <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-1.jpg" alt="">
+                        <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
                     </div>
                     <div class="col-4">
-                        <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-2.jpg" alt="">
+                        <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
                     </div>
                     <div class="col-4">
-                        <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-3.jpg" alt="">
+                        <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
                     </div>
                     <div class="col-4">
-                        <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-4.jpg" alt="">
+                        <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
                     </div>
                     <div class="col-4">
-                        <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-5.jpg" alt="">
+                        <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
                     </div>
                     <div class="col-4">
-                        <img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-6.jpg" alt="">
+                        <img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
                     </div>
                 </div>
             </div>

app/Views/grading/below_sixty.php

@@ -11,9 +11,13 @@
             <div class="text-muted">
                 <?= esc(ucfirst($semester ?? '')) ?> • <?= esc($schoolYear ?? '') ?>
             </div>
-            <a class="btn btn-outline-secondary btn-sm" href="<?= base_url('grading') ?>">
-                Back to Grading
-            </a>
+            <?php if (!empty($canViewGrading)): ?>
+                <a class="btn btn-outline-secondary btn-sm" href="<?= base_url('grading') ?>">
+                    Back to Grading
+                </a>
+            <?php else: ?>
+                <span class="text-muted small">You do not have access to the Grading page.</span>
+            <?php endif; ?>
         </div>
 
         <?php
@@ -89,22 +93,19 @@
                                             <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>
                                 <td class="text-center">
-                                    <form method="post" action="<?= site_url('grading/below-60/email') ?>" class="d-inline">
-                                        <?= csrf_field() ?>
-                                        <input type="hidden" name="student_id" value="<?= esc((string)($row['student_id'] ?? '')) ?>">
-                                        <input type="hidden" name="semester" value="<?= esc((string)($semester ?? '')) ?>">
-                                        <input type="hidden" name="school_year" value="<?= esc((string)($schoolYear ?? '')) ?>">
-                                        <button type="submit"
-                                                class="btn btn-sm <?= $isClosed ? 'btn-secondary' : 'btn-outline-primary' ?>"
-                                                <?= $isClosed ? 'disabled' : '' ?>>
+                                    <?php if ($isClosed): ?>
+                                        <button type="button" class="btn btn-sm btn-secondary" disabled>Send Email</button>
+                                    <?php else: ?>
+                                        <a class="btn btn-sm btn-outline-primary"
+                                           href="<?= site_url('grading/below-60/email/edit?student_id=' . (int)($row['student_id'] ?? 0) . '&semester=' . rawurlencode((string)($semester ?? '')) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
                                             Send Email
-                                        </button>
-                                    </form>
+                                        </a>
+                                    <?php endif; ?>
                                 </td>
                                 <td class="text-center">
                                     <?php if ($isClosed): ?>

app/Views/grading/below_sixty_email_editor.php

@@ -0,0 +1,96 @@
+<?= $this->extend('layout/management_layout') ?>
+<?= $this->section('content') ?>
+
+<div class="container-fluid">
+    <div class="wrapper">
+        <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
+            <div>
+                <h2 class="h4 mb-1">Edit Email</h2>
+                <div class="text-muted">
+                    <?= esc($studentName !== '' ? $studentName : 'Student') ?> • <?= esc($semester ?? '') ?> • <?= esc($schoolYear ?? '') ?>
+                </div>
+            </div>
+            <a class="btn btn-outline-secondary btn-sm"
+               href="<?= site_url('grading/below-60?semester=' . rawurlencode((string)($semester ?? '')) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
+                Back to Below 60
+            </a>
+        </div>
+
+        <form method="post" action="<?= site_url('grading/below-60/email') ?>" class="card shadow-sm">
+            <?= csrf_field() ?>
+            <input type="hidden" name="student_id" value="<?= esc((string)($studentId ?? '')) ?>">
+            <input type="hidden" name="semester" value="<?= esc((string)($semester ?? '')) ?>">
+            <input type="hidden" name="school_year" value="<?= esc((string)($schoolYear ?? '')) ?>">
+            <input type="hidden" name="html" id="below60_html" value="<?= htmlspecialchars((string)($html ?? ''), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') ?>">
+
+            <div class="card-body">
+                <div class="mb-3">
+                    <label class="form-label" for="below60Subject">Subject</label>
+                    <input type="text" class="form-control" id="below60Subject" name="subject" value="<?= esc((string)($subject ?? '')) ?>" required>
+                </div>
+                <div class="mb-3">
+                    <label class="form-label" for="below60Editor">Body (Rich Text)</label>
+                    <textarea class="form-control" id="below60Editor" rows="14"><?= (string)($html ?? '') ?></textarea>
+                    <div class="form-text">Use the toolbar to format the message before sending.</div>
+                    <noscript>
+                        <div class="alert alert-warning mt-2">
+                            JavaScript is disabled. The message will be sent from the hidden <code>html</code> field.
+                        </div>
+                    </noscript>
+                </div>
+                <div class="d-flex justify-content-end gap-2">
+                    <a class="btn btn-outline-secondary"
+                       href="<?= site_url('grading/below-60?semester=' . rawurlencode((string)($semester ?? '')) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
+                        Cancel
+                    </a>
+                    <button type="submit" class="btn btn-primary">Send Email</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+
+<?= $this->endSection() ?>
+
+<?= $this->section('scripts') ?>
+<script src="<?= base_url('assets/tinymce/tinymce.min.js') ?>"></script>
+<script>
+(function () {
+    const form = document.querySelector('form[action$="grading/below-60/email"]');
+    const hiddenHtml = document.getElementById('below60_html');
+
+    if (!window.tinymce) return;
+
+    tinymce.init({
+        selector: '#below60Editor',
+        base_url: '<?= base_url('assets/tinymce') ?>',
+        suffix: '.min',
+        license_key: 'gpl',
+        height: 420,
+        menubar: true,
+        branding: false,
+        promotion: false,
+        plugins: 'advlist autolink lists link image charmap preview anchor ' +
+                 'searchreplace visualblocks code fullscreen insertdatetime media table ' +
+                 'help wordcount emoticons codesample',
+        toolbar: 'undo redo | blocks fontfamily fontsize | bold italic underline strikethrough forecolor backcolor | ' +
+                 'alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | ' +
+                 'link image media table | emoticons codesample | removeformat | preview code',
+        convert_urls: false,
+        paste_data_images: true,
+        image_caption: true,
+        content_style: 'body { font-family: system-ui, -apple-system, Segoe UI, Roboto, Helvetica, Arial, sans-serif; font-size: 14px; }',
+        setup(editor) {
+            editor.on('keyup change undo redo SetContent', function () {
+                if (hiddenHtml) hiddenHtml.value = editor.getContent({ format: 'html' });
+            });
+            if (form) {
+                form.addEventListener('submit', function () {
+                    if (hiddenHtml) hiddenHtml.value = editor.getContent({ format: 'html' });
+                });
+            }
+        }
+    });
+})();
+</script>
+<?= $this->endSection() ?>

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

@@ -322,6 +322,72 @@
             min-height: 400px;
         }
 
+        .home-stats {
+            background: #ffffff;
+            border-radius: 16px;
+            box-shadow: 0 10px 24px rgba(0, 0, 0, 0.08);
+            padding: 2.5rem 1.5rem;
+        }
+
+        .home-stats .stats-row {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 1.5rem;
+            justify-content: center;
+        }
+
+        .home-stats .stat-circle {
+            width: 190px;
+            height: 190px;
+            border-radius: 50%;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            color: #ffffff;
+            font-weight: 700;
+            box-shadow: 0 8px 18px rgba(0, 0, 0, 0.12);
+        }
+
+        .home-stats .stat-value {
+            font-size: 1.8rem;
+            line-height: 1;
+        }
+
+        .home-stats .stat-icon {
+            font-size: 2rem;
+            margin-bottom: .2rem;
+            opacity: .9;
+        }
+
+        .home-stats .stat-title {
+            font-size: 1.1rem;
+            margin-top: .25rem;
+            font-weight: 500;
+            text-align: center;
+            line-height: 1.2;
+        }
+
+        .home-stats .circle-primary {
+            background: radial-gradient(circle at 30% 30%, #0d6efd, #0044aa);
+        }
+
+        .home-stats .circle-success {
+            background: radial-gradient(circle at 30% 30%, #198754, #0c4f2c);
+        }
+
+        .home-stats .circle-warning {
+            background: radial-gradient(circle at 30% 30%, #daa544ff, #a66f00);
+        }
+
+        .home-stats .circle-info {
+            background: radial-gradient(circle at 30% 30%, #0dcaf0, #047e9c);
+        }
+
+        .home-stats .circle-light {
+            background: radial-gradient(circle at 30% 30%, #63af4cff, #00eb7dff);
+        }
+
         @media (max-width: 992px) {
             .image-column {
                 min-height: 300px;
@@ -332,6 +398,13 @@
                 border-radius: 0 0 10px 10px !important;
             }
         }
+
+        @media (max-width: 768px) {
+            .home-stats .stat-circle {
+                width: 160px;
+                height: 160px;
+            }
+        }
     </style>
 </head>
 
@@ -448,8 +521,43 @@
             <h4 class="fw-bold my-0"><u>Join Al Rahma family today! Click here for a quick guide on how to create an account.</u></h4>
         </a>
     </section>
-
-
+    <!-- Statistics Start -->
+    <div class="container-xxl py-2 content-section">
+        <div class="container">
+            <div class="home-stats" data-dashboard-endpoint="<?= site_url('api/administrator/dashboard') ?>">
+                <h1 class="d-flex justify-content-center p-md-1">Active Participants</h1>
+                <br>
+                <div class="stats-row">
+                    <div class="stat-circle circle-primary">
+                        <div class="stat-icon"><i class="fa-solid fa-user-graduate"></i></div>
+                        <div class="stat-value" data-stat="students">—</div>
+                        <div class="stat-title">Students</div>
+                    </div>
+                    <div class="stat-circle circle-info">
+                        <div class="stat-icon"><i class="fa-solid fa-chalkboard-user"></i></div>
+                        <div class="stat-value" data-stat="teachers">—</div>
+                        <div class="stat-title">Teachers</div>
+                    </div>
+                    <div class="stat-circle circle-success">
+                        <div class="stat-icon"><i class="fa-solid fa-user-gear"></i></div>
+                        <div class="stat-value" data-stat="teacherAssistants">—</div>
+                        <div class="stat-title">TAs</div>
+                    </div>
+                    <div class="stat-circle circle-warning">
+                        <div class="stat-icon"><i class="fa-solid fa-user-shield"></i></div>
+                        <div class="stat-value" data-stat="admins">—</div>
+                        <div class="stat-title">Admins</div>
+                    </div>
+                    <div class="stat-circle circle-light">
+                        <div class="stat-icon"><i class="fa-solid fa-people-group"></i></div>
+                        <div class="stat-value" data-stat="parents">—</div>
+                        <div class="stat-title">Parents</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- Statistics End -->
     <div class="container-xxl py-2 content-section">
         <div class="container">
             <div class="row bg-light squared align-items-center">
@@ -461,18 +569,18 @@
                         <p class="mb-4">Under the umbrella of ISGL, Al Rahma Sunday School has been serving the community for over thirty years. Throughout the decades, it has provided students with a strong foundation in Islamic Studies and Quran, fostering both knowledge and character. With its dedicated teachers and well-rounded academic program, the school continues to guide generations of Muslim youth in their faith, values and practice of Islam.</p>
                         <p>For more information, click below to visit ISGL official website.</p>
                         <table role="presentation" cellpadding="0" cellspacing="0" border="0">
-  <tr>
-    <td align="center" bgcolor="#28a745" style="border-radius:6px;">
-      <a href="https://isgl.org"
-         target="_blank"
-         rel="noopener noreferrer"
-         style="display:inline-block;padding:12px 18px;color:#ffffff;text-decoration:none;font-weight:600;">
-         ISGL Official Website
-      </a>
-    </td>
-  </tr>
-</table>
-                   </div>
+                            <tr>
+                                <td align="center" bgcolor="#28a745" style="border-radius:6px;">
+                                    <a href="https://isgl.org"
+                                        target="_blank"
+                                        rel="noopener noreferrer"
+                                        style="display:inline-block;padding:12px 18px;color:#ffffff;text-decoration:none;font-weight:600;">
+                                        ISGL Official Website
+                                    </a>
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
                 </div>
 
                 <!-- Image Column - Fixed with correct path -->
@@ -677,6 +785,57 @@
             }
         });
     </script>
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            const container = document.querySelector('.home-stats[data-dashboard-endpoint]');
+            if (!container) return;
+            const endpoint = container.dataset.dashboardEndpoint;
+            const statElements = container.querySelectorAll('[data-stat]');
+            const numberFormatter = new Intl.NumberFormat();
+            let isLoading = false;
+
+            const loadStats = function() {
+                if (isLoading) return;
+                isLoading = true;
+                fetch(endpoint, {
+                        headers: {
+                            'Accept': 'application/json'
+                        },
+                        credentials: 'same-origin',
+                    })
+                    .then(function(response) {
+                        if (!response.ok) {
+                            throw new Error('Request failed');
+                        }
+                        return response.json();
+                    })
+                    .then(function(payload) {
+                        const counts = payload && typeof payload === 'object' && payload.counts ?
+                            payload.counts :
+                            {};
+                        statElements.forEach(function(element) {
+                            const key = element.dataset.stat;
+                            const value = counts[key];
+                            element.textContent = Number.isFinite(value) ?
+                                numberFormatter.format(value) :
+                                '—';
+                        });
+                    })
+                    .catch(function() {})
+                    .finally(function() {
+                        isLoading = false;
+                    });
+            };
+
+            loadStats();
+            setInterval(loadStats, 60000);
+            document.addEventListener('visibilitychange', function() {
+                if (document.visibilityState === 'visible') {
+                    loadStats();
+                }
+            });
+        });
+    </script>
 </body>
 
 </html>

app/Views/landing_page/parent_dashboard.php

@@ -140,7 +140,7 @@
                         <strong>Enrollment deadline:</strong>
                         <?= $lastDayOfRegistration ? local_date($lastDayOfRegistration, 'm-d-Y') : 'N/A' ?>
                     </div>
-                    <!--div><strong>Withdrawal:</strong> <--?= esc($withdrawalDeadline ?? 'N/A') ?></div-->
+                    <!-- <div><strong>Withdrawal:</strong> <?= esc($withdrawalDeadline ?? 'N/A') ?></div> -->
                     <hr class="my-2">
                     <?php if (!empty($enrollments)): ?>
                         <ul class="mb-0 ps-3">

app/Views/layout/main_layout.php

@@ -2,7 +2,7 @@
 <html lang="en">
 
 <head>
-    <!--meta name="csrf-token" content="<--?= csrf_hash() ?>"-->
+    <!-- <meta name="csrf-token" content="<?= csrf_hash() ?>"> -->
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Al Rahma Sunday School</title>

app/Views/layout/management_layout.php

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <!-- Meta Information -->
-    <!--meta name="csrf-token" content="<--?= csrf_hash() ?>"-->
+    <!-- <meta name="csrf-token" content="<?= csrf_hash() ?>"> -->
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- Prevent back/forward cache issues on management pages -->

app/Views/parent/class_progress_list.php

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

app/Views/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>
-                                        <th>Student First Name</th>
-                                        <th>Student Last Name</th>
-                                        <th class="text-center">Participate</th>
-                                    </tr>
+                            <tr>
+                                <th>Student First Name</th>
+                                <th>Student Last Name</th>
+                                <th class="text-center">Participate</th>
+                                <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/parent/invoice_payment.php

@@ -143,12 +143,67 @@ $deadline = parseDbDateTime($dueDate, 'UTC', $displayTz); // format either DATE
             </tbody>
         </table>
     </div>
+    <?php if (!empty($invoiceEventCharges)): ?>
+        <?php foreach ($invoices as $invoice): ?>
+            <?php $charges = $invoiceEventCharges[(int)($invoice['id'] ?? 0)] ?? []; ?>
+            <?php if (empty($charges)): ?>
+                <?php continue; ?>
+            <?php endif; ?>
+            <div class="card mb-3 shadow-sm">
+                <div class="card-header">
+                    <strong>Event charges for Invoice #<?= esc($invoice['invoice_number'] ?? '#'.$invoice['id']) ?></strong>
+                </div>
+                <div class="card-body p-0">
+                    <div class="table-responsive mb-0">
+                        <table class="table table-sm table-bordered mb-0">
+                            <thead class="table-light">
+                                <tr>
+                                    <th>Event</th>
+                                    <th>Student</th>
+                                    <th>Fee</th>
+                                    <th>Status</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <?php foreach ($charges as $charge): ?>
+                                    <?php
+                                        $studentName = trim(($charge['student_firstname'] ?? '') . ' ' . ($charge['student_lastname'] ?? ''));
+                                        if ($studentName === '') {
+                                            $externalName = trim(($charge['external_firstname'] ?? '') . ' ' . ($charge['external_lastname'] ?? ''));
+                                            if ($externalName !== '') {
+                                                $studentName = $externalName . ' (external)';
+                                            }
+                                        }
+                                        $eventName = $charge['event_name'] ?? '—';
+                                        $paid = !empty($charge['event_paid']) || ((float)($charge['charged'] ?? 0) <= 0);
+                                        $badgeClass = $paid ? 'success' : 'danger';
+                                    ?>
+                                    <tr>
+                                        <td><?= esc($eventName) ?></td>
+                                        <td><?= esc($studentName ?: '—') ?></td>
+                                        <td>$<?= number_format((float)($charge['event_amount'] ?? 0), 2) ?></td>
+                                        <td>
+                                            <span class="badge bg-<?= $badgeClass ?>">
+                                                <?= $paid ? 'Paid' : 'Unpaid' ?>
+                                            </span>
+                                        </td>
+                                    </tr>
+                                <?php endforeach; ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        <?php endforeach; ?>
+    <?php endif; ?>
 <?php else: ?>
     <div class="alert alert-info mb-3 d-inline-block">
         No invoice found for the selected school year.
     </div>
 <?php endif; ?>
 
+<?php $invoiceEventCharges = $invoiceEventCharges ?? []; ?>
+
 <?= $this->endSection() ?>
 
 <?= $this->section('scripts') ?>

app/Views/parent/register_student.php

@@ -11,7 +11,7 @@ $disableEmergencyBtn = count($emergencies) >= $maxEmergency;
         <div class="alert alert-info mt-2">You've reached the maximum number of students (<?= $maxChilds ?>).</div>
     <?php endif; ?>
     <?php if ($disableEmergencyBtn): ?>
-        <!--div class="alert alert-info mt-2">You've reached the maximum number of emergency contacts (<--?= $maxEmergency ?>).</div-->
+        <!-- <div class="alert alert-info mt-2">You've reached the maximum number of emergency contacts (<?= esc((string) $maxEmergency) ?>).</div> -->
     <?php endif; ?>
     <?php if (session()->getFlashdata('error')): ?>
         <div class="alert alert-danger">

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>
@@ -95,8 +100,16 @@
             $balanceCalc = (float)$totalAmount - (float)$discounted - (float)$paid - (float)$refunded;
             if ($balanceCalc < 0) $balanceCalc = 0.0;
             $balance     = $balanceCalc;
-            $status      = ($balanceCalc === 0.0) ? 'Paid' : 'Unpaid';
-            $statusClass = ($status === 'Paid') ? 'bg-success' : 'bg-danger';
+            if ($balanceCalc <= 0.00001) {
+              $status = 'Paid';
+              $statusClass = 'bg-success';
+            } elseif ($paid > 0.00001) {
+              $status = 'Partially Paid';
+              $statusClass = 'bg-warning text-dark';
+            } else {
+              $status = 'Unpaid';
+              $statusClass = 'bg-danger';
+            }
           ?>
             <tr>
               <td><?= esc($inv['invoice_number']) ?></td>
@@ -371,8 +384,15 @@
             const total = Number(inv.total_amount || 0);
             let balance = total - paid - discounted - refunded;
             if (!Number.isFinite(balance) || balance < 0) balance = 0;
-            const status = balance === 0 ? 'Paid' : 'Unpaid';
-            const statusClass = balance === 0 ? 'bg-success' : 'bg-danger';
+            let status = 'Unpaid';
+            let statusClass = 'bg-danger';
+            if (balance <= 0.00001) {
+              status = 'Paid';
+              statusClass = 'bg-success';
+            } else if (paid > 0.00001) {
+              status = 'Partially Paid';
+              statusClass = 'bg-warning text-dark';
+            }
             const tr = document.createElement('tr');
             const parentHtml = (inv.parent_id && Number(inv.parent_id) > 0) ?
               `<a href="<?= site_url('family') ?>?guardian_id=${encodeURIComponent(inv.parent_id)}" class="text-decoration-none" data-family-guardian-id="${inv.parent_id}">${inv.parent_name||''}</a>` :

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
-      ], backgroundColor: ['#007bff','#28a745','#ffc107','#17a2b8','#ffc107','#dc3545','#6f42c1','#20c997']}] },
+        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','#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

@@ -1,7 +1,7 @@
 <?php
 /** @var string $school_year */
 /** @var array<string> $schoolYears */
-/** @var array<int,array{parent_id:int,parent_name:string,email:string,total_invoice:float,total_balance:float,total_discount:float,total_paid:float,remaining_installments:int,installment_amount:float,type:string,has_installment?:int,next_installment?:string}> $rows */
+/** @var array<int,array{parent_id:int,parent_name:string,email:string,total_invoice:float,total_balance:float,total_discount:float,total_paid:float,payment_count:int,remaining_installments:int,installment_amount:float,type:string,has_installment?:int,next_installment?:string}> $rows */
 ?>
 
 <?= $this->extend('layout/management_layout') ?>
@@ -15,8 +15,6 @@
   .table thead th { background: var(--mgmt-thead-bg, #f1f3f5); }
   .actions { white-space: nowrap; }
   .actions .btn { --bs-btn-padding-y: .25rem; --bs-btn-padding-x: .5rem; }
-  .email-cell { max-width: 280px; overflow: hidden; text-overflow: ellipsis; }
-  @media (max-width: 576px){ .email-cell { max-width: 180px; } }
   /* Disable sticky header for this table to avoid overlap */
   table.no-mgmt-sticky thead th { position: static !important; }
 </style>
@@ -49,13 +47,15 @@
           <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>
             <tr>
               <th>Parent</th>
-              <th>Email</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>
@@ -69,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,20 +86,22 @@
                     </a>
                     <small class="text-muted">#<?= (int)$r['parent_id'] ?></small>
                   </td>
-                  <td class="email-cell"><a href="mailto:<?= esc($r['email']) ?>"><?= esc($r['email']) ?></a></td>
+                  <td class="text-center"><?= (int)($r['payment_count'] ?? 0) ?></td>
                   <td>
-                    <?php if (($r['type'] ?? '') === 'no_payment'): ?>
-                      <span class="badge bg-danger badge-type">no payment</span>
-                    <?php else: ?>
-                      <span class="badge bg-success badge-type">installment</span>
-                    <?php endif; ?>
-                  </td>
-                  <?php $sumInvoice += (float)($r['total_invoice'] ?? 0); ?>
-                  <?php $sumPaid    += (float)($r['total_paid']    ?? 0); ?>
+                  <?php if (($r['type'] ?? '') === 'no_payment'): ?>
+                    <span class="badge bg-danger badge-type">no payment</span>
+                  <?php else: ?>
+                    <span class="badge bg-success badge-type">installment</span>
+                  <?php endif; ?>
+                </td>
+                <?php $sumInvoice += (float)($r['total_invoice'] ?? 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>
@@ -131,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>