fix logo

report cadr and trophy
move qr code inside the certificate
2026-05-26 23:14:55 -04:00 · 2026-05-26 05:11:10 -04:00 · 2026-05-26 03:09:48 -04:00 · 2026-05-26 03:03:03 -04:00 · 2026-05-26 02:13:39 -04:00 · 2026-05-26 01:44:57 -04:00
53 changed files with 2855 additions and 351 deletions
@@ -9,6 +9,7 @@ use App\Listeners\SchoolEventListener;
 use App\Listeners\AttendanceConsequenceListener;
 use App\Listeners\WhatsappInviteListener;
 use App\Listeners\BelowSixtyEmailListener;
+use App\Listeners\DecisionEmailListener;

 // Create an instance so we can use $this->emailService like your other handlers
 $waListener = new WhatsappInviteListener(service('emailService'));
@@ -118,6 +119,7 @@ Events::on('attendance.follow_up',   [AttendanceConsequenceListener::class, 'fol
 Events::on('attendance.final_warning', [AttendanceConsequenceListener::class, 'finalWarning']);
 Events::on('attendance.dismissal',   [AttendanceConsequenceListener::class, 'dismissal']);
 Events::on('below60.email', [BelowSixtyEmailListener::class, 'handle']);
+Events::on('below60.decision_email', [DecisionEmailListener::class, 'handle']);

 //Whatsapp Event listener
 Events::on('whatsapp_invites.send', [$waListener, 'handle']);
@@ -180,8 +180,10 @@ $routes->get('administrator/trophy/final',        'View\TrophyController::final'

 // Certificates
 $routes->get('administrator/certificates',           'View\CertificateController::index',    ['filter' => 'auth:admin']);
+$routes->get('administrator/certificates/csrf-token', 'View\CertificateController::csrfToken', ['filter' => 'auth:admin']);
 $routes->post('administrator/certificates/generate', 'View\CertificateController::generate', ['filter' => 'auth:admin']);
 $routes->get('administrator/certificates/log',       'View\CertificateController::auditLog',  ['filter' => 'auth:admin']);
+$routes->get('administrator/certificates/reprint/(:any)', 'View\CertificateController::reprint/$1', ['filter' => 'auth:read']);
 $routes->get('verify/(:segment)',                    'View\CertificateController::verify/$1');


@@ -521,6 +523,14 @@ $routes->post('grading/below-60/email', 'View\GradingController::sendBelowSixtyE
 $routes->post('grading/below-60/status', 'View\GradingController::updateBelowSixtyStatus', ['filter' => 'auth:read']);
 $routes->get('grading/below-60/schedule', 'View\GradingController::scheduleBelowSixty', ['filter' => 'auth:read']);
 $routes->post('grading/below-60/schedule', 'View\GradingController::saveBelowSixtyMeeting', ['filter' => 'auth:read']);
+$routes->get('grading/decisions', 'View\GradingController::allDecisions', ['filter' => 'auth:read']);
+$routes->post('grading/decisions/generate', 'View\GradingController::generateAllDecisions', ['filter' => 'auth:read']);
+$routes->get('grading/below-60/decisions', 'View\GradingController::belowSixtyDecisions', ['filter' => 'auth:read']);
+$routes->post('grading/below-60/decisions/save', 'View\GradingController::saveBelowSixtyDecision', ['filter' => 'auth:read']);
+$routes->get('grading/below-60/decisions/student-details', 'View\GradingController::studentDecisionDetails', ['filter' => 'auth:read']);
+$routes->get('grading/below-60/decisions/email/preview', 'View\GradingController::previewDecisionEmail', ['filter' => 'auth:read']);
+$routes->get('grading/below-60/decisions/email/edit', 'View\GradingController::editDecisionEmail', ['filter' => 'auth:read']);
+$routes->post('grading/below-60/decisions/email', 'View\GradingController::sendDecisionEmail', ['filter' => 'auth:read']);


 // Final part
@@ -6,6 +6,7 @@ use App\Controllers\BaseController;
 use App\Models\ClassSectionModel;
 use App\Models\ConfigurationModel;
 use App\Models\CertificateRecordModel;
+use App\Models\StudentDecisionModel;

 class CertificateController extends BaseController
 {
@@ -27,40 +28,120 @@ class CertificateController extends BaseController
    public function index()
    {
        $db             = \Config\Database::connect();
-        $classSectionId = $this->request->getGet('class_section_id');
+        $selectedCsid   = $this->request->getGet('class_section_id');
        $schoolYear     = $this->request->getGet('school_year') ?? $this->schoolYear;

-        $classSections = $db->table('classSection cs')
-            ->select('cs.class_section_id, cs.class_section_name')
-            ->join('student_class sc', 'sc.class_section_id = cs.class_section_id')
-            ->join('students s', 's.id = sc.student_id')
-            ->where('s.is_active', 1)
-            ->where('sc.school_year', $schoolYear)
-            ->groupBy('cs.class_section_id, cs.class_section_name')
-            ->having('COUNT(s.id) >', 1)
-            ->orderBy('cs.class_section_name', 'ASC')
-            ->get()->getResultArray();
-
-        $students = [];
-        if ($classSectionId) {
-            $students = $db->table('student_class sc')
-                ->select('s.id, s.firstname, s.lastname, cs.class_section_name AS grade')
+        // ── All enrolled students across every class section ───────────────────
+        $allEnrolled = $db->table('student_class sc')
+            ->select('s.id AS student_id, s.firstname, s.lastname, sc.class_section_id, cs.class_section_name')
            ->join('students s', 's.id = sc.student_id')
            ->join('classSection cs', 'cs.class_section_id = sc.class_section_id')
-                ->where('sc.class_section_id', (int) $classSectionId)
            ->where('s.is_active', 1)
            ->where('sc.school_year', $schoolYear)
-                ->orderBy('s.lastname', 'ASC')
            ->orderBy('s.firstname', 'ASC')
+            ->orderBy('s.lastname', 'ASC')
            ->get()->getResultArray();
+
+        $allIds = array_unique(array_column($allEnrolled, 'student_id'));
+
+        // ── Semester scores ────────────────────────────────────────────────────
+        $allScoreMap = [];
+        if (!empty($allIds)) {
+            foreach ($db->table('semester_scores')
+                ->select('student_id, semester, semester_score')
+                ->whereIn('student_id', $allIds)
+                ->where('school_year', $schoolYear)
+                ->where('semester_score IS NOT NULL', null, false)
+                ->get()->getResultArray() as $sr) {
+                $allScoreMap[(int)$sr['student_id']][ucfirst(strtolower($sr['semester']))] =
+                    is_numeric($sr['semester_score']) ? (float)$sr['semester_score'] : null;
+            }
+        }
+
+        // ── Below-60 manual decisions ──────────────────────────────────────────
+        $allBelowMap = [];
+        if (!empty($allIds)) {
+            foreach ($db->table('below_sixty_decisions')
+                ->whereIn('student_id', $allIds)
+                ->where('school_year', $schoolYear)
+                ->get()->getResultArray() as $b) {
+                $allBelowMap[(int)$b['student_id']][ucfirst(strtolower($b['semester']))] = (string)$b['decision'];
+            }
+        }
+
+        // ── Certificate records (most recent per student) ──────────────────────
+        $certsByStudent = [];
+        if (!empty($allIds)) {
+            foreach ($db->table('certificate_records')
+                ->select('student_id, certificate_number, issued_at')
+                ->whereIn('student_id', $allIds)
+                ->where('school_year', $schoolYear)
+                ->orderBy('issued_at', 'DESC')
+                ->get()->getResultArray() as $c) {
+                $sid = (int)$c['student_id'];
+                if (!isset($certsByStudent[$sid])) {
+                    $certsByStudent[$sid] = $c['certificate_number'];
+                }
+            }
+        }
+
+        // ── Build per-student decisions + per-class buckets ────────────────────
+        $decisionsByStudent = [];
+        $studentsByClass    = [];   // [csid => [student rows...]]
+        $statsPerClass      = [];   // [csid => {name, total, pass, cert}]
+
+        foreach ($allEnrolled as $row) {
+            $sid  = (int)$row['student_id'];
+            $csid = (int)$row['class_section_id'];
+
+            // Decisions per semester
+            foreach ($allScoreMap[$sid] ?? [] as $sem => $score) {
+                if ($score === null) continue;
+                if ($score >= 60) {
+                    $dec = 'Pass'; $src = 'auto';
+                } elseif (!empty($allBelowMap[$sid][$sem])) {
+                    $dec = $allBelowMap[$sid][$sem]; $src = 'manual';
+                } else {
+                    $dec = ''; $src = 'pending';
+                }
+                $decisionsByStudent[$sid][$sem] = ['decision' => $dec, 'source' => $src];
+            }
+
+            // Per-class stats
+            if (!isset($statsPerClass[$csid])) {
+                $statsPerClass[$csid] = ['name' => $row['class_section_name'], 'total' => 0, 'pass' => 0, 'cert' => 0];
+            }
+            $statsPerClass[$csid]['total']++;
+
+            $sems   = $allScoreMap[$sid] ?? [];
+            $isPass = !empty($sems);
+            foreach ($sems as $sem => $score) {
+                if ($score === null) { $isPass = false; break; }
+                if ($score >= 60) continue;
+                $md = $allBelowMap[$sid][$sem] ?? '';
+                if ($md === '' || $md !== 'Pass') { $isPass = false; break; }
+            }
+            if ($isPass)                    $statsPerClass[$csid]['pass']++;
+            if (isset($certsByStudent[$sid])) $statsPerClass[$csid]['cert']++;
+
+            // Group students by class
+            $studentsByClass[$csid][] = $row;
+        }
+
+        // ── Determine default active tab ───────────────────────────────────────
+        $firstCsid = !empty($allEnrolled) ? (int)$allEnrolled[0]['class_section_id'] : null;
+        if ($selectedCsid === null && $firstCsid !== null) {
+            $selectedCsid = (string)$firstCsid;
        }

        return view('admin/certificates/index', [
-            'classSections'   => $classSections,
-            'students'        => $students,
-            'selectedClassId' => $classSectionId,
+            'studentsByClass'    => $studentsByClass,
+            'selectedClassId'    => $selectedCsid,
            'schoolYear'         => $schoolYear,
            'certDate'           => date('m/d/Y'),
+            'decisionsByStudent' => $decisionsByStudent,
+            'certsByStudent'     => $certsByStudent,
+            'statsPerClass'      => $statsPerClass,
        ]);
    }

@@ -77,6 +158,17 @@ class CertificateController extends BaseController
        ]);
    }

+    public function csrfToken()
+    {
+        return $this->response
+            ->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+            ->setHeader('Pragma', 'no-cache')
+            ->setJSON([
+                'csrf_token' => csrf_token(),
+                'csrf_hash'  => csrf_hash(),
+            ]);
+    }
+
    // ─── Public verification page ──────────────────────────────────────────────

    public function verify(string $certNumber)
@@ -91,6 +183,51 @@ class CertificateController extends BaseController
        return view('certificates/verify', ['record' => $record ?: null]);
    }

+    // ─── Reprint an existing certificate ──────────────────────────────────────
+
+    public function reprint(string $certNumber)
+    {
+        $record = \Config\Database::connect()
+            ->table('certificate_records')
+            ->where('certificate_number', strtoupper($certNumber))
+            ->get()->getRowArray();
+
+        if (!$record) {
+            return redirect()->to('administrator/certificates/log')
+                ->with('error', 'Certificate not found: ' . $certNumber);
+        }
+
+        $certDateFormatted = '';
+        if (!empty($record['cert_date'])) {
+            $ts = strtotime((string)$record['cert_date']);
+            if ($ts) {
+                $certDateFormatted = date('m/d/Y', $ts);
+            }
+        }
+
+        $student = [
+            'firstname'   => (string)($record['student_name'] ?? ''),
+            'lastname'    => '',
+            'grade'       => (string)($record['grade'] ?? ''),
+            'cert_number' => (string)($record['certificate_number'] ?? ''),
+        ];
+
+        // student_name is stored as "Firstname Lastname" — split for the PDF builder
+        $parts = explode(' ', trim($student['firstname']), 2);
+        if (count($parts) === 2) {
+            $student['firstname'] = $parts[0];
+            $student['lastname']  = $parts[1];
+        }
+
+        $pdfData  = $this->buildPdf([$student], $certDateFormatted ?: date('m/d/Y'));
+        $filename = 'Certificate_' . strtoupper($certNumber) . '.pdf';
+
+        return $this->response
+            ->setHeader('Content-Type', 'application/pdf')
+            ->setHeader('Content-Disposition', 'inline; filename="' . $filename . '"')
+            ->setBody($pdfData);
+    }
+
    // ─── PDF generation ────────────────────────────────────────────────────────

    public function generate()
@@ -101,6 +238,16 @@ class CertificateController extends BaseController
        $schoolYear     = $this->request->getPost('school_year') ?? $this->schoolYear;

        if (empty($studentIds)) {
+            if ($this->request->isAJAX()) {
+                return $this->response
+                    ->setStatusCode(422)
+                    ->setJSON([
+                        'ok' => false,
+                        'error' => 'Please select at least one student.',
+                        'csrf_token' => csrf_token(),
+                        'csrf_hash' => csrf_hash(),
+                    ]);
+            }
            return redirect()->to('administrator/certificates')->with('error', 'Please select at least one student.');
        }

@@ -108,6 +255,16 @@ class CertificateController extends BaseController
        $certDate   = preg_replace('/[^0-9\/\-]/', '', $certDate);

        if (empty($studentIds)) {
+            if ($this->request->isAJAX()) {
+                return $this->response
+                    ->setStatusCode(422)
+                    ->setJSON([
+                        'ok' => false,
+                        'error' => 'Invalid student selection.',
+                        'csrf_token' => csrf_token(),
+                        'csrf_hash' => csrf_hash(),
+                    ]);
+            }
            return redirect()->to('administrator/certificates')->with('error', 'Invalid student selection.');
        }

@@ -140,6 +297,16 @@ class CertificateController extends BaseController
        }

        if (empty($students)) {
+            if ($this->request->isAJAX()) {
+                return $this->response
+                    ->setStatusCode(422)
+                    ->setJSON([
+                        'ok' => false,
+                        'error' => 'No valid students found.',
+                        'csrf_token' => csrf_token(),
+                        'csrf_hash' => csrf_hash(),
+                    ]);
+            }
            return redirect()->to('administrator/certificates')->with('error', 'No valid students found.');
        }

@@ -147,11 +314,28 @@ class CertificateController extends BaseController
        $issuedAt   = date('Y-m-d H:i:s');
        $certDateDb = $this->parseCertDate($certDate);

+        // Load any existing certificates for these students this school year
+        $db         = \Config\Database::connect();
+        $existingCerts = $db->table('certificate_records')
+            ->select('student_id, certificate_number')
+            ->whereIn('student_id', array_column($students, 'id'))
+            ->where('school_year', $schoolYear)
+            ->get()->getResultArray();
+        $existingCertMap = [];
+        foreach ($existingCerts as $ec) {
+            $existingCertMap[(int)$ec['student_id']] = $ec['certificate_number'];
+        }
+
        foreach ($students as &$student) {
+            $sid = (int)$student['id'];
+            if (isset($existingCertMap[$sid])) {
+                // Reuse existing certificate number — do not create a new record
+                $student['cert_number'] = $existingCertMap[$sid];
+            } else {
                $certNumber = $this->certRecordModel->nextNumber($schoolYear);
                $this->certRecordModel->insert([
                    'certificate_number' => $certNumber,
-                'student_id'         => $student['id'],
+                    'student_id'         => $sid,
                    'student_name'       => $student['firstname'] . ' ' . $student['lastname'],
                    'grade'              => $this->formatGrade($student['grade'] ?? ''),
                    'cert_date'          => $certDateDb,
@@ -162,6 +346,7 @@ class CertificateController extends BaseController
                ]);
                $student['cert_number'] = $certNumber;
            }
+        }
        unset($student);

        $pdfData  = $this->buildPdf($students, $certDate);
@@ -170,6 +355,8 @@ class CertificateController extends BaseController
        return $this->response
            ->setHeader('Content-Type', 'application/pdf')
            ->setHeader('Content-Disposition', 'inline; filename="' . $filename . '"')
+            ->setHeader('X-CSRF-TOKEN-NAME', csrf_token())
+            ->setHeader('X-CSRF-TOKEN', csrf_hash())
            ->setBody($pdfData);
    }

@@ -191,43 +378,24 @@ class CertificateController extends BaseController
        $clean = trim($raw);
        $lower = strtolower($clean);

