Merge branch 'develop_fix_expenses' into 'develop'

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

See merge request root/alrahma_sunday_school!5

.env

@@ -26,7 +26,7 @@ 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; set to ssl to match 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
@@ -35,7 +35,6 @@ 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"
-MAIL_DEFAULT_REPLY_TO="alrahma.isgl@gmail.com"
 
 # Optional sender directory you already use elsewhere
 MAIL_SENDERS="{\"general\":{\"email\":\"alrahma.isgl@gmail.com\",\"name\":\"Al Rahma No-Reply\"},\
@@ -44,8 +43,11 @@ MAIL_SENDERS="{\"general\":{\"email\":\"alrahma.isgl@gmail.com\",\"name\":\"Al R
 \"finance\":{\"email\":\"alrahma.isgl@gmail.com\",\"name\":\"Al Rahma Finance Office\"}}"
 
 # Principal notification recipient for TimeOff requests (comma-separated allowed)
-PRINCIPAL_EMAIL="principal@alrahmaisgl.org"
+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
 #--------------------------------------------------------------------
@@ -61,7 +63,7 @@ PRINCIPAL_EMAIL="principal@alrahmaisgl.org"
 database.default.hostname = 127.0.0.1
 database.default.database = school
 database.default.username = root
-database.default.password = root
+database.default.password = rootpassword
 database.default.DBDriver = MySQLi
 database.default.DBPrefix =
 database.default.port = 3306
@@ -155,7 +157,9 @@ database.default.port = 3306
 # LOGGER
 #--------------------------------------------------------------------
 
-# logger.threshold = 4
+logger.threshold = 4
+MAIL_DEBUG = true
+MAIL_TIMEOUT = 15
 
 #--------------------------------------------------------------------
 # CURLRequest

.gitignore

@@ -0,0 +1,39 @@
+.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/
+
+docker-compose.override.yml
+docker-compose.local.yml
+
+*.log
+.DS_Store
+Thumbs.db
+.idea/
+.vscode/
+
+/coverage/
+/build/
+/phpunit.xml.cache
+/.phpunit.result.cache

app/Commands/SendExamDraftDeadlineReminders.php

@@ -1,197 +0,0 @@
-<?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/Routes.php

@@ -363,7 +363,6 @@ $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']);
 
 
 
@@ -393,8 +392,8 @@ $routes->get('print-requests/file/(:segment)', 'PrintRequests::serveFile/$1', ['
 $routes->get('print-requests/file/(:segment)/(:alpha)', 'PrintRequests::serveFile/$1/$2', ['filter' => 'auth:teacher,teacher_assistant,admin']);
 $routes->get('uploads/print_requests/(:segment)', 'PrintRequests::serveFile/$1', ['filter' => 'auth:teacher,teacher_assistant,admin']);
 
-$routes->get('exam-drafts/files/teacher/(:segment)', 'View\FilesController::examDraftTeacher/$1', ['filter' => 'auth:teacher,teacher_assistant,admin,administrator,principal']);
-$routes->get('exam-drafts/files/final/(:segment)', 'View\FilesController::examDraftFinal/$1', ['filter' => 'auth:teacher,teacher_assistant,admin,administrator,principal']);
+$routes->get('exam-drafts/files/teacher/(:segment)', 'View\FilesController::examDraftTeacher/$1', ['filter' => 'auth:teacher,teacher_assistant,admin']);
+$routes->get('exam-drafts/files/final/(:segment)', 'View\FilesController::examDraftFinal/$1', ['filter' => 'auth:teacher,teacher_assistant,admin']);
 
 
 
@@ -535,12 +534,9 @@ $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->post('administrator/event-charges/waiver/(:num)', 'View\EventController::toggleWaiverStatus/$1');
 $routes->get('administrator/get-students-with-charges', 'View\EventController::getStudentsWithCharges');
 
-$routes->get('parent/events', 'View\ParentController::parentEventPage', ['filter' => 'auth:parent']);
+$routes->get('parent/events', 'View\ParentController::parentEventPage');
 // parent event participation page
 $routes->post('parent/updateParticipation', 'View\ParentController::updateParticipation'); // handle parent participation updates
 
@@ -745,9 +741,6 @@ $routes->post('/administrator/teacher-submissions/notify', 'View\AdministratorCo
 $routes->get('/administrator/exam-drafts', 'View\ExamDraftController::adminIndex', ['filter' => 'auth:admin']);
 $routes->post('/administrator/exam-drafts/review', 'View\ExamDraftController::adminReview', ['filter' => 'auth:admin']);
 $routes->post('/administrator/exam-drafts/upload-legacy', 'View\ExamDraftController::adminUploadLegacy', ['filter' => 'auth:admin']);
-$routes->get('/principal/exam-drafts', 'View\ExamDraftController::principalIndex', ['filter' => 'auth:admin']);
-$routes->post('/principal/exam-drafts/review', 'View\ExamDraftController::principalReview', ['filter' => 'auth:admin']);
-$routes->post('/principal/exam-drafts/upload-legacy', 'View\ExamDraftController::principalUploadLegacy', ['filter' => 'auth:admin']);
 
 /*
  * --------------------------------------------------------------------

app/Controllers/AuthController.php

@@ -56,32 +56,13 @@ class AuthController extends Controller
    
     public function loginMask()
     {
-        $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 ?? '',
-        ]);
+        // Serve the login view directly here
+        return view('user/login');  // Adjust the view path as needed
     }
     
     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');
@@ -117,7 +98,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, $redirectTo);
+                return $this->loginUser($user);
             } else {
                 // Step 8: Password mismatch — log failed attempt
                 $this->handleFailedLogin($user['id'], $user['email'], $ip);
@@ -510,7 +491,7 @@ class AuthController extends Controller
         return true;
     }
 
-    private function loginUser($user, ?string $redirectTo = null)
+    private function loginUser($user)
     {
         $userRoleModel = new UserRoleModel();
         $roles = $userRoleModel->select('roles.name')
@@ -544,17 +525,9 @@ 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');
         }
 
@@ -619,17 +592,12 @@ 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]);
     }
 
@@ -641,44 +609,7 @@ private function redirectToDashboard(array $roles)
             return redirect()->to('/login')->with('error', 'No roles available.');
         }
 
-        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;
+        return view('auth/select_role', ['roles' => $roles]);
     }
 
 }

app/Controllers/ClassProgressController.php

@@ -28,10 +28,6 @@ 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;
@@ -387,18 +383,13 @@ class ClassProgressController extends BaseController
             }
         }
 
-        $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,
+            'sundayOptions' => [$row['week_start']],
             'defaultWeekStart' => $row['week_start'],
             'existingWeekEnd' => $row['week_end'],
             'existingReports' => $subjectReports,
@@ -467,32 +458,6 @@ class ClassProgressController extends BaseController
             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)
@@ -709,37 +674,6 @@ 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"));
@@ -752,12 +686,9 @@ 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 !== '' ? $unit . ' / ' . $chapter : $chapter;
+                $segment = $segment !== '' ? $segment . ' / ' . $chapter : $chapter;
             }
             if ($segment === '') {
                 continue;
@@ -768,23 +699,17 @@ 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 !== '') {
+        foreach ($unitValues as $value) {
+            if ($value !== '') {
                 return true;
             }
         }
-
         return false;
     }
 
@@ -803,19 +728,9 @@ class ClassProgressController extends BaseController
             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;
+                $units[] = trim($parts[0]);
                 $chapters[] = trim($parts[1]);
             } else {
                 $units[] = $segment;

app/Controllers/View/AdministratorController.php

@@ -763,13 +763,7 @@ class AdministratorController extends BaseController
 
         [$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') : '';
-        }
+        $examDraftDeadline = $this->resolveExamDraftDeadline($semester, $schoolYear);
         $homeworkCounts = [];
         if (! empty($sectionIds)) {
             $draftBuilder = $examDrafts
@@ -1072,8 +1066,6 @@ class AdministratorController extends BaseController
             'notificationHistory' => $historyMap,
             'summary' => $summary,
             'lowProgressSectionIds' => $lowProgressSectionIds,
-            'examDraftDeadlineConfig' => $examDraftDeadlineConfig,
-            'examDraftDeadlineFormatted' => $examDraftDeadlineFormatted,
         ]);
     }
 
@@ -1307,7 +1299,6 @@ class AdministratorController extends BaseController
         $progressUrl = site_url('teacher/progress/history');
         $examDraftUrl = site_url('teacher/exam-drafts');
         $homeworkUrl = site_url('teacher/addHomework');
-        $examDraftDeadlineEmailHtml = $this->buildExamDraftDeadlineEmailHtml();
         $sentCount = 0;
         $failCount = 0;
 
@@ -1356,8 +1347,7 @@ class AdministratorController extends BaseController
                 } else {
                     $draftLabel = 'exam draft';
                 }
-                $examDraftNote = "<p>" . ucfirst($draftLabel) . " submissions can be updated at <a href=\"{$examDraftUrl}\">Teacher Exam Drafts</a>.</p>"
-                    . $examDraftDeadlineEmailHtml;
+                $examDraftNote = "<p>" . ucfirst($draftLabel) . " submissions can be updated at <a href=\"{$examDraftUrl}\">Teacher Exam Drafts</a>.</p>";
             }
             $homeworkNote = '';
             if (in_array('homework', $missingItems, true)) {
@@ -1495,60 +1485,6 @@ class AdministratorController extends BaseController
         ];
     }
 
-    /**
-     * 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));

app/Controllers/View/AttendanceTrackingController.php

@@ -2003,58 +2003,6 @@ class AttendanceTrackingController extends BaseController
         return [$subject, $body];
     }
 
-    private function buildFallbackTemplate(string $code, string $variant, array $context): array
-    {
-        $studentName = (string) ($context['{{student_name}}'] ?? 'the student');
-        $incident    = (string) ($context['{{incident_date}}'] ?? date('Y-m-d'));
-        $parentName  = (string) ($context['{{parent_name}}'] ?? 'Parent/Guardian');
-        $phone       = (string) ($context['{{school_phone}}'] ?? 'the school office');
-        $voicemail   = (string) ($context['{{voicemail_phone}}'] ?? 'your voicemail');
-
-        $subject = match (true) {
-            str_starts_with($code, 'ABS_1')  => 'Attendance Notice: Unreported Absence',
-            str_starts_with($code, 'ABS_2')  => 'Attendance Follow-Up: Two Consecutive Absences',
-            str_starts_with($code, 'ABS_3')  => 'Attendance Follow-Up: Three Absences',
-            str_starts_with($code, 'LATE_2') => 'Attendance Notice: Repeated Lateness',
-            str_starts_with($code, 'LATE_3'),
-            str_starts_with($code, 'LATE_4'),
-            str_starts_with($code, 'MIX')    => 'Attendance Follow-Up: Repeated Lateness and Absence',
-            default                          => 'Attendance Notice',
-        };
-
-        $intro = "<p>Insha Allah this email finds you well";
-        if ($variant === 'answered') {
-            $intro .= ", <strong>{$parentName}</strong>. Jazakum Allahu khayran for taking the time to speak with us today.</p>";
-        } elseif ($variant === 'no_answer') {
-            $intro .= ".</p><p>We tried to reach you but could not connect and left a voice message at <strong>{$voicemail}</strong>.</p>";
-        } else {
-            $intro .= ".</p>";
-        }
-
-        $details = match (true) {
-            str_starts_with($code, 'ABS_1')
-                => "<p>This is to let you know that <strong>{$studentName}</strong> was absent on <strong>{$incident}</strong> without prior notice.</p>",
-            str_starts_with($code, 'ABS_2')
-                => "<p>This is a reminder that <strong>{$studentName}</strong> has had repeated absences, most recently on <strong>{$incident}</strong>, without prior notice.</p>",
-            str_starts_with($code, 'ABS_3')
-                => "<p>This is a reminder that <strong>{$studentName}</strong> has been absent three times, most recently on <strong>{$incident}</strong>, without prior notice.</p>",
-            str_starts_with($code, 'LATE_2')
-                => "<p>This is a reminder that <strong>{$studentName}</strong> has been late multiple times, most recently on <strong>{$incident}</strong>.</p>",
-            str_starts_with($code, 'LATE_3'),
-            str_starts_with($code, 'LATE_4')
-                => "<p>This is a follow-up that <strong>{$studentName}</strong> has had repeated lateness concerns, most recently on <strong>{$incident}</strong>.</p>",
-            str_starts_with($code, 'MIX')
-                => "<p>This is a follow-up that <strong>{$studentName}</strong> has had a mix of repeated lateness and absence concerns, most recently on <strong>{$incident}</strong>.</p>",
-            default
-                => "<p>We'd like to inform you about <strong>{$studentName}</strong>'s recent attendance concern dated <strong>{$incident}</strong>.</p>",
-        };
-
-        $closing = "<p>If your child will be absent or late due to illness or family commitments, please let us know ahead of time.</p>"
-            . "<p>You can email/call/text us at <strong>{$phone}</strong>.</p>";
-
-        return [$subject, $intro . $details . $closing];
-    }
-
 
     public function compose()
     {
@@ -2085,8 +2033,8 @@ class AttendanceTrackingController extends BaseController
         $rendered = $this->renderTemplate($code, $variant, $ctx);
 
         if (!$rendered) {
-            log_message('warning', 'Attendance email template missing; using fallback compose body. code=' . $code . ' variant=' . $variant);
-            $rendered = $this->buildFallbackTemplate($code, $variant, $ctx);
+            return redirect()->to(site_url('attendance/violations'))
+                ->with('error', 'Template not found for ' . $code . ' (' . $variant . ').');
         }
 
         [$subject, $body] = $rendered;

app/Controllers/View/DiscountController.php

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