-        if (preg_match('/^\d+$/', $clean) && (int)$clean >= 1 && (int)$clean <= 9) {
-            return 'Grade ' . $clean;
+        // Strip section suffix: "Grade 1-A" → "Grade 1", "Grade 2-B" → "Grade 2"
+        if (preg_match('/^grade\s*(\d+)/i', $clean, $m)) {
+            return 'Grade ' . (int)$m[1];
        }
        if ($lower === 'youth') {
            return 'Youth';
        }
-        if ($lower === 'kg') {
+        if ($lower === 'kg' || $lower === 'kindergarten') {
            return 'Kindergarten';
        }
+        // Raw number or number-section (e.g. "1", "1-A", "2-B") → keep number only
+        if (preg_match('/^(\d+)([- ][A-Za-z0-9]+)?$/', $clean, $m)) {
+            return 'Grade ' . (int)$m[1];
+        }

        return $clean;
    }

-    /**
-     * Generates a QR code PNG for $url and returns its temporary file path.
-     * Caller must unlink() the file when done.
-     */
-    private function makeQrTempFile(string $url): ?string
-    {
-        try {
-            $result = \Endroid\QrCode\Builder\Builder::create()
-                ->writer(new \Endroid\QrCode\Writer\PngWriter())
-                ->data($url)
-                ->encoding(new \Endroid\QrCode\Encoding\Encoding('UTF-8'))
-                ->size(300)
-                ->margin(2)
-                ->build();
-
-            $tmp = tempnam(sys_get_temp_dir(), 'cert_qr_') . '.png';
-            $result->saveToFile($tmp);
-            return $tmp;
-        } catch (\Throwable $e) {
-            log_message('error', 'Certificate QR generation failed: ' . $e->getMessage());
-            return null;
-        }
-    }
-
    // ─── PDF rendering ─────────────────────────────────────────────────────────

    private function buildPdf(array $students, string $certDate): string
@@ -252,8 +420,6 @@ class CertificateController extends BaseController
        $W = $pdf->getPageWidth();
        $H = $pdf->getPageHeight();

-        $tmpFiles = [];
-
        foreach ($students as $student) {
            $pdf->AddPage();

@@ -261,28 +427,18 @@ class CertificateController extends BaseController
            $grade      = $this->formatGrade($student['grade'] ?? '');
            $certNumber = $student['cert_number'] ?? '';

-            // Build verification URL and generate QR temp file
-            $verifyUrl = base_url('verify/' . rawurlencode($certNumber));
-            $qrFile    = $certNumber !== '' ? $this->makeQrTempFile($verifyUrl) : null;
-            if ($qrFile) {
-                $tmpFiles[] = $qrFile;
-            }
+            // Build verification URL for an inline TCPDF QR code.
+            $verifyUrl = site_url('verify/' . rawurlencode($certNumber));

            $this->drawCertificate(
                $pdf, $W, $H,
                $name, $grade, $certDate, $certNumber,
-                $qrFile,
+                $verifyUrl,
                $imgDir, $edwardianFont, $garamondBold, $ebGaramond
            );
        }

-        $output = $pdf->Output('', 'S');
-
-        foreach ($tmpFiles as $f) {
-            @unlink($f);
-        }
-
-        return $output;
+        return $pdf->Output('', 'S');
    }

    /**
@@ -297,7 +453,7 @@ class CertificateController extends BaseController
        string $grade,
        string $certDate,
        string $certNumber,
-        ?string $qrFile,
+        ?string $verifyUrl,
        string $imgDir,
        string $edwardianFont,
        string $garamondBold,
@@ -306,15 +462,7 @@ class CertificateController extends BaseController
        // ── Images
        $pdf->Image($imgDir . 'title.png',      126, 0,   600);
        $pdf->Image($imgDir . 'background.png', 280, 176, 291, 340);
-        $pdf->Image($imgDir . 'signature.png',  140, 399,  90,  90);
-
-        // ── QR code — bottom-right corner: 1.5 cm from bottom, 2.5 cm from right
-        $qrSize = 42; // pt
-        if ($qrFile !== null && file_exists($qrFile)) {
-            $qrX = $W - 70.87 - $qrSize; // 2.5 cm from right edge
-            $qrY = $H - 42.52 - $qrSize; // 1.5 cm from bottom edge
-            $pdf->Image($qrFile, $qrX, $qrY, $qrSize, $qrSize);
-        }
+        $pdf->Image($imgDir . 'signature.png',  140, 410,  90,  80);

        // ── "Presented to:"
        $pdf->SetFont('times', 'B', 24);
@@ -322,13 +470,24 @@ class CertificateController extends BaseController
        $pdf->SetXY(0, 151);
        $pdf->Cell($W, 24, 'Presented to:', 0, 0, 'C');

-        // ── Student name (bold via fill + stroke)
+        // ── QR code — left-aligned with "Presented to:", vertically centred on that line
+        $qrSize = 42; // pt
+        if (!empty($verifyUrl)) {
+            $qrX = 120;                       // ~1 cm from left edge
+            $qrY = 171 + (24 - $qrSize) / 2; // vertically centred on "Presented to:" row
+            $style = [
+                'border' => false,
+                'padding' => 0,
+                'fgcolor' => [0, 0, 0],
+                'bgcolor' => false,
+            ];
+            $pdf->write2DBarcode($verifyUrl, 'QRCODE,L', $qrX, $qrY, $qrSize, $qrSize, $style, 'N');
+        }
+
+        // ── Student name — center based on actual string width
        $pdf->SetFont($edwardianFont, '', 38);
-        $pdf->SetDrawColor(0, 0, 0);
-        $pdf->setTextRenderingMode(0.4, true, false);
-        $pdf->SetXY(0, 219);
-        $pdf->Cell($W, 38, $name, 0, 0, 'C');
-        $pdf->setTextRenderingMode(0, true, false);
+        $nameX = ($W - $pdf->GetStringWidth($name)) / 2;
+        $this->drawGradientText($pdf, $edwardianFont, 38, $name, $nameX, 229.5);
  
        // ── Line under name
        $pdf->SetFont('times', '', 20);
@@ -356,7 +515,7 @@ class CertificateController extends BaseController
        $pdf->Cell($W, 20, 'Al Rahma Sunday School', 0, 0, 'C');

        // ── Date (gradient script)
-        $this->drawGradientText($pdf, $edwardianFont, 26, $certDate, 598, 453);
+        $this->drawGradientText($pdf, $edwardianFont, 26, $certDate, 586, 456);

        // ── Date underline + label
        $pdf->SetFont('times', '', 20);
@@ -375,7 +534,7 @@ class CertificateController extends BaseController
        if ($certNumber !== '') {
            $pdf->SetFont('helvetica', '', 8);
            $pdf->SetTextColor(150, 150, 150);
-            $pdf->SetXY(70.87, $H - 39.68);
+            $pdf->SetXY(70.86, $H - 39.68);
            $pdf->Cell(200, 12, 'Certificate No. ' . $certNumber, 0, 0, 'L');
            $pdf->SetTextColor(0, 0, 0);
        }
@@ -388,7 +547,7 @@ class CertificateController extends BaseController
        for ($i = 0; $i < 6; $i++) {
            $pdf->setAlpha(($i + 1) * 25 / 255);
            $pdf->SetTextColor(0, 0, 0);
-            $pdf->Text($x + $i / 5, $y + $i / 5, $text);
+            $pdf->Text($x + $i / 4, $y + $i / 4, $text);
        }

        $pdf->setAlpha(1);
@@ -28,6 +28,8 @@ use App\Models\PlacementLevelModel;
 use App\Models\PlacementBatchModel;
 use App\Models\PlacementScoreModel;
 use App\Models\GradingLockModel;
+use App\Models\BelowSixtyDecisionModel;
+use App\Models\StudentDecisionModel;
 use App\Services\NavbarService;

 //use App\Models\ScoreModel;
@@ -1074,7 +1076,8 @@ class GradingController extends Controller
        $requestedSemester = trim((string)($this->request->getGet('semester') ?? ''));
        $requestedYear = trim((string)($this->request->getGet('school_year') ?? ''));

-        $semester = $requestedSemester !== '' ? $requestedSemester : ($configuredSemester !== '' ? $configuredSemester : 'Fall');
+        $isYearMode = (strtolower($requestedSemester) === 'year');
+        $semester = $isYearMode ? 'year' : ($requestedSemester !== '' ? $requestedSemester : ($configuredSemester !== '' ? $configuredSemester : 'Fall'));
        $schoolYear = $requestedYear !== '' ? $requestedYear : $configuredYear;

        $schoolYears = $this->getSchoolYearsForScores($schoolYear);
@@ -1088,6 +1091,8 @@ class GradingController extends Controller
            'schoolYear' => $schoolYear,
            'schoolYears' => $schoolYears,
            'canViewGrading' => $canViewGrading,
+            'isYearMode' => $isYearMode,
+            'showAllSemesterOption' => true,
        ]);
    }

@@ -1760,14 +1765,16 @@ class GradingController extends Controller

    private function fetchBelowSixtyRows(string $schoolYear, string $semester): array
    {
-        $semesterKey = strtolower(trim($semester));
-        $rows = $this->db->table('semester_scores ss')
+        $isYearMode = strtolower(trim($semester)) === 'year';
+        $semesterKey = $isYearMode ? '' : strtolower(trim($semester));
+        $builder = $this->db->table('semester_scores ss')
            ->select([
                's.id AS student_id',
                's.school_id',
                's.firstname',
                's.lastname',
                'cs.class_section_name',
+                'ss.semester',
                'ss.homework_avg',
                'ss.project_avg',
                'ss.participation_score',
@@ -1782,11 +1789,17 @@ class GradingController extends Controller
            ->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
            ->where('s.is_active', 1)
            ->where('ss.school_year', $schoolYear)
-            ->where("LOWER(TRIM(ss.semester))", $semesterKey)
            ->where('ss.semester_score IS NOT NULL', null, false)
-            ->where('ss.semester_score <', 60)
+            ->where('ss.semester_score <', 60);
+
+        if (!$isYearMode) {
+            $builder->where("LOWER(TRIM(ss.semester))", $semesterKey);
+        }
+
+        $rows = $builder
            ->orderBy('s.lastname', 'ASC')
            ->orderBy('s.firstname', 'ASC')
+            ->orderBy('ss.semester', 'ASC')
            ->get()
            ->getResultArray();

@@ -1802,19 +1815,22 @@ class GradingController extends Controller

        $commentMap = [];
        if (!empty($studentIds)) {
-            $commentRows = $this->db->table('score_comments')
-                ->select('student_id, comment, created_at')
+            $commentBuilder = $this->db->table('score_comments')
+                ->select('student_id, semester, comment, created_at')
                ->where('score_type', 'general')
                ->where('school_year', $schoolYear)
-                ->where("LOWER(TRIM(semester))", $semesterKey)
                ->whereIn('student_id', $studentIds)
-                ->orderBy('created_at', 'DESC')
-                ->get()
-                ->getResultArray();
+                ->orderBy('created_at', 'DESC');
+            if (!$isYearMode) {
+                $commentBuilder->where("LOWER(TRIM(semester))", $semesterKey);
+            }
+            $commentRows = $commentBuilder->get()->getResultArray();
            foreach ($commentRows as $row) {
                $sid = (int)($row['student_id'] ?? 0);
-                if ($sid > 0 && !isset($commentMap[$sid])) {
-                    $commentMap[$sid] = (string)($row['comment'] ?? '');
+                $sem = strtolower(trim((string)($row['semester'] ?? '')));
+                $key = $sid . '_' . $sem;
+                if ($sid > 0 && !isset($commentMap[$key])) {
+                    $commentMap[$key] = (string)($row['comment'] ?? '');
                }
            }
        }
@@ -1822,21 +1838,24 @@ class GradingController extends Controller
        $statusMap = [];
        $noteMap = [];
        if (!empty($studentIds)) {
-            $flagRows = $this->db->table('current_flag')
-                ->select('student_id, flag_state, open_description, close_description')
+            $flagBuilder = $this->db->table('current_flag')
+                ->select('student_id, semester, flag_state, open_description, close_description')
                ->where('flag', 'grade')
                ->where('school_year', $schoolYear)
-                ->where("LOWER(TRIM(semester))", $semesterKey)
-                ->whereIn('student_id', $studentIds)
-                ->get()
-                ->getResultArray();
+                ->whereIn('student_id', $studentIds);
+            if (!$isYearMode) {
+                $flagBuilder->where("LOWER(TRIM(semester))", $semesterKey);
+            }
+            $flagRows = $flagBuilder->get()->getResultArray();
            foreach ($flagRows as $row) {
                $sid = (int)($row['student_id'] ?? 0);
                if ($sid <= 0) continue;
-                $statusMap[$sid] = (string)($row['flag_state'] ?? '');
+                $sem = strtolower(trim((string)($row['semester'] ?? '')));
+                $key = $sid . '_' . $sem;
+                $statusMap[$key] = (string)($row['flag_state'] ?? '');
                $openNote = trim((string)($row['open_description'] ?? ''));
                $closeNote = trim((string)($row['close_description'] ?? ''));
-                $noteMap[$sid] = [
+                $noteMap[$key] = [
                    'open' => $openNote,
                    'closed' => $closeNote,
                ];
@@ -1845,10 +1864,12 @@ class GradingController extends Controller

        foreach ($rows as &$row) {
            $sid = (int)($row['student_id'] ?? 0);
-            $row['comment'] = $commentMap[$sid] ?? '';
-            $flagState = strtolower(trim((string)($statusMap[$sid] ?? '')));
+            $sem = strtolower(trim((string)($row['semester'] ?? '')));
+            $key = $sid . '_' . $sem;
+            $row['comment'] = $commentMap[$key] ?? '';
+            $flagState = strtolower(trim((string)($statusMap[$key] ?? '')));
            $row['status'] = ($flagState === 'closed' || $flagState === 'canceled') ? 'Closed' : 'Open';
-            $noteBag = $noteMap[$sid] ?? ['open' => '', 'closed' => ''];
+            $noteBag = $noteMap[$key] ?? ['open' => '', 'closed' => ''];
            $rawNote = $row['status'] === 'Closed' ? (string)$noteBag['closed'] : (string)$noteBag['open'];
            if ($rawNote !== '') {
                $lines = preg_split('/\R/', $rawNote);
@@ -1954,6 +1975,73 @@ class GradingController extends Controller
        return false;
    }

+    private function fetchAllSemestersForStudent(int $studentId, string $schoolYear): array
+    {
+        $rows = $this->db->table('semester_scores ss')
+            ->select([
+                'ss.semester',
+                'cs.class_section_name',
+                'ss.homework_avg',
+                'ss.project_avg',
+                'ss.participation_score',
+                'COALESCE(ss.test_avg, ss.quiz_avg) AS test_avg',
+                'ss.ptap_score',
+                'ss.attendance_score',
+                'ss.midterm_exam_score',
+                'ss.final_exam_score',
+                'ss.semester_score',
+            ])
+            ->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
+            ->where('ss.student_id', $studentId)
+            ->where('ss.school_year', $schoolYear)
+            ->orderBy('ss.semester', 'ASC')
+            ->get()
+            ->getResultArray();
+
+        $semesters = [];
+        foreach ($rows as $sr) {
+            $sem = ucfirst(strtolower(trim((string)($sr['semester'] ?? ''))));
+            $semesters[$sem] = [
+                'semester'            => $sem,
+                'class_section_name'  => $sr['class_section_name'] ?? '',
+                'homework_avg'        => $sr['homework_avg'] ?? null,
+                'project_avg'         => $sr['project_avg'] ?? null,
+                'participation_score' => $sr['participation_score'] ?? null,
+                'test_avg'            => $sr['test_avg'] ?? null,
+                'ptap_score'          => $sr['ptap_score'] ?? null,
+                'attendance_score'    => $sr['attendance_score'] ?? null,
+                'midterm_exam_score'  => $sr['midterm_exam_score'] ?? null,
+                'final_exam_score'    => $sr['final_exam_score'] ?? null,
+                'semester_score'      => $sr['semester_score'] ?? null,
+                'comments'            => [],
+            ];
+        }
+
+        if (!empty($semesters)) {
+            $commentRows = $this->db->table('score_comments')
+                ->select('semester, score_type, comment, created_at')
+                ->where('student_id', $studentId)
+                ->where('school_year', $schoolYear)
+                ->where('comment IS NOT NULL', null, false)
+                ->where('comment !=', '')
+                ->orderBy('semester', 'ASC')
+                ->orderBy('score_type', 'ASC')
+                ->orderBy('created_at', 'DESC')
+                ->get()
+                ->getResultArray();
+
+            foreach ($commentRows as $c) {
+                $sem  = ucfirst(strtolower(trim((string)($c['semester'] ?? ''))));
+                $type = strtolower(trim((string)($c['score_type'] ?? 'general')));
+                if (isset($semesters[$sem]) && !isset($semesters[$sem]['comments'][$type])) {
+                    $semesters[$sem]['comments'][$type] = (string)($c['comment'] ?? '');
+                }
+            }
+        }
+
+        return array_values($semesters);
+    }
+
    private function fetchBelowSixtyParentName(int $studentId): string
    {
        $parentName = 'Parent/Guardian';
@@ -2124,6 +2212,622 @@ class GradingController extends Controller
    }


+    public function belowSixtyDecisions()
+    {
+        $configuredSemester = (string) $this->semester;
+        $configuredYear     = (string) $this->schoolYear;
+
+        $semester   = trim((string)($this->request->getGet('semester') ?? ''));
+        $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
+        if ($semester === '') $semester = $configuredSemester !== '' ? $configuredSemester : 'Fall';
+        if ($schoolYear === '') $schoolYear = $configuredYear;
+
+        $schoolYears = $this->getSchoolYearsForScores($schoolYear);
+        $rows        = $this->fetchBelowSixtyRows($schoolYear, $semester);
+
+        $decisionModel = new BelowSixtyDecisionModel();
+        $studentIds = array_values(array_unique(array_filter(
+            array_map(static fn($r) => (int)($r['student_id'] ?? 0), $rows),
+            static fn($id) => $id > 0
+        )));
+
+        $decisionMap = [];
+        if (!empty($studentIds)) {
+            $dRows = $decisionModel
+                ->whereIn('student_id', $studentIds)
+                ->where('semester', $semester)
+                ->where('school_year', $schoolYear)
+                ->findAll();
+            foreach ($dRows as $d) {
+                $decisionMap[(int)$d['student_id']] = $d;
+            }
+        }
+
+        foreach ($rows as &$row) {
+            $sid = (int)($row['student_id'] ?? 0);
+            $row['decision']       = $decisionMap[$sid]['decision'] ?? '';
+            $row['decision_notes'] = $decisionMap[$sid]['notes']    ?? '';
+        }
+        unset($row);
+
+        // Load consolidated decisions from student_decisions for this term
+        $sdModel = new StudentDecisionModel();
+        $sdRows  = $sdModel
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->findAll();
+        $sdMap = [];
+        foreach ($sdRows as $sd) {
+            $sdMap[(int)$sd['student_id']] = $sd;
+        }
+
+        // Load the most recent certificate per student for this school_year
+        $studentIds = array_values(array_unique(array_filter(
+            array_map(static fn($r) => (int)($r['student_id'] ?? 0), $rows),
+            static fn($id) => $id > 0
+        )));
+        $certMap = [];
+        if (!empty($studentIds)) {
+            $certRows = $this->db->table('certificate_records')
+                ->select('student_id, certificate_number, issued_at')
+                ->where('school_year', $schoolYear)
+                ->whereIn('student_id', $studentIds)
+                ->orderBy('issued_at', 'DESC')
+                ->get()->getResultArray();
+            foreach ($certRows as $cr) {
+                $sid = (int)($cr['student_id'] ?? 0);
+                if ($sid > 0 && !isset($certMap[$sid])) {
+                    $certMap[$sid] = (string)($cr['certificate_number'] ?? '');
+                }
+            }
+        }
+
+        foreach ($rows as &$row) {
+            $sid = (int)($row['student_id'] ?? 0);
+            $row['consolidated_decision'] = $sdMap[$sid]['decision'] ?? null;
+            $row['certificate_number']    = $certMap[$sid] ?? '';
+        }
+        unset($row);
+
+        $canViewGrading = $this->userHasMenuUrl('grading');
+
+        return view('grading/below_sixty_decisions', [
+            'rows'          => $rows,
+            'semester'      => $semester,
+            'schoolYear'    => $schoolYear,
+            'schoolYears'   => $schoolYears,
+            'canViewGrading' => $canViewGrading,
+        ]);
+    }
+
+    public function saveBelowSixtyDecision()
+    {
+        $studentId  = (int)$this->request->getPost('student_id');
+        $semester   = trim((string)$this->request->getPost('semester'));
+        $schoolYear = trim((string)$this->request->getPost('school_year'));
+        $decision   = trim((string)$this->request->getPost('decision'));
+        $notes      = trim((string)$this->request->getPost('notes'));
+
+        if ($studentId <= 0 || $semester === '' || $schoolYear === '') {
+            return redirect()->back()->with('error', 'Missing required data.');
+        }
+
+        $allowed = ['', 'Pass', 'Repeat Class', 'Make-up exam in fall', 'Deferred decision', 'Expel', 'Withdrawn'];
+        if (!in_array($decision, $allowed, true)) {
+            return redirect()->back()->with('error', 'Invalid decision value.');
+        }
+
+        $decisionModel = new BelowSixtyDecisionModel();
+        $existing = $decisionModel
+            ->where('student_id', $studentId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->first();
+
+        $userId = (int)(session()->get('user_id') ?? 0) ?: null;
+        $payload = [
+            'decision'    => $decision !== '' ? $decision : null,
+            'notes'       => $notes !== '' ? $notes : null,
+            'decided_by'  => $userId,
+        ];
+
+        if ($existing) {
+            $decisionModel->update((int)$existing['id'], $payload);
+        } else {
+            $payload['student_id']  = $studentId;
+            $payload['semester']    = $semester;
+            $payload['school_year'] = $schoolYear;
+            $decisionModel->insert($payload);
+        }
+
+        $query = http_build_query(['semester' => $semester, 'school_year' => $schoolYear]);
+        return redirect()->to(base_url('grading/below-60/decisions') . ($query ? '?' . $query : ''))
+            ->with('status', 'Decision saved.');
+    }
+
+    public function studentDecisionDetails()
+    {
+        $studentId  = (int)$this->request->getGet('student_id');
+        $schoolYear = trim((string)$this->request->getGet('school_year'));
+
+        if ($studentId <= 0 || $schoolYear === '') {
+            return $this->response->setJSON(['error' => 'Missing student or school year.'])->setStatusCode(400);
+        }
+
+        return $this->response->setJSON([
+            'semesters' => $this->fetchAllSemestersForStudent($studentId, $schoolYear),
+        ]);
+    }
+
+    public function previewDecisionEmail()
+    {
+        $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 $this->response->setJSON(['error' => 'Missing student or term.'])->setStatusCode(400);
+        }
+
+        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
+        if (empty($row)) {
+            return $this->response->setJSON(['error' => 'Student not found.'])->setStatusCode(404);
+        }
+
+        $decisionModel = new BelowSixtyDecisionModel();
+        $decisionRow = $decisionModel
+            ->where('student_id', $studentId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->first();
+
+        $decision    = (string)($decisionRow['decision'] ?? '');
+        $notes       = (string)($decisionRow['notes'] ?? '');
+        $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+        $parentName  = $this->fetchBelowSixtyParentName($studentId);
+
+        $subject = 'Academic Decision';
+        if ($studentName !== '') $subject .= ' — ' . $studentName;
+        if ($semester !== '' || $schoolYear !== '') {
+            $subject .= ' (' . trim($semester . ' ' . $schoolYear) . ')';
+        }
+
+        $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,
+        ];
+
+        // Fetch all semesters' scores + comments for the email
+        $allSemesters = $this->fetchAllSemestersForStudent($studentId, $schoolYear);
+
+        $html = view('emails/below_sixty_decision', [
+            'title'              => $subject,
+            'parent_name'        => $parentName,
+            'student_name'       => $studentName !== '' ? $studentName : 'your student',
+            'class_section_name' => $row['class_section_name'] ?? '',
+            'semester'           => $semester,
+            'school_year'        => $schoolYear,
+            'decision'           => $decision,
+            'notes'              => $notes,
+            'scores'             => $scores,
+            'all_semesters'      => array_values($allSemesters),
+        ], ['saveData' => true]);
+
+        return $this->response->setJSON([
+            'subject'    => $subject,
+            'html'       => $html,
+            'student_id' => $studentId,
+        ]);
+    }
+
+    public function editDecisionEmail()
+    {
+        $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.');
+        }
+
+        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
+        if (empty($row)) {
+            return redirect()->back()->with('error', 'Student record not found for the selected term.');
+        }
+
+        $decisionModel = new BelowSixtyDecisionModel();
+        $decisionRow = $decisionModel
+            ->where('student_id', $studentId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->first();
+
+        $decision = (string)($decisionRow['decision'] ?? '');
+        $notes    = (string)($decisionRow['notes'] ?? '');
+
+        $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+        $parentName  = $this->fetchBelowSixtyParentName($studentId);
+
+        $subject = 'Academic Decision';
+        if ($studentName !== '') $subject .= ' — ' . $studentName;
+        if ($semester !== '' || $schoolYear !== '') {
+            $subject .= ' (' . trim($semester . ' ' . $schoolYear) . ')';
+        }
+
+        $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,
+        ];
+
+        $html = view('emails/below_sixty_decision', [
+            'title'              => $subject,
+            'parent_name'        => $parentName,
+            'student_name'       => $studentName !== '' ? $studentName : 'your student',
+            'class_section_name' => $row['class_section_name'] ?? '',
+            'semester'           => $semester,
+            'school_year'        => $schoolYear,
+            'decision'           => $decision,
+            'notes'              => $notes,
+            'scores'             => $scores,
+        ], ['saveData' => true]);
+
+        return view('grading/below_sixty_decision_email_editor', [
+            'studentId'   => $studentId,
+            'studentName' => $studentName,
+            'semester'    => $semester,
+            'schoolYear'  => $schoolYear,
+            'subject'     => $subject,
+            'html'        => $html,
+            'decision'    => $decision,
+        ]);
+    }
+
+    public function sendDecisionEmail()
+    {
+        $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.');
+        }
+
+        $decisionModel = new BelowSixtyDecisionModel();
+        $decisionRow = $decisionModel
+            ->where('student_id', $studentId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->first();
+
+        $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+        $subject = $subjectInput !== '' ? $subjectInput : ('Academic Decision — ' . $studentName . ' (' . trim($semester . ' ' . $schoolYear) . ')');
+
+        $allSemesters = $this->fetchAllSemestersForStudent($studentId, $schoolYear);
+
+        $payload = [
+            'student_id'         => $studentId,
+            'student_name'       => $studentName,
+            'class_section_name' => $row['class_section_name'] ?? '',
+            'semester'           => $semester,
+            'school_year'        => $schoolYear,
+            'decision'           => (string)($decisionRow['decision'] ?? ''),
+            'notes'              => (string)($decisionRow['notes'] ?? ''),
+            'subject'            => $subject,
+            'all_semesters'      => $allSemesters,
+            '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,
+            ],
+        ];
+
+        if (trim($htmlInput) !== '') {
+            $payload['html'] = $htmlInput;
+        }
+
+        \CodeIgniter\Events\Events::trigger('below60.decision_email', $payload);
+
+        $query = http_build_query(['semester' => $semester, 'school_year' => $schoolYear]);
+        return redirect()->to(base_url('grading/below-60/decisions') . ($query ? '?' . $query : ''))
+            ->with('status', 'Decision email sent to parent(s).');
+    }
+
+    public function allDecisions()
+    {
+        $configuredYear = (string)$this->schoolYear;
+
+        $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
+        if ($schoolYear === '') $schoolYear = $configuredYear;
+
+        $schoolYears = $this->getSchoolYearsForScores($schoolYear);
+
+        // Load saved year decisions (semester='year') for this school year
+        $decModel = new StudentDecisionModel();
+        $saved = $decModel
+            ->where('semester', 'year')
+            ->where('school_year', $schoolYear)
+            ->findAll();
+        $savedMap = [];
+        foreach ($saved as $s) {
+            $savedMap[(int)$s['student_id']] = $s;
+        }
+
+        // Fetch Fall and Spring semester_scores per student for this school year
+        $allScoreRows = $this->db->table('semester_scores ss')
+            ->select([
+                's.id AS student_id',
+                's.school_id',
+                's.firstname',
+                's.lastname',
+                'cs.class_section_name',
+                'LOWER(TRIM(ss.semester)) AS sem_key',
+                'ss.semester_score',
+            ])
+            ->join('students s', 's.id = ss.student_id', 'inner')
+            ->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
+            ->where('s.is_active', 1)
+            ->where('ss.school_year', $schoolYear)
+            ->whereIn('LOWER(TRIM(ss.semester))', ['fall', 'spring'])
+            ->where('ss.semester_score IS NOT NULL', null, false)
+            ->orderBy('cs.class_section_name', 'ASC')
+            ->orderBy('s.lastname', 'ASC')
+            ->orderBy('s.firstname', 'ASC')
+            ->get()->getResultArray();
+
+        // Group by student: keep one base info row + fall/spring scores
+        $studentMap = [];
+        foreach ($allScoreRows as $sr) {
+            $sid = (int)$sr['student_id'];
+            if (!isset($studentMap[$sid])) {
+                $studentMap[$sid] = [
+                    'student_id'         => $sid,
+                    'school_id'          => $sr['school_id'] ?? '',
+                    'firstname'          => $sr['firstname'] ?? '',
+                    'lastname'           => $sr['lastname']  ?? '',
+                    'class_section_name' => $sr['class_section_name'] ?? '',
+                    'fall_score'         => null,
+                    'spring_score'       => null,
+                ];
+            }
+            $semKey = strtolower(trim((string)($sr['sem_key'] ?? '')));
+            $val    = is_numeric($sr['semester_score']) ? (float)$sr['semester_score'] : null;
+            if ($semKey === 'fall') {
+                $studentMap[$sid]['fall_score']   = $val;
+            } elseif ($semKey === 'spring') {
+                $studentMap[$sid]['spring_score'] = $val;
+            }
+        }
+
+        // Pull below-60 decisions for either semester (use worst available)
+        $belowDecModel = new BelowSixtyDecisionModel();
+        $belowRows = $belowDecModel
+            ->where('school_year', $schoolYear)
+            ->findAll();
+        $belowMap = [];
+        foreach ($belowRows as $b) {
+            $sid = (int)$b['student_id'];
+            // prefer a non-empty decision over empty
+            if (!isset($belowMap[$sid]) || (string)($belowMap[$sid]['decision'] ?? '') === '') {
+                $belowMap[$sid] = $b;
+            }
+        }
+
+        // Build final rows with year_score = (fall + spring) / 2
+        $rows = [];
+        foreach ($studentMap as $sid => $info) {
+            $fall   = $info['fall_score'];
+            $spring = $info['spring_score'];
+
+            if ($fall !== null && $spring !== null) {
+                $yearScore = round(($fall + $spring) / 2, 2);
+            } elseif ($fall !== null) {
+                $yearScore = $fall;
+            } elseif ($spring !== null) {
+                $yearScore = $spring;
+            } else {
+                $yearScore = null;
+            }
+
+            if (isset($savedMap[$sid])) {
+                $decision = (string)($savedMap[$sid]['decision'] ?? '');
+                $source   = (string)($savedMap[$sid]['source']   ?? 'auto');
+                $notes    = (string)($savedMap[$sid]['notes']    ?? '');
+            } elseif ($yearScore !== null && $yearScore >= 60) {
+                $decision = 'Pass';
+                $source   = 'auto';
+                $notes    = '';
+            } elseif ($yearScore !== null && isset($belowMap[$sid])) {
+                $decision = (string)($belowMap[$sid]['decision'] ?? '');
+                $source   = $decision !== '' ? 'manual' : 'pending';
+                $notes    = (string)($belowMap[$sid]['notes']    ?? '');
+            } else {
+                $decision = '';
+                $source   = 'pending';
+                $notes    = '';
+            }
+
+            $rows[] = [
+                'student_id'         => $sid,
+                'school_id'          => $info['school_id'],
+                'firstname'          => $info['firstname'],
+                'lastname'           => $info['lastname'],
+                'class_section_name' => $info['class_section_name'],
+                'fall_score'         => $fall,
+                'spring_score'       => $spring,
+                'year_score'         => $yearScore,
+                'decision'           => $decision,
+                'source'             => $source,
+                'notes'              => $notes,
+                'saved'              => isset($savedMap[$sid]),
+            ];
+        }
+
+        $generated = !empty($saved);
+
+        return view('grading/all_decisions', [
+            'rows'        => $rows,
+            'schoolYear'  => $schoolYear,
+            'schoolYears' => $schoolYears,
+            'generated'   => $generated,
+        ]);
+    }
+
+    public function generateAllDecisions()
+    {
+        $schoolYear = trim((string)$this->request->getPost('school_year'));
+
+        if ($schoolYear === '') {
+            return redirect()->back()->with('error', 'Missing school year.');
+        }
+
+        // Fetch Fall and Spring scores per student
+        $allScoreRows = $this->db->table('semester_scores ss')
+            ->select([
+                's.id AS student_id',
+                's.firstname',
+                's.lastname',
+                'cs.class_section_name',
+                'LOWER(TRIM(ss.semester)) AS sem_key',
+                'ss.semester_score',
+            ])
+            ->join('students s', 's.id = ss.student_id', 'inner')
+            ->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
+            ->where('s.is_active', 1)
+            ->where('ss.school_year', $schoolYear)
+            ->whereIn('LOWER(TRIM(ss.semester))', ['fall', 'spring'])
+            ->where('ss.semester_score IS NOT NULL', null, false)
+            ->get()->getResultArray();
+
+        if (empty($allScoreRows)) {
+            return redirect()->back()->with('error', 'No semester scores found for this school year.');
+        }
+
+        // Group by student
+        $studentMap = [];
+        foreach ($allScoreRows as $sr) {
+            $sid = (int)$sr['student_id'];
+            if (!isset($studentMap[$sid])) {
+                $studentMap[$sid] = [
+                    'firstname'          => $sr['firstname'] ?? '',
+                    'lastname'           => $sr['lastname']  ?? '',
+                    'class_section_name' => $sr['class_section_name'] ?? '',
+                    'fall_score'         => null,
+                    'spring_score'       => null,
+                ];
+            }
+            $semKey = strtolower(trim((string)($sr['sem_key'] ?? '')));
+            $val    = is_numeric($sr['semester_score']) ? (float)$sr['semester_score'] : null;
+            if ($semKey === 'fall') {
+                $studentMap[$sid]['fall_score']   = $val;
+            } elseif ($semKey === 'spring') {
+                $studentMap[$sid]['spring_score'] = $val;
+            }
+        }
+
+        // Pull below-60 decisions for any semester of this year
+        $belowDecModel = new BelowSixtyDecisionModel();
+        $belowRows = $belowDecModel
+            ->where('school_year', $schoolYear)
+            ->findAll();
+        $belowMap = [];
+        foreach ($belowRows as $b) {
+            $sid = (int)$b['student_id'];
+            if (!isset($belowMap[$sid]) || (string)($belowMap[$sid]['decision'] ?? '') === '') {
+                $belowMap[$sid] = $b;
+            }
+        }
+
+        // Load existing year decisions to upsert
+        $decModel = new StudentDecisionModel();
+        $existing = $decModel
+            ->where('semester', 'year')
+            ->where('school_year', $schoolYear)
+            ->findAll();
+        $existingMap = [];
+        foreach ($existing as $e) {
+            $existingMap[(int)$e['student_id']] = $e;
+        }
+
+        $userId = (int)(session()->get('user_id') ?? 0) ?: null;
+        $savedCount = 0;
+
+        foreach ($studentMap as $sid => $info) {
+            $fall   = $info['fall_score'];
+            $spring = $info['spring_score'];
+
+            if ($fall !== null && $spring !== null) {
+                $yearScore = round(($fall + $spring) / 2, 2);
+            } elseif ($fall !== null) {
+                $yearScore = $fall;
+            } elseif ($spring !== null) {
+                $yearScore = $spring;
+            } else {
+                continue;
+            }
+
+            if ($yearScore >= 60) {
+                $decision = 'Pass';
+                $source   = 'auto';
+                $notes    = null;
+            } elseif (isset($belowMap[$sid]) && (string)($belowMap[$sid]['decision'] ?? '') !== '') {
+                $decision = (string)$belowMap[$sid]['decision'];
+                $source   = 'manual';
+                $notes    = ($belowMap[$sid]['notes'] ?? '') !== '' ? (string)$belowMap[$sid]['notes'] : null;
+            } else {
+                $decision = null;
+                $source   = 'pending';
+                $notes    = null;
+            }
+
+            $payload = [
+                'student_id'         => $sid,
+                'semester'           => 'year',
+                'school_year'        => $schoolYear,
+                'class_section_name' => $info['class_section_name'] ?? null,
+                'semester_score'     => $yearScore,
+                'decision'           => $decision,
+                'source'             => $source,
+                'notes'              => $notes,
+                'generated_by'       => $userId,
+            ];
+
+            if (isset($existingMap[$sid])) {
+                $decModel->update($existingMap[$sid]['id'], $payload);
+            } else {
+                $decModel->insert($payload);
+            }
+            $savedCount++;
+        }
+
+        $query = http_build_query(['school_year' => $schoolYear]);
+        return redirect()->to(base_url('grading/decisions') . '?' . $query)
+            ->with('status', "Decisions generated for {$savedCount} students.");
+    }
+
    public function getScoreComment()
    {
        // Get all students for the current semester and school year
@@ -73,19 +73,6 @@ class ReportCardsController extends PrintablesBaseController
            $semesters = array_values(array_filter(array_map(static fn($r) => (string)($r['semester'] ?? ''), $rs)));
        } catch (\Throwable $e) {
        }
-        try {
-            $rs2 = $this->db->table('student_class')
-                ->select('DISTINCT semester', false)
-                ->where('school_year', $year)
-                ->where('semester IS NOT NULL', null, false)
-                ->orderBy('semester', 'ASC')
-                ->get()->getResultArray();
-            foreach ($rs2 as $r) {
-                $val = (string)($r['semester'] ?? '');
-                if ($val !== '' && !in_array($val, $semesters, true)) $semesters[] = $val;
-            }
-        } catch (\Throwable $e) {
-        }
        // Ensure standard options are present even if data is missing (so Spring can be selected)
        $defaults = array_values(array_filter([(string)($this->semester ?? ''), 'Fall', 'Spring'], static fn($v) => $v !== ''));
        foreach ($defaults as $d) {
@@ -1566,35 +1553,31 @@ class ReportCardsController extends PrintablesBaseController
            $semRange = $this->semesterRangeService->getSemesterRange($refYear, ucfirst($normSemester));
            if ($semRange) {
                try {
-                    $events = $this->calendarModel->getEventsBySchoolYearAndSemester($refYear, $normSemester);
+                    // Fetch all events for the year (no semester filter) so that
+                    // no-school events stored with a different semester label or
+                    // NULL semester are still picked up. Date-range filtering below.
+                    $events = $this->calendarModel->getEventsBySchoolYearAndSemester($refYear, null);
                    $noSchoolDays = [];
                    foreach ($events as $event) {
                        if (empty($event['no_school'])) {
                            continue;
                        }
                        $dateStr = substr((string)($event['date'] ?? ''), 0, 10);
-                        if ($dateStr === '') {
-                            continue;
-                        }
-                        try {
-                            $eventDate = new \DateTime($dateStr);
-                        } catch (\Throwable) {
-                            continue;
-                        }
-                        if ($eventDate->format('N') !== '7') {
-                            continue;
-                        }
-                        if ($dateStr < $semRange[0] || $dateStr > $semRange[1]) {
+                        if ($dateStr === '' || $dateStr < $semRange[0] || $dateStr > $semRange[1]) {
                            continue;
                        }
                        $noSchoolDays[$dateStr] = true;
                    }
                    $sundays = $this->listSundays($semRange[0], $semRange[1]);
-                    $anchor = $this->resolveAnchorSunday();
                    $limit = $semRange[1];
+                    // Only cap at "today" while the semester is still in progress.
+                    // Once the semester end date has passed, count all its Sundays.
+                    if ($semRange[1] > date('Y-m-d')) {
+                        $anchor = $this->resolveAnchorSunday();
                        if ($anchor !== '' && $anchor >= $semRange[0]) {
                            $limit = min($anchor, $semRange[1]);
                        }
+                    }
                    $totalSemesterDays = 0;
                    foreach ($sundays as $date) {
                        if ($date > $limit) {
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class CreateBelowSixtyDecisions extends Migration
+{
+    public function up()
+    {
+        if ($this->db->tableExists('below_sixty_decisions')) {
+            return;
+        }
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INT',
+                'constraint'     => 11,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'student_id' => [
+                'type'       => 'INT',
+                'constraint' => 11,
+                'unsigned'   => true,
+            ],
+            'semester' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 20,
+            ],
+            'school_year' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 20,
+            ],
+            'decision' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 100,
+                'null'       => true,
+            ],
+            'notes' => [
+                'type' => 'TEXT',
+                'null' => true,
+            ],
+            'decided_by' => [
+                'type'       => 'INT',
+                'constraint' => 11,
+                'unsigned'   => true,
+                'null'       => true,
+            ],
+            'created_at' => [
+                'type' => 'DATETIME',
+                'null' => true,
+            ],
+            'updated_at' => [
+                'type' => 'DATETIME',
+                'null' => true,
+            ],
+        ]);
+
+        $this->forge->addKey('id', true);
+        $this->forge->addUniqueKey(['student_id', 'semester', 'school_year']);
+        $this->forge->addKey(['school_year', 'semester']);
+        $this->forge->createTable('below_sixty_decisions');
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable('below_sixty_decisions', true);
+    }
+}
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class CreateStudentDecisions extends Migration
+{
+    public function up()
+    {
+        if ($this->db->tableExists('student_decisions')) {
+            return;
+        }
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INT',
+                'constraint'     => 11,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'student_id' => [
+                'type'       => 'INT',
+                'constraint' => 11,
+                'unsigned'   => true,
+            ],
+            'semester' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 20,
+            ],
+            'school_year' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 20,
+            ],
+            'class_section_name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 100,
+                'null'       => true,
+            ],
+            'semester_score' => [
+                'type'       => 'DECIMAL',
+                'constraint' => '8,2',
+                'null'       => true,
+            ],
+            'decision' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 100,
+                'null'       => true,
+            ],
+            'source' => [
+                'type'       => 'ENUM',
+                'constraint' => ['auto', 'manual', 'pending'],
+                'default'    => 'auto',
+            ],
+            'notes' => [
+                'type' => 'TEXT',
+                'null' => true,
+            ],
+            'generated_by' => [
+                'type'       => 'INT',
+                'constraint' => 11,
+                'unsigned'   => true,
+                'null'       => true,
+            ],
+            'created_at' => [
+                'type' => 'DATETIME',
+                'null' => true,
+            ],
+            'updated_at' => [
+                'type' => 'DATETIME',
+                'null' => true,
+            ],
+        ]);
+
+        $this->forge->addKey('id', true);
+        $this->forge->addUniqueKey(['student_id', 'semester', 'school_year']);
+        $this->forge->addKey(['school_year', 'semester']);
+        $this->forge->createTable('student_decisions');
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable('student_decisions', true);
+    }
+}
@@ -0,0 +1,136 @@
+<?php
+
+namespace App\Listeners;
+
+use Config\Services;
+
+class DecisionEmailListener
+{
+    public static function handle(array $payload): void
+    {
+        $studentId   = (int)($payload['student_id'] ?? 0);
+        $studentName = (string)($payload['student_name'] ?? '');
+        $classSection= (string)($payload['class_section_name'] ?? '');
+        $semester    = (string)($payload['semester'] ?? '');
+        $schoolYear  = (string)($payload['school_year'] ?? '');
+        $decision     = (string)($payload['decision'] ?? '');
+        $notes        = (string)($payload['notes'] ?? '');
+        $scores       = is_array($payload['scores'] ?? null) ? $payload['scores'] : [];
+        $allSemesters = is_array($payload['all_semesters'] ?? null) ? $payload['all_semesters'] : [];
+
+        if ($studentId <= 0) {
+            log_message('warning', 'DecisionEmail: missing student_id');
+            return;
+        }
+
+        $db = \Config\Database::connect();
+        $rows = $db->query(
+            "SELECT u.firstname, u.lastname, u.email, fg.is_primary
+               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 = ?
+                AND fg.receive_emails = 1
+                AND u.email IS NOT NULL AND u.email != ''
+              ORDER BY fg.is_primary DESC, u.lastname, u.firstname",
+            [$studentId]
+        )->getResultArray();
+
+        if (empty($rows)) {
+            log_message('warning', 'DecisionEmail: no guardian emails for student_id=' . $studentId);
+            return;
+        }
+
+        $emails = [];
+        foreach ($rows as $row) {
+            $em = trim((string)($row['email'] ?? ''));
+            if ($em !== '') $emails[$em] = true;
+        }
+        $emails = array_keys($emails);
+
+        $primary    = $rows[0] ?? [];
+        $parentName = trim((string)($primary['firstname'] ?? '') . ' ' . (string)($primary['lastname'] ?? ''));
+
+        $subject = (string)($payload['subject'] ?? '');
+        if ($subject === '') {
+            $subject = 'Academic Decision';
+            if ($studentName !== '') $subject .= ' — ' . $studentName;
+            if ($semester !== '' || $schoolYear !== '') {
+                $subject .= ' (' . trim($semester . ' ' . $schoolYear) . ')';
+            }
+        }
+
+        $emailData = [
+            'title'              => $subject,
+            'parent_name'        => $parentName !== '' ? $parentName : 'Parent/Guardian',
+            'student_name'       => $studentName !== '' ? $studentName : 'your student',
+            'class_section_name' => $classSection,
+            'semester'           => $semester,
+            'school_year'        => $schoolYear,
+            'decision'           => $decision,
+            'notes'              => $notes,
+            'scores'             => $scores,
+            'all_semesters'      => $allSemesters,
+        ];
+
+        $html = trim((string)($payload['html'] ?? ''));
+        if ($html === '') {
+            $html = view('emails/below_sixty_decision', $emailData, ['saveData' => true]);
+        }
+
+        $okAny = false;
+        foreach ($emails as $to) {
+            $ok = self::sendViaEmailService($to, $subject, $html);
+            if (!$ok) {
+                $ok = self::sendViaCiEmail($to, $subject, $html);
+            }
+            $okAny = $okAny || $ok;
+        }
+
+        if ($okAny) {
+            log_message('info', 'DecisionEmail: sent for student_id=' . $studentId);
+        } else {
+            log_message('error', 'DecisionEmail: failed for student_id=' . $studentId);
+        }
+    }
+
+    protected static function sendViaEmailService(string $to, string $subject, string $html): bool
+    {
+        try {
+            $svc = function_exists('service') ? service('emailService') : null;
+            if (!$svc && method_exists(Services::class, 'emailService')) {
+                $svc = Services::emailService();
+            }
+            if (!$svc) return false;
+            return (bool)$svc->send($to, $subject, $html, 'general');
+        } catch (\Throwable $e) {
+            log_message('debug', 'DecisionEmail sendViaEmailService failed: ' . $e->getMessage());
+            return false;
+        }
+    }
+
+    protected static function sendViaCiEmail(string $to, string $subject, string $html): bool
+    {
+        try {
+            $email = Services::email();
+            $cfg   = config('Email');
+            $fromEmail = $cfg->fromEmail ?? $cfg->SMTPUser ?? 'no-reply@example.com';
+            $fromName  = $cfg->fromName  ?? 'Al Rahma Sunday School';
+
+            $email->setTo($to);
+            $email->setFrom($fromEmail, $fromName);
+            $email->setSubject($subject);
+            $email->setMessage($html);
+            $email->setMailType('html');
+            $ok = $email->send();
+            if (!$ok) {
+                $dbg = method_exists($email, 'printDebugger') ? $email->printDebugger(['headers', 'subject']) : 'no debugger';
+                log_message('debug', 'DecisionEmail CI send failed: ' . print_r($dbg, true));
+            }
+            return $ok;
+        } catch (\Throwable $e) {
+            log_message('debug', 'DecisionEmail sendViaCiEmail exception: ' . $e->getMessage());
+            return false;
+        }
+    }
+}
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class BelowSixtyDecisionModel extends Model
+{
+    protected $table      = 'below_sixty_decisions';
+    protected $primaryKey = 'id';
+
+    protected $allowedFields = [
+        'student_id',
+        'semester',
+        'school_year',
+        'decision',
+        'notes',
+        'decided_by',
+    ];
+
+    protected $useTimestamps  = true;
+    protected $createdField   = 'created_at';
+    protected $updatedField   = 'updated_at';
+}
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class StudentDecisionModel extends Model
+{
+    protected $table      = 'student_decisions';
+    protected $primaryKey = 'id';
+
+    protected $allowedFields = [
+        'student_id',
+        'semester',
+        'school_year',
+        'class_section_name',
+        'semester_score',
+        'decision',
+        'source',
+        'notes',
+        'generated_by',
+    ];
+
+    protected $useTimestamps = true;
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+}
@@ -72,11 +72,26 @@ class SemesterRangeService
        $y1 = (int)$m[1];
        $y2 = (int)$m[2];
        $normalized = ucfirst(strtolower(trim($semester)));
+
+        $fallStartCfg   = (string)($this->configModel->getConfig('fall_semester_start')   ?? '');
+        $fallEndCfg     = (string)($this->configModel->getConfig('fall_end_date')         ?? '');
+        $springStartCfg = (string)($this->configModel->getConfig('spring_semester_start') ?? '');
+        $springEndCfg   = (string)($this->configModel->getConfig('last_school_day')       ?? '');
+
+        $md = static fn(string $cfg, int $year, string $fallback): string =>
+            $cfg !== '' ? sprintf('%04d-%s', $year, date('m-d', strtotime($cfg))) : $fallback;
+
        if ($normalized === 'Fall') {
-            return [sprintf('%04d-09-21', $y1), sprintf('%04d-01-18', $y2)];
+            return [
+                $md($fallStartCfg, $y1, sprintf('%04d-09-21', $y1)),
+                $md($fallEndCfg,   $y2, sprintf('%04d-01-18', $y2)),
+            ];
        }
        if ($normalized === 'Spring') {
-            return [sprintf('%04d-01-25', $y2), sprintf('%04d-05-31', $y2)];
+            return [
+                $md($springStartCfg, $y2, sprintf('%04d-01-25', $y2)),
+                $md($springEndCfg,   $y2, sprintf('%04d-05-31', $y2)),
+            ];
        }
        return null;
    }
@@ -44,7 +44,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -1,13 +1,71 @@
 <?= $this->extend('layout/management_layout') ?>
 <?= $this->section('content') ?>

-<div class="container-fluid py-4">
+<div class="container-fluid">
+<div class="wrapper">

-    <div class="d-flex align-items-center justify-content-between flex-wrap gap-2 mb-3">
-        <div>
-            <h2 class="mb-0"><i class="bi bi-award me-2"></i>Generate Certificates</h2>
-            <div class="text-muted small">Select a class, choose students, then generate and print their certificates.</div>
-        </div>
+<?php
+// ── Group sections by grade (mirrors daily_attendance logic) ─────────────────
+$gradeGroups = []; // sortKey => ['label'=>, 'slug'=>, 'csids'=>[]]
+
+foreach ($statsPerClass as $csid => $cs) {
+    $name  = $cs['name'];
+    $lower = strtolower(trim($name));
+
+    if (preg_match('/grade\s*(\d+)/i', $name, $m)) {
+        $n        = (int)$m[1];
+        $label    = 'Grade ' . $n;
+        $sortKey  = '1_' . str_pad($n, 3, '0', STR_PAD_LEFT);
+        $slug     = 'grade' . $n;
+    } elseif (strpos($lower, 'kg') !== false || strpos($lower, 'kindergarten') !== false) {
+        $label   = 'KG';
+        $sortKey = '0_kg';
+        $slug    = 'kg';
+    } elseif (strpos($lower, 'arabic') !== false) {
+        $label   = 'Arabic';
+        $sortKey = '2_arabic';
+        $slug    = 'arabic';
+    } elseif (strpos($lower, 'youth') !== false) {
+        $label   = 'Youth';
+        $sortKey = '5_youth';
+        $slug    = 'youth';
+    } else {
+        $label   = $name;
+        $sortKey = '3_' . $lower;
+        $slug    = preg_replace('/[^a-z0-9]+/', '-', $lower);
+    }
+
+    if (!isset($gradeGroups[$sortKey])) {
+        $gradeGroups[$sortKey] = ['label' => $label, 'slug' => $slug, 'csids' => []];
+    }
+    $gradeGroups[$sortKey]['csids'][] = $csid;
+}
+ksort($gradeGroups);
+$gradeKeys   = array_keys($gradeGroups);
+$defaultKey  = $gradeKeys[0] ?? null;
+
+$decisionBadge = [
+    'Pass'                 => 'success',
+    'Repeat Class'         => 'danger',
+    'Make-up exam in fall' => 'info',
+    'Deferred decision'    => 'info',
+    'Expel'                => 'danger',
+    'Withdrawn'            => 'secondary',
+];
+?>
+
+<h2 class="text-center mt-4 mb-3"><i class="bi bi-award me-2"></i>Generate Certificates</h2>
+
+<!-- School year filter -->
+<div class="d-flex justify-content-end mb-3">
+    <form method="get" action="<?= site_url('administrator/certificates') ?>" class="d-flex gap-2 align-items-center">
+        <label class="form-label mb-0 me-1 text-muted small">School Year</label>
+        <input type="text" name="school_year" class="form-control form-control-sm" style="width:130px;"
+               value="<?= esc($schoolYear) ?>" placeholder="e.g. 2024-2025">
+        <button type="submit" class="btn btn-sm btn-outline-primary">
+            <i class="bi bi-arrow-repeat me-1"></i>Reload
+        </button>
+    </form>
 </div>

 <?php if (session()->getFlashdata('error')): ?>
@@ -17,152 +75,350 @@
    </div>
 <?php endif; ?>

-    <!-- Filter form -->
-    <div class="card shadow-sm mb-4">
-        <div class="card-header fw-semibold">Filter Students</div>
-        <div class="card-body">
-            <form method="get" action="<?= site_url('administrator/certificates') ?>" id="filterForm">
-                <div class="row g-3 align-items-end">
-                    <div class="col-12 col-md-5">
-                        <label class="form-label fw-semibold mb-1">Class / Section</label>
-                        <select name="class_section_id" class="form-select" id="classSectionSelect">
-                            <option value="">— Select a class —</option>
-                            <?php foreach ($classSections as $cs): ?>
-                                <option value="<?= esc($cs['class_section_id']) ?>"
-                                    <?= ((string)$selectedClassId === (string)$cs['class_section_id']) ? 'selected' : '' ?>>
-                                    <?= esc($cs['class_section_name']) ?>
-                                </option>
-                            <?php endforeach; ?>
-                        </select>
-                    </div>
-                    <div class="col-12 col-md-3">
-                        <label class="form-label fw-semibold mb-1">School Year</label>
-                        <input type="text" name="school_year" class="form-control" value="<?= esc($schoolYear) ?>" placeholder="e.g. 2024-2025">
-                    </div>
-                    <div class="col-auto">
-                        <button type="submit" class="btn btn-primary">
-                            <i class="bi bi-funnel me-1"></i>Load Students
-                        </button>
-                    </div>
-                </div>
-            </form>
-        </div>
-    </div>
+<?php if (empty($gradeGroups)): ?>
+    <div class="alert alert-info">No classes found for <?= esc($schoolYear) ?>.</div>
+<?php else: ?>

-    <?php if (!empty($students)): ?>
-    <!-- Certificate generation form -->
-    <form method="post" action="<?= site_url('administrator/certificates/generate') ?>" id="certForm" target="_blank">
+<!-- Grade tabs -->
+<ul class="nav nav-tabs justify-content-center" id="certTabs" role="tablist" style="flex-wrap:wrap;row-gap:.25rem;">
+    <?php foreach ($gradeGroups as $key => $group): ?>
+    <?php
+    $slug     = $group['slug'];
+    $label    = $group['label'];
+    $total     = array_sum(array_map(fn($id) => $statsPerClass[$id]['total'] ?? 0, $group['csids']));
+    $grpPass   = array_sum(array_map(fn($id) => $statsPerClass[$id]['pass'] ?? 0, $group['csids']));
+    $grpCert   = array_sum(array_map(fn($id) => $statsPerClass[$id]['cert'] ?? 0, $group['csids']));
+    $fullyDone = $grpPass > 0 && $grpCert >= $grpPass;
+    $hasPass   = $grpPass > 0;
+    $isActive  = ($key === $defaultKey);
+    $statusTitle = $hasPass
+        ? ($fullyDone ? 'Fully generated (' . $grpCert . '/' . $grpPass . ')' : 'Not fully generated (' . $grpCert . '/' . $grpPass . ')')
+        : 'No eligible students';
+    ?>
+    <li class="nav-item" role="presentation">
+        <a class="nav-link <?= $isActive ? 'active' : '' ?>"
+           id="cert-<?= esc($slug) ?>-tab"
+           data-bs-toggle="tab"
+           href="#cert-<?= esc($slug) ?>"
+           role="tab"
+           aria-controls="cert-<?= esc($slug) ?>"
+           aria-selected="<?= $isActive ? 'true' : 'false' ?>">
+            <span class="cert-status-dot <?= !$hasPass ? 'no-eligible' : ($fullyDone ? 'done' : 'pending') ?>"
+                  title="<?= esc($statusTitle) ?>"></span>
+            <?= esc($label) ?>
+            <span class="badge bg-secondary ms-1"><?= $total ?></span>
+        </a>
+    </li>
+    <?php endforeach; ?>
+</ul>
+
+<!-- Tab content -->
+<div class="tab-content mt-3" id="certTabContent">
+    <?php foreach ($gradeGroups as $key => $group): ?>
+    <?php $isActive = ($key === $defaultKey); ?>
+    <div class="tab-pane fade <?= $isActive ? 'show active' : '' ?>"
+         id="cert-<?= esc($group['slug']) ?>"
+         role="tabpanel"
+         aria-labelledby="cert-<?= esc($group['slug']) ?>-tab">
+
+        <?php foreach ($group['csids'] as $csid): ?>
+        <?php
+        $cs       = $statsPerClass[$csid];
+        $students = $studentsByClass[$csid] ?? [];
+        $csPass   = $cs['pass'];
+        $csCert   = $cs['cert'];
+        $csRemain = max(0, $csPass - $csCert);
+        $formId   = 'certForm-' . $csid;
+        $tableId  = 'studentsTable-' . $csid;
+        ?>
+
+        <h4 class="mt-4 mb-2 text-center"><?= esc($cs['name']) ?></h4>
+
+        <?php if (empty($students)): ?>
+            <p class="text-muted text-center">No active students.</p>
+        <?php else: ?>
+
+        <form method="post" action="<?= site_url('administrator/certificates/generate') ?>"
+              id="<?= esc($formId) ?>" class="cert-form mb-5">
            <?= csrf_field() ?>
-        <input type="hidden" name="class_section_id" value="<?= esc($selectedClassId) ?>">
+            <input type="hidden" name="class_section_id" value="<?= (int)$csid ?>">
            <input type="hidden" name="school_year"      value="<?= esc($schoolYear) ?>">

-        <div class="card shadow-sm mb-3">
-            <div class="card-header d-flex justify-content-between align-items-center flex-wrap gap-2">
+            <!-- Stats + date picker -->
+            <div class="d-flex justify-content-between align-items-center flex-wrap gap-2 mb-2">
+                <div class="d-flex align-items-center gap-4 flex-wrap">
                    <span class="fw-semibold">
-                    Students
-                    <span class="badge bg-secondary ms-1"><?= count($students) ?></span>
+                        Students <span class="badge bg-secondary ms-1"><?= count($students) ?></span>
                    </span>
-                <div class="d-flex align-items-center gap-3">
+                    <span class="text-muted small">
+                        <strong class="text-success"><?= $csPass ?></strong> Pass
+                    </span>
+                    <span class="text-muted small">
+                        <strong class="text-primary"><?= $csCert ?></strong> Generated
+                    </span>
+                    <span class="text-muted small">
+                        <strong class="<?= $csRemain > 0 ? 'text-warning' : 'text-muted' ?>"><?= $csRemain ?></strong> Remaining
+                    </span>
+                </div>
                <div class="input-group input-group-sm" style="width:200px;">
                    <span class="input-group-text"><i class="bi bi-calendar3"></i></span>
-                        <input type="date" class="form-control" id="certDatePicker"
+                    <input type="date" class="form-control cert-date-picker"
                           value="<?= date('Y-m-d') ?>" title="Certificate date">
-                        <input type="hidden" name="cert_date" id="certDateHidden" value="<?= esc($certDate) ?>">
-                    </div>
-                    <div class="form-check mb-0">
-                        <input class="form-check-input" type="checkbox" id="selectAll">
-                        <label class="form-check-label" for="selectAll">Select all</label>
-                    </div>
+                    <input type="hidden" name="cert_date" class="cert-date-hidden" value="<?= esc($certDate) ?>">
                </div>
            </div>

-            <div class="card-body p-0">
+            <!-- Student table -->
            <div class="table-responsive">
-                    <table class="table table-hover table-striped align-middle mb-0 no-mgmt-sticky" id="studentsTable">
+                <table class="table table-hover table-striped align-middle mb-0 cert-students-table"
+                       id="<?= esc($tableId) ?>">
                    <thead class="table-light">
                        <tr>
-                                <th style="width:40px;"></th>
-                                <th>Last Name</th>
+                            <th style="width:40px;" class="text-center">
+                                <input class="form-check-input cert-select-all" type="checkbox">
+                            </th>
                            <th>First Name</th>
-                                <th>Grade / Class</th>
+                            <th>Last Name</th>
+                            <th>Decision</th>
+                            <th>Certificate No.</th>
                        </tr>
                    </thead>
                    <tbody>
                        <?php foreach ($students as $s): ?>
+                        <?php
+                        $sid         = (int)$s['student_id'];
+                        $stuDec      = $decisionsByStudent[$sid] ?? [];
+                        $certNo      = $certsByStudent[$sid] ?? null;
+                        $allDecs     = array_map(fn($d) => $d['decision'], $stuDec);
+                        $hasPending  = in_array('', $allDecs, true);
+                        $unique      = array_values(array_unique(array_filter($allDecs, fn($d) => $d !== '')));
+                        $isPass      = !empty($stuDec) && !$hasPending && $unique === ['Pass'];
+                        $displayDecs = $isPass ? ['Pass'] : array_values(array_filter($unique, fn($d) => $d !== 'Pass'));
+                        ?>
                        <tr>
                            <td class="text-center">
-                                    <input class="form-check-input student-check" type="checkbox"
-                                           name="student_ids[]" value="<?= (int) $s['id'] ?>">
+                                <input class="form-check-input cert-student-check" type="checkbox"
+                                       name="student_ids[]" value="<?= $sid ?>"
+                                       <?= $isPass ? '' : 'disabled' ?>>
                            </td>
-                                <td><?= esc($s['lastname']) ?></td>
                            <td><?= esc($s['firstname']) ?></td>
-                                <td><?= esc($s['grade'] ?? '') ?></td>
+                            <td><?= esc($s['lastname']) ?></td>
+                            <td>
+                                <?php if (empty($stuDec)): ?>
+                                    <span class="text-muted small">—</span>
+                                <?php elseif ($hasPending || empty($unique) || empty($displayDecs)): ?>
+                                    <span class="badge bg-warning text-dark">Pending</span>
+                                <?php else: ?>
+                                    <?php foreach ($displayDecs as $dec): $color = $decisionBadge[$dec] ?? 'secondary'; ?>
+                                        <span class="badge bg-<?= esc($color) ?> me-1"><?= esc($dec) ?></span>
+                                    <?php endforeach; ?>
+                                <?php endif; ?>
+                            </td>
+                            <td>
+                                <?php if ($certNo): ?>
+                                    <a href="<?= site_url('administrator/certificates/reprint/' . rawurlencode($certNo)) ?>"
+                                       target="_blank" class="font-monospace small">
+                                        <?= esc($certNo) ?>
+                                    </a>
+                                <?php else: ?>
+                                    <span class="text-muted">—</span>
+                                <?php endif; ?>
+                            </td>
                        </tr>
                        <?php endforeach; ?>
                    </tbody>
                </table>
            </div>
-            </div>

-            <div class="card-footer d-flex justify-content-between align-items-center">
-                <span class="text-muted small" id="selectedCount">0 students selected</span>
-                <button type="submit" class="btn btn-success" id="generateBtn" disabled>
+            <!-- Footer -->
+            <div class="d-flex justify-content-between align-items-center mt-2">
+                <span class="text-muted small cert-selected-count">0 students selected</span>
+                <button type="submit" class="btn btn-success cert-generate-btn" disabled>
                    <i class="bi bi-printer me-1"></i>Generate &amp; Print Certificates
                </button>
            </div>
-        </div>
        </form>

-    <?php elseif ($selectedClassId !== null && $selectedClassId !== ''): ?>
-        <div class="alert alert-warning">No active students found for the selected class and school year.</div>
-    <?php else: ?>
-        <div class="alert alert-info">Select a class above to load its student roster.</div>
        <?php endif; ?>
+        <?php endforeach; ?>
+
    </div>
+    <?php endforeach; ?>
+</div>
+
+<?php endif; ?>
+
+</div><!-- .wrapper -->
+</div><!-- .container-fluid -->

 <script>
 (function () {
-    // Sync date picker → hidden field (MM/DD/YYYY format for the certificate)
-    const datePicker  = document.getElementById('certDatePicker');
-    const dateHidden  = document.getElementById('certDateHidden');
+    const csrfRefreshUrl      = <?= json_encode(site_url('administrator/certificates/csrf-token'), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
+    let   currentCsrfTokenName = <?= json_encode(csrf_token(), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
+
+    function cssEscape(v) {
+        return window.CSS?.escape ? window.CSS.escape(v) : String(v).replace(/(["\\.#:[\],= ])/g, '\\$1');
+    }
+    function updateCsrfInForm(form, name, hash) {
+        if (!form || !name || !hash) return;
+        form.querySelectorAll('input[type="hidden"]').forEach(inp => {
+            if (inp.name === name || inp.name === currentCsrfTokenName) { inp.name = name; inp.value = hash; }
+        });
+        let inp = form.querySelector(`input[name="${cssEscape(name)}"]`);
+        if (!inp) { inp = document.createElement('input'); inp.type = 'hidden'; inp.name = name; form.appendChild(inp); }
+        inp.value = hash;
+        currentCsrfTokenName = name;
+    }
+    async function refreshCsrf(form) {
+        const r = await fetch(csrfRefreshUrl, { method: 'GET', credentials: 'same-origin', headers: { 'X-Requested-With': 'XMLHttpRequest', 'Cache-Control': 'no-store' } });
+        if (!r.ok) throw new Error('CSRF refresh failed');
+        const d = await r.json();
+        if (d?.csrf_token && d?.csrf_hash) updateCsrfInForm(form, d.csrf_token, d.csrf_hash);
+    }
+
+    let pdfWindow = null, activePdfBlobUrl = null;
+    function openPdfWindow() {
+        if (!pdfWindow || pdfWindow.closed) pdfWindow = window.open('', 'certificatePdfWindow');
+        if (!pdfWindow) return null;
+        pdfWindow.document.open();
+        pdfWindow.document.write(`<!DOCTYPE html><html><head><meta charset="utf-8"><title>Certificate PDF</title>
+<style>html,body{margin:0;height:100%;background:#f3f4f6;font-family:Arial,sans-serif}.viewer-shell{display:flex;flex-direction:column;height:100%}.viewer-status{padding:12px 16px;background:#111827;color:#fff;font-size:14px}.viewer-frame{flex:1;width:100%;border:0;background:#cbd5e1}</style></head>
+<body><div class="viewer-shell"><div class="viewer-status" id="viewerStatus">Preparing certificate PDF...</div><iframe class="viewer-frame" id="pdfFrame"></iframe></div>
+<script>window.showCertificatePdf=function(url,fn){const f=document.getElementById('pdfFrame'),s=document.getElementById('viewerStatus');if(s)s.textContent=fn?'Showing '+fn:'Certificate PDF ready';if(f)f.src=url;document.title=fn||'Certificate PDF'};<\/script></body></html>`);
+        pdfWindow.document.close();
+        return pdfWindow;
+    }
+    function showError(pane, msg) {
+        let el = pane.querySelector('.cert-inline-error');
+        if (!el) { el = document.createElement('div'); el.className = 'alert alert-danger alert-dismissible fade show cert-inline-error'; pane.prepend(el); }
+        el.innerHTML = `${msg}<button type="button" class="btn-close" data-bs-dismiss="alert"></button>`;
+    }
+
+    document.querySelectorAll('.cert-form').forEach(function (form) {
+        const pane           = form.closest('.tab-pane') || form.parentElement;
+        const selectAll      = form.querySelector('.cert-select-all');
+        const checks         = form.querySelectorAll('.cert-student-check');
+        const eligibleChecks = form.querySelectorAll('.cert-student-check:not([disabled])');
+        const generateBtn    = form.querySelector('.cert-generate-btn');
+        const selectedCount  = form.querySelector('.cert-selected-count');
+        const datePicker     = form.querySelector('.cert-date-picker');
+        const dateHidden     = form.querySelector('.cert-date-hidden');
+
        if (datePicker && dateHidden) {
            datePicker.addEventListener('change', function () {
                const d = new Date(this.value + 'T00:00:00');
-            if (!isNaN(d)) {
-                const mm = String(d.getMonth() + 1).padStart(2, '0');
-                const dd = String(d.getDate()).padStart(2, '0');
-                const yy = d.getFullYear();
-                dateHidden.value = mm + '/' + dd + '/' + yy;
-            }
+                if (!isNaN(d)) dateHidden.value = String(d.getMonth()+1).padStart(2,'0')+'/'+String(d.getDate()).padStart(2,'0')+'/'+d.getFullYear();
            });
        }

-    // Select-all toggle
-    const selectAll    = document.getElementById('selectAll');
-    const checks       = document.querySelectorAll('.student-check');
-    const generateBtn  = document.getElementById('generateBtn');
-    const selectedCount = document.getElementById('selectedCount');
-
        function updateState() {
-        const chosen = document.querySelectorAll('.student-check:checked').length;
-        selectedCount.textContent = chosen + ' student' + (chosen !== 1 ? 's' : '') + ' selected';
-        generateBtn.disabled = chosen === 0;
+            const chosen = form.querySelectorAll('.cert-student-check:checked').length;
+            if (selectedCount) selectedCount.textContent = chosen + ' student' + (chosen !== 1 ? 's' : '') + ' selected';
+            if (generateBtn)   generateBtn.disabled = chosen === 0;
            if (selectAll) {
-            selectAll.checked       = chosen === checks.length && checks.length > 0;
-            selectAll.indeterminate = chosen > 0 && chosen < checks.length;
+                const ec = eligibleChecks.length;
+                selectAll.checked       = ec > 0 && chosen === ec;
+                selectAll.indeterminate = chosen > 0 && chosen < ec;
            }
        }
-
        if (selectAll) {
            selectAll.addEventListener('change', function () {
-            checks.forEach(c => { c.checked = this.checked; });
+                eligibleChecks.forEach(c => { c.checked = this.checked; });
                updateState();
            });
        }
-
        checks.forEach(c => c.addEventListener('change', updateState));
        updateState();
+
+        form.addEventListener('submit', async function (e) {
+            e.preventDefault();
+            const chosen = form.querySelectorAll('.cert-student-check:checked').length;
+            if (chosen === 0) { showError(pane, 'Please select at least one student.'); return; }
+            const win = openPdfWindow();
+            if (!win) { showError(pane, 'Unable to open PDF tab — please allow pop-ups.'); return; }
+            const origHtml = generateBtn.innerHTML;
+            generateBtn.disabled = true;
+            generateBtn.innerHTML = '<span class="spinner-border spinner-border-sm me-1"></span>Generating...';
+            try {
+                await refreshCsrf(form);
+                const csrfVal = form.querySelector(`input[name="${cssEscape(currentCsrfTokenName)}"]`)?.value || '';
+                const fd = new FormData(form);
+                if (csrfVal) fd.set(currentCsrfTokenName, csrfVal);
+                const resp = await fetch(form.action, { method: 'POST', body: fd, credentials: 'same-origin', headers: { 'X-Requested-With': 'XMLHttpRequest' } });
+                const nn = resp.headers.get('X-CSRF-TOKEN-NAME'), nh = resp.headers.get('X-CSRF-TOKEN');
+                if (nn && nh) updateCsrfInForm(form, nn, nh);
+                const ct = resp.headers.get('Content-Type') || '';
+                if (!resp.ok || !ct.toLowerCase().includes('application/pdf')) {
+                    let msg = 'Certificate generation failed.';
+                    try { const d = await resp.json(); if (d?.error) msg = d.error; } catch (_) { try { msg = await resp.text() || msg; } catch (_2) {} }
+                    win.close(); showError(pane, msg);
+                    await refreshCsrf(form).catch(() => {});
+                    return;
+                }
+                const disp = resp.headers.get('Content-Disposition') || '';
+                const fn   = (disp.match(/filename="?([^"]+)"?/i) || [])[1] || 'Certificates.pdf';
+                const url  = URL.createObjectURL(await resp.blob());
+                if (activePdfBlobUrl) URL.revokeObjectURL(activePdfBlobUrl);
+                activePdfBlobUrl = url;
+                win.showCertificatePdf(url, fn);
+                const activePane = form.closest('.tab-pane');
+                if (activePane?.id) window.location.hash = activePane.id;
+                window.location.reload();
+            } catch (_) {
+                showError(pane, 'Certificate generation failed. Please try again.');
+                await refreshCsrf(form).catch(() => {});
+            } finally {
+                generateBtn.innerHTML = origHtml;
+                updateState();
+            }
+        });
+    });
 })();
 </script>

+<?= $this->section('scripts') ?>
+<script>
+// Restore tab from hash — runs after Bootstrap is loaded
+(function () {
+    const hash = window.location.hash;
+    if (!hash) return;
+    const tabLink = document.querySelector('a[href="' + hash + '"][data-bs-toggle="tab"]');
+    if (tabLink && window.bootstrap?.Tab) {
+        new bootstrap.Tab(tabLink).show();
+    }
+})();
+</script>
+<style>
+.cert-status-dot {
+    display: inline-block;
+    width: 8px; height: 8px;
+    border-radius: 50%;
+    margin-right: 5px;
+    vertical-align: middle;
+    flex-shrink: 0;
+}
+.cert-status-dot.done        { background-color: #198754; }
+.cert-status-dot.pending     { background-color: #dc3545; }
+.cert-status-dot.no-eligible { background-color: #adb5bd; }
+</style>
+<script>
+(function () {
+    if (!window.$ || !$.fn?.DataTable) return;
+    $(function () {
+        document.querySelectorAll('.cert-students-table').forEach(function (tbl) {
+            if ($.fn.DataTable.isDataTable(tbl)) return;
+            try {
+                $(tbl).DataTable({
+                    order: [[1, 'asc'], [2, 'asc']],
+                    pageLength: 100,
+                    lengthMenu: [25, 50, 100, 200],
+                    columnDefs: [{ orderable: false, targets: [0, 3, 4] }]
+                });
+            } catch (_) {}
+        });
+    });
+})();
+</script>
+<?= $this->endSection() ?>
+
 <?= $this->endSection() ?>
@@ -362,7 +362,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                $rank = 0;
                foreach ($classResults as $cls):
                    foreach ($cls['students'] as $s):
-                        if ($s['status'] === 'none') continue;
+                        if (!in_array($s['status'], ['confirmed', 'surprise'], true)) continue;
                        $rank++;
                        $isMale = strtolower($s['gender'] ?? '') === 'male';
                        $statusLabel = match ($s['status']) {
@@ -48,7 +48,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -14,7 +14,7 @@
            <?= csrf_field() ?>
            <div class="text-center mb-4">
    <a href="<?= base_url('/') ?>">
-        <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 180px; height: 120px;">
+        <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
    </a>
 </div>

@@ -48,7 +48,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -11,7 +11,7 @@
        .verify-card { max-width: 520px; margin: 60px auto; }
        .badge-valid   { background: #198754; }
        .badge-invalid { background: #dc3545; }
-        .cert-logo { max-height: 70px; }
+        .cert-logo { width: 70px; height: 70px; border-radius: 50%; object-fit: cover; }
        .field-label { font-size: .8rem; text-transform: uppercase; letter-spacing: .05em; color: #6c757d; }
        .field-value { font-size: 1.05rem; font-weight: 500; }
    </style>
@@ -45,7 +45,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -44,7 +44,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -0,0 +1,152 @@
+<?= $this->extend('layout/email_layout') ?>
+
+<?= $this->section('content') ?>
+<div style="font-size:16px; font-family:Arial, Helvetica, sans-serif; color:#333;">
+  <p style="margin:0 0 12px 0;line-height:1.5;">
+    Dear <?= esc($parent_name ?? 'Parent/Guardian') ?>,
+  </p>
+
+  <p style="margin:0 0 12px 0;line-height:1.5;">
+    We are writing to share the school's decision regarding
+    <strong><?= esc($student_name ?? 'your student') ?></strong>
+    <?php if (!empty($class_section_name)): ?>(<?= esc($class_section_name) ?>)<?php endif; ?>
+    for the <?= esc(trim(($school_year ?? ''))) ?> school year.
+  </p>
+
+  <?php if (!empty($decision)): ?>
+  <table style="width:100%; border-collapse:collapse; margin:0 0 16px; font-size:15px;">
+    <tr>
+      <td style="border:1px solid #ddd; padding:10px; font-weight:bold; background:#f8f9fa; width:35%;">Decision</td>
+      <td style="border:1px solid #ddd; padding:10px; font-weight:bold; color:#2c5282;"><?= esc($decision) ?></td>
+    </tr>
+  </table>
+  <?php endif; ?>
+
+  <?php if (!empty($notes)): ?>
+  <p style="margin:0 0 6px 0;line-height:1.5;"><strong>Comments:</strong></p>
+  <p style="margin:0 0 16px 0;line-height:1.6;background:#f8f9fa;padding:10px 14px;border-left:4px solid #4a90d9;">
+    <?= nl2br(esc($notes)) ?>
+  </p>
+  <?php endif; ?>
+
+  <?php
+  $scoreLabels = [
+    'homework_avg'        => 'Homework Avg',
+    'project_avg'         => 'Project Avg',
+    'participation_score' => 'Participation',
+    'test_avg'            => 'Test Avg',
+    'ptap_score'          => 'PTAP Score',
+    'attendance_score'    => 'Attendance',
+    'midterm_exam_score'  => 'Midterm Score',
+    'final_exam_score'    => 'Final Exam',
+    'semester_score'      => 'Semester Score',
+  ];
+
+  $allSemesters = is_array($all_semesters ?? null) ? $all_semesters : [];
+  $hasSemesters = !empty($allSemesters);
+  ?>
+
+  <?php if ($hasSemesters): ?>
+  <p style="margin:0 0 8px 0;line-height:1.5;"><strong>Score Summary — <?= esc($school_year ?? '') ?></strong></p>
+
+  <?php foreach ($allSemesters as $sem): ?>
+    <?php
+      $semLabel = (string)($sem['semester'] ?? '');
+      $hasAnyScore = false;
+      foreach ($scoreLabels as $key => $_) {
+          $v = $sem[$key] ?? null;
+          if ($v !== null && $v !== '') { $hasAnyScore = true; break; }
+      }
+    ?>
+    <p style="margin:0 0 4px 0;font-weight:bold;font-size:14px;"><?= esc($semLabel) ?> Semester</p>
+    <table style="width:100%; border-collapse:collapse; margin:0 0 12px; font-size:14px;">
+      <thead>
+        <tr style="background:#f8f9fa;">
+          <th style="border:1px solid #ddd; padding:6px; text-align:left;">Item</th>
+          <th style="border:1px solid #ddd; padding:6px; text-align:left;">Score</th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach ($scoreLabels as $key => $label): ?>
+          <?php $val = $sem[$key] ?? null; if ($val === null || $val === '') continue; ?>
+          <tr>
+            <td style="border:1px solid #ddd; padding:6px;"><?= esc($label) ?></td>
+            <td style="border:1px solid #ddd; padding:6px;<?= $key === 'semester_score' ? ' font-weight:bold;' : '' ?>">
+              <?= esc(number_format((float)$val, 2, '.', '')) ?>
+            </td>
+          </tr>
+        <?php endforeach; ?>
+        <?php if (!$hasAnyScore): ?>
+          <tr><td colspan="2" style="border:1px solid #ddd; padding:6px; color:#999;">No scores recorded.</td></tr>
+        <?php endif; ?>
+      </tbody>
+    </table>
+    <?php
+      $semComments = is_array($sem['comments'] ?? null) ? $sem['comments'] : [];
+      $commentTypeLabels = [
+          'general'            => 'General',
+          'attendance'         => 'Attendance',
+          'attendance_comment' => 'Attendance',
+          'midterm'            => 'Midterm',
+          'final'              => 'Final Exam',
+          'ptap'               => 'PTAP',
+      ];
+      // Deduplicate by label+text
+      $seenCmt = [];
+      $dedupedCmt = [];
+      foreach ($semComments as $ctype => $ctext) {
+          $ctext = trim((string)$ctext);
+          if ($ctext === '') continue;
+          $clabel = $commentTypeLabels[$ctype] ?? ucfirst($ctype);
+          $key = $clabel . '|' . $ctext;
+          if (!isset($seenCmt[$key])) { $seenCmt[$key] = true; $dedupedCmt[] = [$clabel, $ctext]; }
+      }
+    ?>
+    <?php if (!empty($dedupedCmt)): ?>
+    <p style="margin:0 0 4px 0;font-size:13px;font-weight:bold;">Comments</p>
+    <?php foreach ($dedupedCmt as [$clabel, $ctext]): ?>
+    <p style="margin:0 0 8px 0;font-size:13px;color:#444;line-height:1.5;background:#f8f9fa;padding:6px 10px;border-left:3px solid #aaa;">
+      <strong><?= esc($clabel) ?>:</strong> <?= nl2br(esc($ctext)) ?>
+    </p>
+    <?php endforeach; ?>
+    <?php endif; ?>
+  <?php endforeach; ?>
+
+  <?php else: ?>
+  <?php
+    // Fallback: single semester scores block
+    $scores = is_array($scores ?? null) ? $scores : [];
+    $hasScores = (bool) array_filter($scores, static fn($v) => $v !== null && $v !== '');
+  ?>
+  <?php if ($hasScores): ?>
+  <p style="margin:0 0 6px 0;line-height:1.5;"><strong>Score Summary:</strong></p>
+  <table style="width:100%; border-collapse:collapse; margin:0 0 16px; font-size:14px;">
+    <thead>
+      <tr style="background:#f8f9fa;">
+        <th style="border:1px solid #ddd; padding:6px; text-align:left;">Item</th>
+        <th style="border:1px solid #ddd; padding:6px; text-align:left;">Score</th>
+      </tr>
+    </thead>
+    <tbody>
+      <?php foreach ($scoreLabels as $key => $label): ?>
+        <?php $val = $scores[$key] ?? null; if ($val === null || $val === '') continue; ?>
+        <tr>
+          <td style="border:1px solid #ddd; padding:6px;"><?= esc($label) ?></td>
+          <td style="border:1px solid #ddd; padding:6px;"><?= esc(number_format((float)$val, 2, '.', '')) ?></td>
+        </tr>
+      <?php endforeach; ?>
+    </tbody>
+  </table>
+  <?php endif; ?>
+  <?php endif; ?>
+
+  <p style="margin:0 0 12px 0;line-height:1.5;">
+    Please do not hesitate to contact the school if you have any questions or concerns.
+  </p>
+
+  <p style="margin:0;line-height:1.5;">
+    Thank you,<br>
+    Al Rahma Sunday School
+  </p>
+</div>
+<?= $this->endSection() ?>
@@ -4,7 +4,7 @@
    <div class="modal-content rounded-4 shadow border-0" style="max-width: 600px; margin: auto;">
      <div class="modal-body text-center p-5">
        <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="Logo"
-             style="width: 180px; height: 120px;" class="mb-4">
+             style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;" class="mb-4">
        <h5 class="modal-title text-danger mb-3" id="blockedLabel">Access Blocked</h5>
        <p class="lead mb-3">Too many password reset attempts have been made.</p>
        <p>Please try again after 24 hours or contact support if you need urgent assistance.</p>
@@ -5,7 +5,7 @@
    <div class="bg-white p-5 rounded-5 shadow registration-form container" style="max-width: 600px; width: 100%;">
        <div class="text-center mb-4">
            <a href="<?= base_url('/') ?>">
-                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 180px; height: 120px;">
+                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
            </a>
        </div>
        
@@ -44,7 +44,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -0,0 +1,212 @@
+<?= $this->extend('layout/management_layout') ?>
+<?= $this->section('content') ?>
+
+<div class="container-fluid">
+    <div class="wrapper">
+        <h2 class="text-center mt-4 mb-4">Student Decisions — All Students</h2>
+
+        <!-- School Year filter only -->
+        <form method="get" class="row g-2 align-items-center justify-content-center mb-3">
+            <div class="col-auto"><label class="form-label mb-0">School year</label></div>
+            <div class="col-auto">
+                <select name="school_year" class="form-select form-select-sm" style="min-width: 180px;">
+                    <?php $years = isset($schoolYears) && is_array($schoolYears) ? $schoolYears : []; ?>
+                    <?php foreach ($years as $y):
+                        $val = is_array($y) && isset($y['school_year']) ? (string)$y['school_year'] : (string)$y; ?>
+                        <option value="<?= esc($val) ?>" <?= ($schoolYear === $val ? 'selected' : '') ?>><?= esc($val) ?></option>
+                    <?php endforeach; ?>
+                    <?php if (empty($years) && $schoolYear !== ''): ?>
+                        <option value="<?= esc($schoolYear) ?>" selected><?= esc($schoolYear) ?></option>
+                    <?php endif; ?>
+                </select>
+            </div>
+            <div class="col-auto">
+                <button type="submit" class="btn btn-secondary btn-sm">Apply</button>
+                <a class="btn btn-outline-secondary btn-sm" href="?">Reset</a>
+            </div>
+        </form>
+
+        <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
+            <div class="text-muted">
+                <?= esc($schoolYear ?? '') ?>
+                <?php if ($generated): ?>
+                    <span class="badge bg-success ms-2">Saved</span>
+                <?php else: ?>
+                    <span class="badge bg-warning text-dark ms-2">Not yet generated</span>
+                <?php endif; ?>
+            </div>
+            <div class="d-flex gap-2 flex-wrap">
+                <a class="btn btn-outline-secondary btn-sm" href="<?= base_url('grading') ?>">
+                    Grading
+                </a>
+            </div>
+        </div>
+
+        <?php if (!empty(session()->getFlashdata('status'))): ?>
+            <div class="alert alert-success alert-dismissible fade show">
+                <?= esc(session()->getFlashdata('status')) ?>
+                <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+            </div>
+        <?php endif; ?>
+        <?php if (!empty(session()->getFlashdata('error'))): ?>
+            <div class="alert alert-danger alert-dismissible fade show">
+                <?= esc(session()->getFlashdata('error')) ?>
+                <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+            </div>
+        <?php endif; ?>
+
+        <!-- Generate / Regenerate button -->
+        <form method="post" action="<?= site_url('grading/decisions/generate') ?>" class="mb-3">
+            <?= csrf_field() ?>
+            <input type="hidden" name="school_year" value="<?= esc($schoolYear ?? '') ?>">
+            <button type="submit" class="btn btn-primary">
+                <?= $generated ? 'Regenerate Decisions' : 'Generate Decisions' ?>
+            </button>
+            <span class="text-muted small ms-2">
+                Year score ≥ 60 → <strong>Pass</strong> (auto) &nbsp;|&nbsp;
+                Year score &lt; 60 → pulled from below-60 decisions
+            </span>
+        </form>
+
+        <?php if (empty($rows)): ?>
+            <div class="alert alert-info">No semester scores found for this school year.</div>
+        <?php else: ?>
+
+        <?php
+        $decisionBadge = [
+            'Pass'                 => 'success',
+            'Repeat Class'         => 'danger',
+            'Make-up exam in fall' => 'info',
+            'Deferred decision'    => 'info',
+            'Expel'                => 'danger',
+            'Withdrawn'            => 'secondary',
+        ];
+        $sourceBadge = [
+            'auto'    => ['bg-success-subtle text-success-emphasis', 'Auto'],
+            'manual'  => ['bg-primary-subtle text-primary-emphasis', 'Manual'],
+            'pending' => ['bg-warning-subtle text-warning-emphasis', 'Pending'],
+        ];
+
+        $stats = ['Pass' => 0, 'Other' => 0, 'Pending' => 0];
+        foreach ($rows as $r) {
+            if ($r['decision'] === 'Pass') $stats['Pass']++;
+            elseif ($r['decision'] === '' || $r['source'] === 'pending') $stats['Pending']++;
+            else $stats['Other']++;
+        }
+        ?>
+
+        <!-- Summary cards -->
+        <div class="d-flex gap-3 mb-3 flex-wrap">
+            <div class="card text-center px-4 py-2 border-success">
+                <div class="fs-4 fw-bold text-success"><?= $stats['Pass'] ?></div>
+                <div class="text-muted small">Pass</div>
+            </div>
+            <div class="card text-center px-4 py-2 border-primary">
+                <div class="fs-4 fw-bold text-primary"><?= $stats['Other'] ?></div>
+                <div class="text-muted small">Other decision</div>
+            </div>
+            <div class="card text-center px-4 py-2 border-warning">
+                <div class="fs-4 fw-bold text-warning"><?= $stats['Pending'] ?></div>
+                <div class="text-muted small">Pending</div>
+            </div>
+            <div class="card text-center px-4 py-2">
+                <div class="fs-4 fw-bold"><?= count($rows) ?></div>
+                <div class="text-muted small">Total</div>
+            </div>
+        </div>
+
+        <div class="table-responsive">
+            <table class="table table-bordered table-striped align-middle w-100 all-decisions-dt"
+                   data-no-mgmt-sticky data-no-dt-fixedheader>
+                <thead class="table-light">
+                    <tr>
+                        <th>Student Name</th>
+                        <th>Section</th>
+                        <th class="text-center">Fall Score</th>
+                        <th class="text-center">Spring Score</th>
+                        <th class="text-center">Year Score</th>
+                        <th class="text-center">Decision</th>
+                        <th class="text-center">Source</th>
+                        <th>Notes</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($rows as $row): ?>
+                        <?php
+                        $yearScore  = $row['year_score'];
+                        $decision   = (string)($row['decision'] ?? '');
+                        $source     = (string)($row['source'] ?? 'pending');
+                        $yearVal    = is_numeric($yearScore) ? (float)$yearScore : null;
+                        $rowClass   = '';
+                        if ($yearVal !== null && $yearVal < 60) {
+                            $rowClass = $yearVal < 50 ? 'grade-red' : 'grade-orange';
+                        }
+                        $badge       = $decisionBadge[$decision] ?? null;
+                        [$srcCls, $srcLabel] = $sourceBadge[$source] ?? ['bg-light text-muted', $source];
+                        $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+                        $fmt = fn($v) => is_numeric($v) ? number_format((float)$v, 2) : '—';
+                        ?>
+                        <tr class="<?= esc($rowClass) ?>">
+                            <td><?= esc($studentName ?: 'N/A') ?></td>
+                            <td><?= esc($row['class_section_name'] ?? '—') ?></td>
+                            <td class="text-center"><?= esc($fmt($row['fall_score'] ?? null)) ?></td>
+                            <td class="text-center"><?= esc($fmt($row['spring_score'] ?? null)) ?></td>
+                            <td class="text-center fw-semibold">
+                                <?= esc($fmt($yearVal)) ?>
+                            </td>
+                            <td class="text-center">
+                                <?php if ($decision !== '' && $badge): ?>
+                                    <span class="badge bg-<?= esc($badge) ?>"><?= esc($decision) ?></span>
+                                <?php elseif ($decision !== ''): ?>
+                                    <span class="badge bg-secondary"><?= esc($decision) ?></span>
+                                <?php else: ?>
+                                    <span class="text-muted small">—</span>
+                                <?php endif; ?>
+                            </td>
+                            <td class="text-center">
+                                <span class="badge <?= esc($srcCls) ?>"><?= esc($srcLabel) ?></span>
+                            </td>
+                            <td class="text-muted small"><?= nl2br(esc((string)($row['notes'] ?? ''))) ?></td>
+                        </tr>
+                    <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+
+        <!-- Legend -->
+        <div class="mt-2 mb-4 d-flex gap-2 flex-wrap align-items-center">
+            <?php foreach ($decisionBadge as $label => $color): ?>
+                <span class="badge bg-<?= esc($color) ?> px-2 py-1"><?= esc($label) ?></span>
+            <?php endforeach; ?>
+            <span class="text-muted small ms-2">— decision colour key</span>
+        </div>
+
+        <?php endif; ?>
+    </div>
+</div>
+
+<?= $this->endSection() ?>
+
+<?= $this->section('scripts') ?>
+<style>
+    .grade-orange td { background: #fff3cd !important; color: #8a5d00; }
+    .grade-red td    { background: #f8d7da !important; color: #842029; }
+</style>
+<script>
+(function () {
+    if (!window.$ || !$.fn || !$.fn.DataTable) return;
+    $(function () {
+        const tbl = $('.all-decisions-dt');
+        if (!tbl.length) return;
+        try {
+            tbl.DataTable({
+                order: [[1, 'asc'], [0, 'asc']],
+                pageLength: 100,
+                lengthMenu: [25, 50, 100, 200],
+                columnDefs: [{ orderable: false, targets: [7] }]
+            });
+        } catch (_) {}
+    });
+})();
+</script>
+<?= $this->endSection() ?>
@@ -9,16 +9,22 @@

        <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
            <div class="text-muted">
-                <?= esc(ucfirst($semester ?? '')) ?> • <?= esc($schoolYear ?? '') ?>
+                <?= !empty($isYearMode) ? 'Whole Year' : esc(ucfirst($semester ?? '')) ?> • <?= esc($schoolYear ?? '') ?>
            </div>
+            <div class="d-flex gap-2">
+                <?php if (empty($isYearMode)): ?>
+                <a class="btn btn-outline-primary btn-sm"
+                   href="<?= site_url('grading/below-60/decisions?' . http_build_query(['semester' => $semester ?? '', 'school_year' => $schoolYear ?? ''])) ?>">
+                    Decisions
+                </a>
+                <?php endif; ?>
                <?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>
+        </div>

        <?php
        $displayScore = function ($value) {
@@ -43,6 +49,7 @@
                        <tr>
                            <th>Student Name</th>
                            <th>Section</th>
+                            <?php if (!empty($isYearMode)): ?><th>Semester</th><?php endif; ?>
                            <th>Hwk Avg</th>
                            <th>Project Avg</th>
                            <th>Participation</th>
@@ -50,10 +57,12 @@
                            <th>PTAP Score</th>
                            <th>Attendance</th>
                            <th>Midterm Score</th>
-                            <th><?= strcasecmp($semester ?? '', 'fall') === 0 ? '1st Semester Score' : 'Semester Score' ?></th>
+                            <th><?= !empty($isYearMode) ? 'Semester Score' : (strcasecmp($semester ?? '', 'fall') === 0 ? '1st Semester Score' : 'Semester Score') ?></th>
+                            <?php if (empty($isYearMode)): ?>
                            <th>Status</th>
                            <th>Email Parent</th>
                            <th>Schedule Meeting</th>
+                            <?php endif; ?>
                        </tr>
                    </thead>
                    <tbody>
@@ -72,9 +81,13 @@
                            $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
                            ?>
                            <?php $isClosed = ($row['status'] ?? 'Open') === 'Closed'; ?>
+                            <?php $rowSemester = ucfirst(strtolower(trim((string)($row['semester'] ?? ($semester ?? ''))))); ?>
                            <tr class="<?= esc($scoreClass) ?>">
                                <td><?= esc($studentName !== '' ? $studentName : 'N/A') ?></td>
                                <td><?= esc($row['class_section_name'] ?? '—') ?></td>
+                                <?php if (!empty($isYearMode)): ?>
+                                <td class="text-center"><?= esc($rowSemester) ?></td>
+                                <?php endif; ?>
                                <td class="text-center"><?= $displayScore($row['homework_avg'] ?? null) ?></td>
                                <td class="text-center"><?= $displayScore($row['project_avg'] ?? null) ?></td>
                                <td class="text-center"><?= $displayScore($row['participation_score'] ?? null) ?></td>
@@ -83,6 +96,7 @@
                                <td class="text-center"><?= $displayScore($row['attendance_score'] ?? null) ?></td>
                                <td class="text-center"><?= $displayScore($row['midterm_exam_score'] ?? null) ?></td>
                                <td class="text-center"><?= $displayScore($row['semester_score'] ?? null) ?></td>
+                                <?php if (empty($isYearMode)): ?>
                                <td class="text-center">
                                    <form method="post" action="<?= site_url('grading/below-60/status') ?>" class="d-flex align-items-center gap-2 justify-content-center">
                                        <?= csrf_field() ?>
@@ -117,6 +131,7 @@
                                        </a>
                                    <?php endif; ?>
                                </td>
+                                <?php endif; ?>
                            </tr>
                        <?php endforeach; ?>
                    </tbody>
@@ -143,8 +158,9 @@
            const table = $('.below-sixty-dt');
            if (!table.length) return;
            try {
+                const semesterOffset = <?= !empty($isYearMode) ? '1' : '0' ?>;
                table.DataTable({
-                    order: [[8, 'asc']],
+                    order: [[8 + semesterOffset, 'asc']],
                    pageLength: 100,
                    lengthMenu: [10, 25, 50, 100, 200]
                });
@@ -0,0 +1,100 @@
+<?= $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">Send Decision Email</h2>
+                <div class="text-muted">
+                    <?= esc($studentName !== '' ? $studentName : 'Student') ?> • <?= esc($semester ?? '') ?> • <?= esc($schoolYear ?? '') ?>
+                    <?php if (!empty($decision)): ?>
+                        &nbsp;— <span class="fw-semibold"><?= esc($decision) ?></span>
+                    <?php endif; ?>
+                </div>
+            </div>
+            <a class="btn btn-outline-secondary btn-sm"
+               href="<?= site_url('grading/below-60/decisions?' . http_build_query(['semester' => $semester ?? '', 'school_year' => $schoolYear ?? ''])) ?>">
+                ← Back to Decisions
+            </a>
+        </div>
+
+        <form method="post" action="<?= site_url('grading/below-60/decisions/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="decision_html"
+                   value="<?= htmlspecialchars((string)($html ?? ''), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') ?>">
+
+            <div class="card-body">
+                <div class="mb-3">
+                    <label class="form-label" for="decisionSubject">Subject</label>
+                    <input type="text" class="form-control" id="decisionSubject" name="subject"
+                           value="<?= esc((string)($subject ?? '')) ?>" required>
+                </div>
+                <div class="mb-3">
+                    <label class="form-label" for="decisionEditor">Body (Rich Text)</label>
+                    <textarea class="form-control" id="decisionEditor" rows="16"><?= (string)($html ?? '') ?></textarea>
+                    <div class="form-text">Review and edit 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/decisions?' . http_build_query(['semester' => $semester ?? '', 'school_year' => $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/decisions/email"]');
+    const hiddenHtml = document.getElementById('decision_html');
+
+    if (!window.tinymce) return;
+
+    tinymce.init({
+        selector: '#decisionEditor',
+        base_url: '<?= base_url('assets/tinymce') ?>',
+        suffix: '.min',
+        license_key: 'gpl',
+        height: 460,
+        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,
+        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() ?>
@@ -0,0 +1,534 @@
+<?= $this->extend('layout/management_layout') ?>
+<?= $this->section('content') ?>
+
+<div class="container-fluid">
+    <div class="wrapper below-sixty-decisions-wrapper">
+        <h2 class="text-center mt-4 mb-4">Below 60 — Decisions</h2>
+
+        <?= $this->include('partials/academic_filter') ?>
+
+        <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
+            <div class="text-muted">
+                <?= esc(ucfirst($semester ?? '')) ?> • <?= esc($schoolYear ?? '') ?>
+            </div>
+            <div class="d-flex gap-2">
+                <a class="btn btn-outline-secondary btn-sm"
+                   href="<?= site_url('grading/below-60?' . http_build_query(['semester' => $semester, 'school_year' => $schoolYear])) ?>">
+                    ← Back to Below 60
+                </a>
+                <a class="btn btn-outline-primary btn-sm"
+                   href="<?= site_url('grading/decisions?' . http_build_query(['semester' => $semester, 'school_year' => $schoolYear])) ?>">
+                    All Decisions
+                </a>
+                <?php if (!empty($canViewGrading)): ?>
+                    <a class="btn btn-outline-secondary btn-sm" href="<?= base_url('grading') ?>">
+                        Grading
+                    </a>
+                <?php endif; ?>
+            </div>
+        </div>
+
+        <?php if (!empty(session()->getFlashdata('status'))): ?>
+            <div class="alert alert-success alert-dismissible fade show" role="alert">
+                <?= esc(session()->getFlashdata('status')) ?>
+                <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+            </div>
+        <?php endif; ?>
+        <?php if (!empty(session()->getFlashdata('error'))): ?>
+            <div class="alert alert-danger alert-dismissible fade show" role="alert">
+                <?= esc(session()->getFlashdata('error')) ?>
+                <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+            </div>
+        <?php endif; ?>
+
+        <?php
+        $decisionOptions = [
+            ''                     => '— No decision yet —',
+            'Pass'                 => 'Pass',
+            'Repeat Class'         => 'Repeat Class',
+            'Make-up exam in fall' => 'Make-up exam in fall',
+            'Deferred decision'     => 'Deferred decision',
+            'Expel'                => 'Expel',
+            'Withdrawn'            => 'Withdrawn',
+        ];
+
+        $decisionBadge = [
+            'Pass'                 => 'success',
+            'Repeat Class'         => 'danger',
+            'Make-up exam in fall' => 'info',
+            'Deferred decision'     => 'info',
+            'Expel'                => 'danger',
+            'Withdrawn'            => 'secondary',
+        ];
+
+        $displayScore = function ($value) {
+            if ($value === null || $value === '') return '—';
+            if (is_numeric($value)) return esc(number_format((float)$value, 2, '.', ''));
+            return esc($value);
+        };
+        ?>
+
+        <?php if (empty($rows)): ?>
+            <div class="alert alert-success text-center d-inline-block">
+                No students below 60 for this selection.
+            </div>
+        <?php else: ?>
+            <div class="table-responsive">
+                <table class="table table-bordered table-striped align-middle w-100 decisions-dt" data-no-mgmt-sticky data-no-dt-fixedheader>
+                    <thead class="table-light">
+                        <tr>
+                            <th style="min-width:160px">Student Name</th>
+                            <th>Section</th>
+                            <th class="text-center">Score</th>
+                            <th style="min-width:300px">Comments / Rationale &amp; Decision</th>
+                            <th style="min-width:150px" class="text-center">Below-60 Decision</th>
+                            <th style="min-width:130px" class="text-center">Final Decision</th>
+                            <th style="min-width:130px" class="text-center">Certificate</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php foreach ($rows as $row): ?>
+                            <?php
+                            $scoreRaw        = $row['semester_score'] ?? null;
+                            $scoreVal        = is_numeric($scoreRaw) ? (float)$scoreRaw : null;
+                            $rowClass        = '';
+                            if ($scoreVal !== null) {
+                                $rowClass = $scoreVal < 50 ? 'grade-red' : 'grade-orange';
+                            }
+                            $studentName     = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+                            $currentDecision = (string)($row['decision'] ?? '');
+                            $currentNotes    = (string)($row['decision_notes'] ?? '');
+                            $badge           = $decisionBadge[$currentDecision] ?? null;
+                            ?>
+                            <tr class="<?= esc($rowClass) ?>">
+                                <td><?= esc($studentName !== '' ? $studentName : 'N/A') ?></td>
+                                <td><?= esc($row['class_section_name'] ?? '—') ?></td>
+                                <td class="text-center">
+                                    <div class="fw-semibold"><?= $displayScore($scoreRaw) ?></div>
+                                    <button type="button"
+                                            class="btn btn-outline-secondary btn-xs mt-1 btn-show-details"
+                                            style="font-size:0.72rem;padding:1px 7px;"
+                                            data-student-id="<?= (int)($row['student_id'] ?? 0) ?>"
+                                            data-student-name="<?= esc($studentName !== '' ? $studentName : 'N/A') ?>"
+                                            data-school-year="<?= esc((string)($schoolYear ?? '')) ?>">
+                                        Details
+                                    </button>
+                                </td>
+                                <td>
+                                    <form method="post" action="<?= site_url('grading/below-60/decisions/save') ?>">
+                                        <?= 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 ?? '')) ?>">
+                                        <textarea name="notes"
+                                                  class="form-control form-control-sm decision-notes"
+                                                  rows="3"
+                                                  placeholder="Add comments or rationale…"><?= esc($currentNotes) ?></textarea>
+                                        <div class="d-flex gap-2 mt-2 align-items-center">
+                                            <select name="decision" class="form-select form-select-sm decision-select flex-grow-1">
+                                                <?php foreach ($decisionOptions as $val => $label): ?>
+                                                    <option value="<?= esc($val) ?>" <?= $currentDecision === $val ? 'selected' : '' ?>>
+                                                        <?= esc($label) ?>
+                                                    </option>
+                                                <?php endforeach; ?>
+                                            </select>
+                                            <button type="submit" class="btn btn-sm btn-primary">Save</button>
+                                        </div>
+                                    </form>
+                                </td>
+                                <td class="text-center align-middle">
+                                    <?php if ($currentDecision !== '' && $badge): ?>
+                                        <span class="badge bg-<?= esc($badge) ?> fs-6 px-3 py-2 d-block mb-2"><?= esc($currentDecision) ?></span>
+                                        <button type="button"
+                                                class="btn btn-sm btn-outline-primary btn-send-email"
+                                                data-student-id="<?= (int)($row['student_id'] ?? 0) ?>"
+                                                data-semester="<?= esc((string)($semester ?? '')) ?>"
+                                                data-school-year="<?= esc((string)($schoolYear ?? '')) ?>">
+                                            Send Email
+                                        </button>
+                                    <?php else: ?>
+                                        <span class="text-muted small">Pending</span>
+                                    <?php endif; ?>
+                                </td>
+
+                                <?php
+                                // Final (consolidated) decision from student_decisions table
+                                $finalDecision = $row['consolidated_decision'] ?? null;
+                                $finalBadge    = $finalDecision !== null ? ($decisionBadge[$finalDecision] ?? 'secondary') : null;
+                                ?>
+                                <td class="text-center align-middle">
+                                    <?php if ($finalDecision !== null && $finalDecision !== ''): ?>
+                                        <span class="badge bg-<?= esc($finalBadge) ?> px-2 py-1"><?= esc($finalDecision) ?></span>
+                                    <?php else: ?>
+                                        <a href="<?= site_url('grading/decisions?' . http_build_query(['semester' => $semester ?? '', 'school_year' => $schoolYear ?? ''])) ?>"
+                                           class="text-muted small">Generate</a>
+                                    <?php endif; ?>
+                                </td>
+
+                                <?php $certNumber = (string)($row['certificate_number'] ?? ''); ?>
+                                <td class="text-center align-middle">
+                                    <?php if ($certNumber !== ''): ?>
+                                        <a href="<?= site_url('administrator/certificates/reprint/' . rawurlencode($certNumber)) ?>"
+                                           target="_blank"
+                                           class="font-monospace text-decoration-none fw-semibold"
+                                           title="Click to reprint certificate">
+                                            <?= esc($certNumber) ?>
+                                        </a>
+                                    <?php else: ?>
+                                        <span class="text-muted small">—</span>
+                                    <?php endif; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
+
+            <div class="mt-3 mb-4 d-flex gap-2 flex-wrap">
+                <?php foreach ($decisionBadge as $label => $color): ?>
+                    <span class="badge bg-<?= esc($color) ?> px-3 py-2"><?= esc($label) ?></span>
+                <?php endforeach; ?>
+                <span class="text-muted small align-self-center ms-1">— decision colour key</span>
+            </div>
+        <?php endif; ?>
+    </div>
+</div>
+
+<!-- Score details modal -->
+<div class="modal fade" id="detailsModal" tabindex="-1" aria-labelledby="detailsModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="detailsModalLabel">Score Details</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+            </div>
+            <div class="modal-body" id="detailsModalBody">
+                <div class="text-center py-4">
+                    <div class="spinner-border text-primary" role="status"></div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Email editor modal -->
+<div class="modal fade" id="decisionEmailModal" tabindex="-1" aria-labelledby="decisionEmailModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="decisionEmailModalLabel">Send Decision Email</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+            </div>
+
+            <div id="emailModalLoading" class="modal-body text-center py-5" style="display:none;">
+                <div class="spinner-border text-primary" role="status"></div>
+                <div class="mt-2 text-muted">Loading email template…</div>
+            </div>
+
+            <div id="emailModalError" class="modal-body" style="display:none;">
+                <div class="alert alert-danger mb-0" id="emailModalErrorMsg"></div>
+            </div>
+
+            <form id="decisionEmailForm" method="post"
+                  action="<?= site_url('grading/below-60/decisions/email') ?>"
+                  style="display:none;">
+                <?= csrf_field() ?>
+                <input type="hidden" name="student_id"  id="emailStudentId">
+                <input type="hidden" name="semester"    id="emailSemester">
+                <input type="hidden" name="school_year" id="emailSchoolYear">
+                <input type="hidden" name="html"        id="emailHtmlHidden">
+
+                <div class="modal-body">
+                    <div class="mb-3">
+                        <label class="form-label fw-semibold" for="emailSubjectInput">Subject</label>
+                        <input type="text" class="form-control" id="emailSubjectInput" name="subject" required>
+                    </div>
+                    <div class="mb-1">
+                        <label class="form-label fw-semibold">Body</label>
+                    </div>
+                    <textarea id="decisionEmailEditor" rows="18"></textarea>
+                </div>
+
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary" id="emailSendBtn">Send Email</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<?= $this->endSection() ?>
+
+<?= $this->section('scripts') ?>
+<style>
+    .grade-orange td { background: #fff3cd !important; color: #8a5d00; }
+    .grade-red td    { background: #f8d7da !important; color: #842029; }
+    .decision-notes  { font-size: 0.85rem; resize: vertical; min-height: 60px; }
+    .decisions-dt td { vertical-align: top; }
+</style>
+<script src="<?= base_url('assets/tinymce/tinymce.min.js') ?>"></script>
+<script>
+(function () {
+    // DataTable
+    if (window.$ && $.fn && $.fn.DataTable) {
+        $(function () {
+            const tbl = $('.decisions-dt');
+            if (!tbl.length) return;
+            try {
+                tbl.DataTable({
+                    order: [[2, 'asc']],
+                    pageLength: 100,
+                    lengthMenu: [10, 25, 50, 100, 200],
+                    columnDefs: [{ orderable: false, targets: [3] }]
+                });
+            } catch (_) {}
+        });
+    }
+
+    // ── Details modal ────────────────────────────────────────────
+    const detailsModal     = document.getElementById('detailsModal');
+    const detailsModalBody = document.getElementById('detailsModalBody');
+    const detailsModalTitle= document.getElementById('detailsModalLabel');
+
+    const SCORE_LABELS = {
+        homework_avg:        'Homework Avg',
+        project_avg:         'Project Avg',
+        participation_score: 'Participation',
+        test_avg:            'Test Avg',
+        ptap_score:          'PTAP Score',
+        attendance_score:    'Attendance',
+        midterm_exam_score:  'Midterm Score',
+        final_exam_score:    'Final Exam',
+        semester_score:      'Semester Score',
+    };
+
+    const COMMENT_TYPE_LABELS = {
+        general:             'General',
+        attendance:          'Attendance',
+        attendance_comment:  'Attendance',
+        midterm:             'Midterm',
+        final:               'Final Exam',
+        ptap:                'PTAP',
+    };
+
+    function fmtScore(v) {
+        if (v === null || v === '' || v === undefined) return '—';
+        const n = parseFloat(v);
+        return isNaN(n) ? v : n.toFixed(2);
+    }
+
+    function esc(str) {
+        return String(str)
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;');
+    }
+
+    function buildDetailsHtml(semesters) {
+        if (!semesters || semesters.length === 0) {
+            return '<div class="alert alert-warning mb-0">No score data found.</div>';
+        }
+        let html = '';
+        semesters.forEach(function (sem) {
+            html += '<h6 class="fw-bold mt-3 mb-2">' + esc(sem.semester || '') + ' Semester';
+            if (sem.class_section_name) html += ' <span class="text-muted fw-normal fs-6">— ' + esc(sem.class_section_name) + '</span>';
+            html += '</h6>';
+
+            // Scores table
+            html += '<table class="table table-sm table-bordered mb-2">';
+            html += '<thead class="table-light"><tr><th>Item</th><th class="text-center">Score</th></tr></thead><tbody>';
+            let hasRow = false;
+            Object.entries(SCORE_LABELS).forEach(function ([key, label]) {
+                const v = sem[key];
+                if (v === null || v === '' || v === undefined) return;
+                const bold = key === 'semester_score' ? ' fw-bold' : '';
+                html += '<tr><td>' + label + '</td><td class="text-center' + bold + '">' + fmtScore(v) + '</td></tr>';
+                hasRow = true;
+            });
+            if (!hasRow) html += '<tr><td colspan="2" class="text-muted">No scores recorded.</td></tr>';
+            html += '</tbody></table>';
+
+            // Comments section
+            const comments = sem.comments || {};
+            const commentEntries = Object.entries(comments).filter(function ([, v]) { return v && v.trim(); });
+
+            // Deduplicate attendance + attendance_comment (show once)
+            const seen = {};
+            const deduped = [];
+            commentEntries.forEach(function ([type, text]) {
+                const label = COMMENT_TYPE_LABELS[type] || type;
+                const key = label + '|' + text.trim();
+                if (!seen[key]) { seen[key] = true; deduped.push([label, text]); }
+            });
+
+            if (deduped.length > 0) {
+                html += '<div class="mb-3">';
+                html += '<p class="fw-semibold mb-1" style="font-size:0.9rem;">Comments</p>';
+                deduped.forEach(function ([label, text]) {
+                    html += '<div class="mb-2 p-2 bg-light rounded border-start border-3 border-secondary">';
+                    html += '<span class="badge bg-secondary me-1" style="font-size:0.7rem;">' + esc(label) + '</span>';
+                    html += '<span class="text-dark" style="font-size:0.9rem;">' + esc(text).replace(/\n/g, '<br>') + '</span>';
+                    html += '</div>';
+                });
+                html += '</div>';
+            }
+        });
+        return html;
+    }
+
+    if (detailsModal) {
+        document.addEventListener('click', function (e) {
+            const btn = e.target.closest('.btn-show-details');
+            if (!btn) return;
+
+            const studentId  = btn.dataset.studentId;
+            const studentName= btn.dataset.studentName;
+            const schoolYear = btn.dataset.schoolYear;
+
+            detailsModalTitle.textContent = studentName + ' — Score Details';
+            detailsModalBody.innerHTML = '<div class="text-center py-4"><div class="spinner-border text-primary" role="status"></div></div>';
+            bootstrap.Modal.getOrCreateInstance(detailsModal).show();
+
+            const url = '<?= site_url('grading/below-60/decisions/student-details') ?>'
+                + '?student_id=' + encodeURIComponent(studentId)
+                + '&school_year=' + encodeURIComponent(schoolYear);
+
+            fetch(url, { headers: { 'X-Requested-With': 'XMLHttpRequest' } })
+                .then(function (r) { return r.json(); })
+                .then(function (data) {
+                    if (data.error) {
+                        detailsModalBody.innerHTML = '<div class="alert alert-danger">' + data.error + '</div>';
+                        return;
+                    }
+                    detailsModalBody.innerHTML = buildDetailsHtml(data.semesters);
+                })
+                .catch(function () {
+                    detailsModalBody.innerHTML = '<div class="alert alert-danger">Failed to load details.</div>';
+                });
+        });
+    }
+
+    // ── Email modal ───────────────────────────────────────────────
+    const modal        = document.getElementById('decisionEmailModal');
+    const loadingPane  = document.getElementById('emailModalLoading');
+    const errorPane    = document.getElementById('emailModalError');
+    const errorMsg     = document.getElementById('emailModalErrorMsg');
+    const form         = document.getElementById('decisionEmailForm');
+    const subjectInput = document.getElementById('emailSubjectInput');
+    const htmlHidden   = document.getElementById('emailHtmlHidden');
+    const studentIdIn  = document.getElementById('emailStudentId');
+    const semesterIn   = document.getElementById('emailSemester');
+    const schoolYearIn = document.getElementById('emailSchoolYear');
+
+    if (!modal) return;
+
+    function showPane(which) {
+        loadingPane.style.display = which === 'loading' ? '' : 'none';
+        errorPane.style.display   = which === 'error'   ? '' : 'none';
+        form.style.display        = which === 'form'    ? '' : 'none';
+    }
+
+    function destroyEditor() {
+        if (window.tinymce) {
+            tinymce.remove('#decisionEmailEditor');
+        }
+    }
+
+    function initEditor(html) {
+        if (!window.tinymce) return;
+        tinymce.init({
+            selector: '#decisionEmailEditor',
+            base_url: '<?= base_url('assets/tinymce') ?>',
+            suffix: '.min',
+            license_key: 'gpl',
+            height: 460,
+            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,
+            content_style: 'body { font-family: system-ui, -apple-system, Segoe UI, Roboto, Helvetica Neue, Arial, sans-serif; font-size: 14px; }',
+            setup(editor) {
+                editor.on('init', function () {
+                    editor.setContent(html);
+                    if (htmlHidden) htmlHidden.value = html;
+                });
+                editor.on('keyup change undo redo SetContent', function () {
+                    if (htmlHidden) htmlHidden.value = editor.getContent({ format: 'html' });
+                });
+            }
+        });
+    }
+
+    // Sync hidden field before form submit
+    form.addEventListener('submit', function () {
+        if (window.tinymce) {
+            const ed = tinymce.get('decisionEmailEditor');
+            if (ed && htmlHidden) htmlHidden.value = ed.getContent({ format: 'html' });
+        }
+    });
+
+    // Destroy editor when modal closes
+    modal.addEventListener('hidden.bs.modal', function () {
+        destroyEditor();
+        showPane('loading');
+    });
+
+    // Open modal when "Send Email" is clicked
+    document.addEventListener('click', function (e) {
+        const btn = e.target.closest('.btn-send-email');
+        if (!btn) return;
+
+        const studentId  = btn.dataset.studentId;
+        const semester   = btn.dataset.semester;
+        const schoolYear = btn.dataset.schoolYear;
+
+        studentIdIn.value  = studentId;
+        semesterIn.value   = semester;
+        schoolYearIn.value = schoolYear;
+
+        showPane('loading');
+
+        // Open the modal immediately (shows spinner)
+        const bsModal = bootstrap.Modal.getOrCreateInstance(modal);
+        bsModal.show();
+
+        // Fetch the pre-rendered email
+        const url = '<?= site_url('grading/below-60/decisions/email/preview') ?>'
+            + '?student_id=' + encodeURIComponent(studentId)
+            + '&semester='   + encodeURIComponent(semester)
+            + '&school_year='+ encodeURIComponent(schoolYear);
+
+        fetch(url, { headers: { 'X-Requested-With': 'XMLHttpRequest' } })
+            .then(function (res) { return res.json(); })
+            .then(function (data) {
+                if (data.error) {
+                    errorMsg.textContent = data.error;
+                    showPane('error');
+                    return;
+                }
+                subjectInput.value = data.subject || '';
+                // Reset textarea content before init
+                document.getElementById('decisionEmailEditor').value = data.html || '';
+                showPane('form');
+                initEditor(data.html || '');
+            })
+            .catch(function () {
+                errorMsg.textContent = 'Failed to load email template. Please try again.';
+                showPane('error');
+            });
+    });
+})();
+</script>
+<?= $this->endSection() ?>
@@ -412,7 +412,7 @@
    <!-- Navbar Start -->
    <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
        <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-            <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 60px; width: 80px;">
+            <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 60px; width: 60px; border-radius: 50%; object-fit: cover;">
            <h1 class="m-0 ms-2 green-title"></h1>
        </a>
        <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -57,7 +57,7 @@
 <body>
    <div class="email-container">
        <div class="email-nopicture">
-            <img src="https://alrahmaisgl.org/assets/images/alrahma_logo.png" alt="" style="width: 150px; height: 110px">
+            <img src="https://alrahmaisgl.org/assets/images/alrahma_logo.png" alt="" style="width: 110px; height: 110px; border-radius: 50%; object-fit: cover;">
        </div>

        <div class="email-body">
@@ -172,6 +172,7 @@
      #navbarManagement[data-mgmt-menu-mode="dark"] .navbar-toggler-icon { filter: invert(1) brightness(2); }
      .logout-btn { border-color: var(--mgmt-primary) !important; color: var(--mgmt-primary) !important; }
      .logout-btn:hover { background-color: var(--mgmt-primary) !important; color: #fff !important; }
+      .school-logo-circle { border-radius: 50%; object-fit: cover; }

      /* Sidebar (hover to reveal) */
      #navbarManagement.mgmt-sidebar {
@@ -1,7 +1,7 @@
 <!-- navbar.php -->
 <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
    <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-        <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+        <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" class="school-logo-circle" style="height: 40px; width: 40px; object-fit: cover; border-radius: 50%;">
        <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
    </a>
    <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -54,6 +54,9 @@ $classSectionVal = (string)($classSectionId ?? ($_GET['class_section_id'] ?? '')
  <div class="col-auto">
    <select name="semester" class="form-select form-select-sm" style="min-width: 140px;">
      <option value="">—</option>
+      <?php if (!empty($showAllSemesterOption)): ?>
+      <option value="year" <?= (strcasecmp($semVal, 'year') === 0 ? 'selected' : '') ?>>Whole Year</option>
+      <?php endif; ?>
      <option value="Fall"   <?= (strcasecmp($semVal, 'Fall')   === 0 ? 'selected' : '') ?>>Fall</option>
      <option value="Spring" <?= (strcasecmp($semVal, 'Spring') === 0 ? 'selected' : '') ?>>Spring</option>
    </select>
@@ -56,7 +56,7 @@
  <div class="d-flex align-items-center w-100">
    <!-- Brand (left) -->
    <a class="navbar-brand col-md-3 col-lg-2 mr-0 px-1" href="/administrator/administratordashboard">
-      <img src="<?= base_url('assets/images/logo.png') ?>" alt="School Icon" style="width: 50px; height: 40px; margin-right: 8px;">
+      <img src="<?= base_url('assets/images/logo.png') ?>" alt="School Icon" style="width: 40px; height: 40px; border-radius: 50%; object-fit: cover; margin-right: 8px;">
      <strong>School Management Dashboard</strong>
    </a>

@@ -15,7 +15,7 @@ Test PASSWORD: 9JC?].qM
        <div class="mb-4">
            <a href="<?= base_url('/parent_dashboard') ?>">
                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="Alrahma Logo"
-                    style="width: 180px; height: 120px;">
+                    style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
            </a>
        </div>

@@ -5,7 +5,7 @@
    <div class="bg-white p-5 rounded-5 shadow registration-form container" style="max-width: 600px; width: 100%;">
        <div class="text-center mb-4">
            <a href="<?= base_url('/') ?>">
-                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 180px; height: 120px;">
+                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
 </a>
        </div>

@@ -43,7 +43,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -48,7 +48,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -48,7 +48,7 @@
        <!-- Navbar Start -->
        <nav class="navbar navbar-expand-lg bg-white navbar-light sticky-top px-4 px-lg-5 py-lg-0">
            <a href="<?= base_url('/') ?>" class="navbar-brand d-flex align-items-center">
-                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px;">
+                <img src="<?= base_url('images/logo.png') ?>" alt="Al Rahma Sunday School" style="height: 40px; width: 40px; border-radius: 50%; object-fit: cover;">
                <h1 class="m-0 ms-2 green-title">Al Rahma Sunday School</h1>
            </a>
            <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#navbarCollapse">
@@ -14,7 +14,7 @@
        <div class="text-center mb-4">
            <a href="<?= base_url('/') ?>">
                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt=""
-                    style="width: 180px; height: 120px;">
+                    style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
            </a>
        </div>

@@ -8,7 +8,7 @@
        <div class="text-center mb-4">
            <a href="<?= base_url('/') ?>">
                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt=""
-                    style="width: 180px; height: 120px;">
+                    style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
            </a>
        </div>

@@ -4,7 +4,7 @@
        <div class="modal-content rounded-4 shadow border-0" style="max-width: 600px; margin: auto;">

            <div class="modal-body text-center">
-                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="Logo" style="width: 180px; height: 120px;">
+                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="Logo" style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
                <h5 class="modal-title text-success" id="emailConfirmLabel">Check Your Email</h5>
                <p class="lead mt-3">
                    A link to reset the password has been sent to this email:<br>
@@ -9,7 +9,7 @@
 <div class="modal fade" id="successModal" tabindex="-1" aria-labelledby="successModalLabel" aria-hidden="true">
    <div class="text-center mb-4">
        <a href="<?= base_url('/') ?>">
-            <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 180px; height: 120px;">
+            <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
        </a>
        <div class="modal-dialog modal-dialog-centered">
            <div class="modal-content border-success shadow">
@@ -20,7 +20,7 @@
        <div class="text-center mb-4">
            <a href="<?= base_url('/') ?>">
                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt=""
-                    style="width: 180px; height: 120px;">
+                    style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
            </a>
        </div>

@@ -11,7 +11,7 @@
        <?= csrf_field() ?>
        <div class="text-center mb-4">
            <a href="<?= base_url('/') ?>">
-                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 180px; height: 120px;"></a>
+                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;"></a>
        </div>
        <h3 class="text-center text-success" style="font-family: Arial, sans-serif;">Reset Your Password</h3>
        <br>
@@ -6,7 +6,7 @@
        <?= csrf_field(); ?>
        <div class="text-center mb-4">
            <a href="<?= base_url('/') ?>">
-                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 180px; height: 120px;">
+                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
            </a>
        </div>

@@ -8,7 +8,7 @@
        <?= csrf_field(); ?>
        <div class="text-center mb-4">
            <a href="<?= base_url('/') ?>">
-                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 180px; height: 120px;">
+                <img src="<?= base_url('assets/images/alrahma_logo.png') ?>" alt="" style="width: 120px; height: 120px; border-radius: 50%; object-fit: cover;">
 </a>
        </div>

@@ -321,12 +321,18 @@ color: #080808;


 .navbar-logo {
-    height: 80px !important;
-    width: auto !important;
-    object-fit: contain;
+    height: 50px !important;
+    width: 50px !important;
+    object-fit: cover;
+    border-radius: 50%;
    margin-right: 1rem;
 }

+.school-logo-circle {
+    border-radius: 50%;
+    object-fit: cover;
+}
+

 .logout-btn {
    font-weight: bold;
@@ -22,6 +22,9 @@ html {

 .logo {
    width: 100px;
+    height: 100px;
+    border-radius: 50%;
+    object-fit: cover;
    margin-bottom: 20px;
 }

@@ -22,9 +22,10 @@ body {
 }

 .modal-header .logo {
-    width: 100%;
-    max-width: 200px;
-    height: auto;
+    width: 100px;
+    height: 100px;
+    border-radius: 50%;
+    object-fit: cover;
    margin-bottom: 10px;
 }

@@ -125,7 +125,10 @@ body.centered {
 }

 .logo {
-    width: 200px;
+    width: 120px;
+    height: 120px;
+    border-radius: 50%;
+    object-fit: cover;
    margin-bottom: 20px;
 }

@@ -31,8 +31,10 @@ body {
 }

 .left-side .logo {
-    max-width: 100%;
-    height: auto;
+    width: 120px;
+    height: 120px;
+    border-radius: 50%;
+    object-fit: cover;
    margin-top: 10px;
 }

@@ -1,22 +1,22 @@
 .left-side .logo {
-    width: 100%;
-    max-width: 300px;
-    /* Adjustable maximum size */
-    height: auto;
+    width: 120px;
+    height: 120px;
+    border-radius: 50%;
+    object-fit: cover;
 }

 /* Responsive adjustments for smaller screens */
@media (max-width: 768px) {
    .left-side .logo {
-        max-width: 300px;
-        /* Reduce size on smaller screens */
+        width: 90px;
+        height: 90px;
    }
 }

@media (max-width: 480px) {
    .left-side .logo {
-        max-width: 150px;
-        /* Further reduce size for very small screens */
+        width: 70px;
+        height: 70px;
    }
 }
Author	SHA1	Message	Date
root	c294d7bed7	fix logo	2026-05-26 23:14:55 -04:00
root	5ed65a867c	report cadr and trophy	2026-05-26 05:11:10 -04:00
root	22d6f960ea	move qr code inside the certificate	2026-05-26 03:09:48 -04:00
root	cc0b83c1b9	fix attendance spring days	2026-05-26 03:03:03 -04:00
root	31976752da	fix font	2026-05-26 02:13:39 -04:00
root	0bf8d13777	fix certificates	2026-05-26 01:44:57 -04:00
root	4ae62e37a3	test new server	2026-05-22 00:58:43 -04:00
root	d8fdbeb4c3	fix certificate qr	2026-05-21 18:37:39 -04:00