add trophy winner name print

app/Config/Routes.php

@@ -538,6 +538,9 @@ $routes->get('grading/(:segment)/(:num)/(:num)', 'View\GradingController::show/$
 $routes->post('grading/update', 'View\GradingController::update');
 $routes->get('grading', 'View\GradingController::grading');
 $routes->post('grading/toggle-score-lock', 'View\GradingController::toggleScoreLock', ['filter' => 'auth:read']);
+$routes->get('grading/toggle-score-lock', static function () {
+    return 'GET route hit. Something is calling this route incorrectly.';
+});
 $routes->post('grading/lock-all-scores', 'View\GradingController::lockAllScores', ['filter' => 'auth:read']);
 $routes->post('grading/release-scores', 'View\GradingController::toggleParentScoresRelease', ['filter' => 'auth:read']);
 $routes->post('grading/refresh-semester-scores', 'View\GradingController::refreshSemesterScores', ['filter' => 'auth:read']);

app/Controllers/ProofreadController.php

@@ -10,8 +10,13 @@ class ProofreadController extends ResourceController
     {
         // Basic per-IP throttling: 10 requests per minute
         $throttler = service('throttler');
-        $key = 'proofread-' . $this->request->getIPAddress();
-        if (!$throttler->check($key, 10, MINUTE)) {
+
+        // Cache/throttler keys cannot contain reserved characters.
+        // Raw IPv6 addresses contain ":", so hash the IP first.
+        $ip = $this->request->getIPAddress();
+        $key = 'proofread-' . hash('sha256', $ip);
+
+        if (! $throttler->check($key, 10, MINUTE)) {
             return $this->respond([
                 'ok' => false,
                 'error' => 'Too many requests. Try again in a minute.',
@@ -20,8 +25,9 @@ class ProofreadController extends ResourceController
         }
 
         // Accept form-urlencoded payload to play nicely with CSRF protection
-        $validation = service('validation');
         $payload = sanitize_request_value($this->request->getPost(['text']));
+
+        $validation = service('validation');
         $validation->setRules([
             'text' => 'required|min_length[1]|max_length[20000]',
         ]);
@@ -36,20 +42,34 @@ class ProofreadController extends ResourceController
 
         $text = (string) $payload['text'];
 
-        $client = \Config\Services::curlrequest(['timeout' => 10]);
+        $client = \Config\Services::curlrequest([
+            'timeout' => 10,
+        ]);
 
         try {
             $resp = $client->post('https://api.languagetool.org/v2/check', [
-                'headers' => ['Content-Type' => 'application/x-www-form-urlencoded'],
+                'headers' => [
+                    'Content-Type' => 'application/x-www-form-urlencoded',
+                ],
                 'form_params' => [
                     'text'     => $text,
                     'language' => 'en-US',
                 ],
             ]);
 
+            $result = json_decode($resp->getBody(), true);
+
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                return $this->respond([
+                    'ok' => false,
+                    'error' => 'Invalid response from proofread service.',
+                    'csrfHash' => csrf_hash(),
+                ], 502);
+            }
+
             return $this->respond([
                 'ok' => true,
-                'result' => json_decode($resp->getBody(), true),
+                'result' => $result,
                 'csrfHash' => csrf_hash(),
             ]);
         } catch (\Throwable $e) {
@@ -60,4 +80,4 @@ class ProofreadController extends ResourceController
             ], 502);
         }
     }
-}
+}

app/Controllers/View/CertificateController.php

@@ -6,7 +6,6 @@ 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,9 +26,9 @@ class CertificateController extends BaseController
 
     public function index()
     {
-        $db             = \Config\Database::connect();
-        $selectedCsid   = $this->request->getGet('class_section_id');
-        $schoolYear     = $this->request->getGet('school_year') ?? $this->schoolYear;
+        $db           = \Config\Database::connect();
+        $selectedCsid = $this->request->getGet('class_section_id');
+        $schoolYear   = $this->request->getGet('school_year') ?? $this->schoolYear;
 
         // ── All enrolled students across every class section ───────────────────
         $allEnrolled = $db->table('student_class sc')
@@ -40,96 +39,126 @@ class CertificateController extends BaseController
             ->where('sc.school_year', $schoolYear)
             ->orderBy('s.firstname', 'ASC')
             ->orderBy('s.lastname', 'ASC')
-            ->get()->getResultArray();
+            ->get()
+            ->getResultArray();
 
-        $allIds = array_unique(array_column($allEnrolled, 'student_id'));
+        $allIds = array_values(array_unique(array_map('intval', array_column($allEnrolled, 'student_id'))));
+
+        // ── Saved generated YEAR decisions from student_decisions ──────────────
+        //
+        // Source of truth:
+        // student_decisions.year_score
+        // student_decisions.decision
+        //
+        // Do NOT recalculate certificate decisions here from semester_scores.
+        $decisionsByStudent = [];
 
-        // ── Semester scores ────────────────────────────────────────────────────
-        $allScoreMap = [];
         if (!empty($allIds)) {
-            foreach ($db->table('semester_scores')
-                ->select('student_id, semester, semester_score')
+            $decisionRows = $db->table('student_decisions')
                 ->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;
+                ->get()
+                ->getResultArray();
+
+            foreach ($decisionRows as $d) {
+                $sid = (int)($d['student_id'] ?? 0);
+
+                if ($sid <= 0) {
+                    continue;
+                }
+
+                $decision = trim((string)($d['decision'] ?? ''));
+                $source   = trim((string)($d['source'] ?? ''));
+
+                if ($source === '') {
+                    $source = $decision === '' ? 'pending' : 'manual';
+                }
+
+                $decisionsByStudent[$sid]['Year'] = [
+                    'decision'   => $decision,
+                    'source'     => $source,
+                    'notes'      => (string)($d['notes'] ?? ''),
+                    'year_score' => $d['year_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) ──────────────────────
+        // ── 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) {
+                ->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}]
+        // ── Build per-class buckets and stats ──────────────────────────────────
+        $studentsByClass = [];
+        $statsPerClass   = [];
 
         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];
+            if (!isset($statsPerClass[$csid])) {
+                $statsPerClass[$csid] = [
+                    'name'  => $row['class_section_name'],
+                    'total' => 0,
+                    'pass'  => 0,
+                    'cert'  => 0,
+                ];
             }
 
-            // 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 no generated decision exists yet, explicitly mark pending.
+            if (!isset($decisionsByStudent[$sid])) {
+                $decisionsByStudent[$sid]['Decision'] = [
+                    'decision'   => '',
+                    'source'     => 'pending',
+                    'notes'      => '',
+                    'year_score' => null,
+                ];
+            }
+
+            // Certificate eligibility:
+            // A student is eligible only if the saved final generated decision is Pass.
+            $studentDecisions = $decisionsByStudent[$sid] ?? [];
+            $isPass           = !empty($studentDecisions);
+
+            foreach ($studentDecisions as $decisionRow) {
+                $decision = trim((string)($decisionRow['decision'] ?? ''));
+
+                if (strcasecmp($decision, 'Pass') !== 0) {
+                    $isPass = false;
+                    break;
+                }
+            }
+
+            if ($isPass) {
+                $statsPerClass[$csid]['pass']++;
+            }
+
+            if (isset($certsByStudent[$sid])) {
+                $statsPerClass[$csid]['cert']++;
             }
-            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;
         }
@@ -181,9 +210,12 @@ class CertificateController extends BaseController
                 ->where('cr.verification_token', $certNumber)
                 ->orWhere('cr.certificate_number', strtoupper($certNumber))
             ->groupEnd()
-            ->get()->getRowArray();
+            ->get()
+            ->getRowArray();
 
-        return view('certificates/verify', ['record' => $record ?: null]);
+        return view('certificates/verify', [
+            'record' => $record ?: null,
+        ]);
     }
 
     // ─── Reprint an existing certificate ──────────────────────────────────────
@@ -193,7 +225,8 @@ class CertificateController extends BaseController
         $record = \Config\Database::connect()
             ->table('certificate_records')
             ->where('certificate_number', strtoupper($certNumber))
-            ->get()->getRowArray();
+            ->get()
+            ->getRowArray();
 
         if (!$record) {
             return redirect()->to('administrator/certificates/log')
@@ -201,23 +234,26 @@ class CertificateController extends BaseController
         }
 
         $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'] ?? ''),
+            'firstname'    => (string)($record['student_name'] ?? ''),
+            'lastname'     => '',
+            'grade'        => (string)($record['grade'] ?? ''),
+            'cert_number'  => (string)($record['certificate_number'] ?? ''),
             'verify_token' => $this->ensureVerificationTokenForRecord($record),
         ];
 
-        // student_name is stored as "Firstname Lastname" — split for the PDF builder
+        // 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];
@@ -246,13 +282,15 @@ class CertificateController extends BaseController
                 return $this->response
                     ->setStatusCode(422)
                     ->setJSON([
-                        'ok' => false,
-                        'error' => 'Please select at least one student.',
+                        'ok'         => false,
+                        'error'      => 'Please select at least one student.',
                         'csrf_token' => csrf_token(),
-                        'csrf_hash' => csrf_hash(),
+                        'csrf_hash'  => csrf_hash(),
                     ]);
             }
-            return redirect()->to('administrator/certificates')->with('error', 'Please select at least one student.');
+
+            return redirect()->to('administrator/certificates')
+                ->with('error', 'Please select at least one student.');
         }
 
         $studentIds = array_filter(array_map('intval', $studentIds));
@@ -263,13 +301,15 @@ class CertificateController extends BaseController
                 return $this->response
                     ->setStatusCode(422)
                     ->setJSON([
-                        'ok' => false,
-                        'error' => 'Invalid student selection.',
+                        'ok'         => false,
+                        'error'      => 'Invalid student selection.',
                         'csrf_token' => csrf_token(),
-                        'csrf_hash' => csrf_hash(),
+                        'csrf_hash'  => csrf_hash(),
                     ]);
             }
-            return redirect()->to('administrator/certificates')->with('error', 'Invalid student selection.');
+
+            return redirect()->to('administrator/certificates')
+                ->with('error', 'Invalid student selection.');
         }
 
         $db       = \Config\Database::connect();
@@ -277,21 +317,26 @@ class CertificateController extends BaseController
 
         foreach ($studentIds as $id) {
             $row = null;
+
             if ($classSectionId) {
                 $row = $db->table('student_class sc')
                     ->select('s.id, s.firstname, s.lastname, cs.class_section_name AS grade')
                     ->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('sc.class_section_id', (int)$classSectionId)
+                    ->where('sc.school_year', $schoolYear)
                     ->where('s.id', $id)
-                    ->get()->getRowArray();
+                    ->get()
+                    ->getRowArray();
             }
 
             if (!$row) {
                 $s = $db->table('students')
                     ->select('id, firstname, lastname, registration_grade AS grade')
                     ->where('id', $id)
-                    ->get()->getRowArray();
+                    ->get()
+                    ->getRowArray();
+
                 $row = $s ?: null;
             }
 
@@ -305,57 +350,62 @@ class CertificateController extends BaseController
                 return $this->response
                     ->setStatusCode(422)
                     ->setJSON([
-                        'ok' => false,
-                        'error' => 'No valid students found.',
+                        'ok'         => false,
+                        'error'      => 'No valid students found.',
                         'csrf_token' => csrf_token(),
-                        'csrf_hash' => csrf_hash(),
+                        'csrf_hash'  => csrf_hash(),
                     ]);
             }
-            return redirect()->to('administrator/certificates')->with('error', 'No valid students found.');
+
+            return redirect()->to('administrator/certificates')
+                ->with('error', 'No valid students found.');
         }
 
-        $issuedBy   = session()->get('user_id');
-        $issuedAt   = date('Y-m-d H:i:s');
-        $certDateDb = $this->parseCertDate($certDate);
+        $issuedAt = date('Y-m-d H:i:s');
 
-        // Load any existing certificates for these students this school year
-        $db         = \Config\Database::connect();
+        // Load existing certificates for these students this school year.
         $existingCerts = $db->table('certificate_records')
             ->select('id, student_id, certificate_number, verification_token')
             ->whereIn('student_id', array_column($students, 'id'))
             ->where('school_year', $schoolYear)
-            ->get()->getResultArray();
+            ->get()
+            ->getResultArray();
+
         $existingCertMap = [];
+
         foreach ($existingCerts as $ec) {
             $existingCertMap[(int)$ec['student_id']] = $ec;
         }
 
         foreach ($students as &$student) {
             $sid = (int)$student['id'];
+
             if (isset($existingCertMap[$sid])) {
-                // Reuse existing certificate number — do not create a new record
+                // Reuse existing certificate number — do not create a new record.
                 $existing = $existingCertMap[$sid];
-                $student['cert_number'] = (string)($existing['certificate_number'] ?? '');
+
+                $student['cert_number']  = (string)($existing['certificate_number'] ?? '');
                 $student['verify_token'] = $this->ensureVerificationTokenForRecord($existing);
             } else {
-                $certNumber = $this->certRecordModel->nextNumber($schoolYear);
+                $certNumber  = $this->certRecordModel->nextNumber($schoolYear);
                 $verifyToken = $this->certRecordModel->generateVerificationToken();
+
                 $this->certRecordModel->insert([
                     'certificate_number' => $certNumber,
                     'verification_token' => $verifyToken,
                     'student_id'         => $sid,
                     'student_name'       => $student['firstname'] . ' ' . $student['lastname'],
                     'grade'              => $this->formatGrade($student['grade'] ?? ''),
-                    'cert_date'          => $certDateDb,
                     'school_year'        => $schoolYear,
                     'class_section_id'   => $classSectionId ?: null,
-                    'issued_by'          => $issuedBy,
                     'issued_at'          => $issuedAt,
                 ]);
-                $student['cert_number'] = $certNumber;
+
+                $student['cert_number']  = $certNumber;
                 $student['verify_token'] = $verifyToken;
             }
         }
+
         unset($student);
 
         $pdfData  = $this->buildPdf($students, $certDate);
@@ -376,9 +426,11 @@ class CertificateController extends BaseController
         if (preg_match('#^(\d{2})/(\d{2})/(\d{4})$#', $certDate, $m)) {
             return $m[3] . '-' . $m[1] . '-' . $m[2];
         }
+
         if (preg_match('#^\d{4}-\d{2}-\d{2}$#', $certDate)) {
             return $certDate;
         }
+
         return null;
     }
 
@@ -387,17 +439,20 @@ class CertificateController extends BaseController
         $clean = trim($raw);
         $lower = strtolower($clean);
 
-        // Strip section suffix: "Grade 1-A" → "Grade 1", "Grade 2-B" → "Grade 2"
+        // 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' || $lower === 'kindergarten') {
             return 'Kindergarten';
         }
-        // Raw number or number-section (e.g. "1", "1-A", "2-B") → keep number only
+
+        // Raw number or number-section: "1", "1-A", "2-B" → keep number only.
         if (preg_match('/^(\d+)([- ][A-Za-z0-9]+)?$/', $clean, $m)) {
             return 'Grade ' . (int)$m[1];
         }
@@ -408,17 +463,22 @@ class CertificateController extends BaseController
     private function ensureVerificationTokenForRecord(array $record): string
     {
         $token = trim((string)($record['verification_token'] ?? ''));
+
         if ($token !== '') {
             return $token;
         }
 
         $recordId = (int)($record['id'] ?? 0);
+
         if ($recordId <= 0) {
             return '';
         }
 
         $token = $this->certRecordModel->generateVerificationToken();
-        $this->certRecordModel->update($recordId, ['verification_token' => $token]);
+
+        $this->certRecordModel->update($recordId, [
+            'verification_token' => $token,
+        ]);
 
         return $token;
     }
@@ -431,10 +491,11 @@ class CertificateController extends BaseController
         $imgDir  = FCPATH . 'assets' . DIRECTORY_SEPARATOR . 'certificates' . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR;
 
         $edwardianFont = \TCPDF_FONTS::addTTFfont($fontDir . 'Edwardian Script ITC Regular.ttf', 'TrueTypeUnicode', '', 32);
-        $garamondBold  = \TCPDF_FONTS::addTTFfont($fontDir . 'Garamond Bold.ttf',                'TrueTypeUnicode', '', 32);
-        $ebGaramond    = \TCPDF_FONTS::addTTFfont($fontDir . 'EBGaramond-Regular.ttf',           'TrueTypeUnicode', '', 32);
+        $garamondBold  = \TCPDF_FONTS::addTTFfont($fontDir . 'Garamond Bold.ttf', 'TrueTypeUnicode', '', 32);
+        $ebGaramond    = \TCPDF_FONTS::addTTFfont($fontDir . 'EBGaramond-Regular.ttf', 'TrueTypeUnicode', '', 32);
 
         $pdf = new \TCPDF('L', 'pt', 'A4', true, 'UTF-8', false);
+
         $pdf->SetCreator('Al Rahma Sunday School');
         $pdf->SetTitle('Student Certificates');
         $pdf->SetMargins(0, 0, 0, true);
@@ -450,9 +511,9 @@ class CertificateController extends BaseController
         foreach ($students as $student) {
             $pdf->AddPage();
 
-            $name       = $student['firstname'] . ' ' . $student['lastname'];
-            $grade      = $this->formatGrade($student['grade'] ?? '');
-            $certNumber = $student['cert_number'] ?? '';
+            $name        = trim((string)($student['firstname'] ?? '') . ' ' . (string)($student['lastname'] ?? ''));
+            $grade       = $this->formatGrade($student['grade'] ?? '');
+            $certNumber  = $student['cert_number'] ?? '';
             $verifyToken = $student['verify_token'] ?? '';
 
             $verifyUrl = $verifyToken !== ''
@@ -460,10 +521,18 @@ class CertificateController extends BaseController
                 : null;
 
             $this->drawCertificate(
-                $pdf, $W, $H,
-                $name, $grade, $certDate, $certNumber,
+                $pdf,
+                $W,
+                $H,
+                $name,
+                $grade,
+                $certDate,
+                $certNumber,
                 $verifyUrl,
-                $imgDir, $edwardianFont, $garamondBold, $ebGaramond
+                $imgDir,
+                $edwardianFont,
+                $garamondBold,
+                $ebGaramond
             );
         }
 
@@ -476,8 +545,8 @@ class CertificateController extends BaseController
      */
     private function drawCertificate(
         \TCPDF $pdf,
-        float  $W,
-        float  $H,
+        float $W,
+        float $H,
         string $name,
         string $grade,
         string $certDate,
@@ -489,9 +558,9 @@ class CertificateController extends BaseController
         string $ebGaramond
     ): void {
         // ── Images
-        $pdf->Image($imgDir . 'title.png',      126, 0,   600);
+        $pdf->Image($imgDir . 'title.png', 126, 0, 600);
         $pdf->Image($imgDir . 'background.png', 280, 176, 291, 340);
-        $pdf->Image($imgDir . 'signature.png',  140, 410,  90,  80);
+        $pdf->Image($imgDir . 'signature.png', 140, 410, 90, 80);
 
         // ── "Presented to:"
         $pdf->SetFont('times', 'B', 24);
@@ -499,25 +568,28 @@ class CertificateController extends BaseController
         $pdf->SetXY(0, 151);
         $pdf->Cell($W, 24, 'Presented to:', 0, 0, 'C');
 
-        // ── QR code — left-aligned with "Presented to:", vertically centred on that line
-        $qrSize = 42; // pt
+        // ── QR code — left-aligned with "Presented to:", vertically centred on that line.
+        $qrSize = 42;
+
         if (!empty($verifyUrl)) {
-            $qrX = 120;                       // ~1 cm from left edge
-            $qrY = 171 + (24 - $qrSize) / 2; // vertically centred on "Presented to:" row
+            $qrX = 120;
+            $qrY = 171 + (24 - $qrSize) / 2;
+
             $style = [
-                'border' => false,
+                '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
+        // ── Student name — center based on actual string width.
         $pdf->SetFont($edwardianFont, '', 38);
         $nameX = ($W - $pdf->GetStringWidth($name)) / 2;
         $this->drawGradientText($pdf, $edwardianFont, 38, $name, $nameX, 221.5);
-  
+
         // ── Line under name
         $pdf->SetFont('times', '', 20);
         $pdf->SetXY(0, 236);
@@ -543,7 +615,7 @@ class CertificateController extends BaseController
         $pdf->SetXY(0, 375);
         $pdf->Cell($W, 20, 'Al Rahma Sunday School', 0, 0, 'C');
 
-        // ── Date (gradient script)
+        // ── Date
         $this->drawGradientText($pdf, $edwardianFont, 26, $certDate, 586, 456);
 
         // ── Date underline + label
@@ -559,7 +631,7 @@ class CertificateController extends BaseController
         $pdf->SetXY(106, 492);
         $pdf->Cell(168, 20, 'Signature', 0, 0, 'C');
 
-        // ── Certificate number — 1.4 cm from bottom, 2.5 cm from left
+        // ── Certificate number — 1.4 cm from bottom, 2.5 cm from left.
         if ($certNumber !== '') {
             $pdf->SetFont('helvetica', '', 8);
             $pdf->SetTextColor(150, 150, 150);
@@ -569,8 +641,14 @@ class CertificateController extends BaseController
         }
     }
 
-    private function drawGradientText(\TCPDF $pdf, string $fontName, float $fontSize, string $text, float $x, float $y): void
-    {
+    private function drawGradientText(
+        \TCPDF $pdf,
+        string $fontName,
+        float $fontSize,
+        string $text,
+        float $x,
+        float $y
+    ): void {
         $pdf->SetFont($fontName, '', $fontSize);
 
         for ($i = 0; $i < 6; $i++) {
@@ -583,4 +661,4 @@ class CertificateController extends BaseController
         $pdf->SetTextColor(0, 0, 0);
         $pdf->Text($x, $y, $text);
     }
-}
+}

app/Controllers/View/GradingController.php

@@ -1070,14 +1070,15 @@ class GradingController extends Controller
 
     public function belowSixty()
     {
-        $configuredSemester = (string) $this->semester;
         $configuredYear = (string) $this->schoolYear;
 
-        $requestedSemester = trim((string)($this->request->getGet('semester') ?? ''));
+        $requestedSemester = strtolower(trim((string)($this->request->getGet('semester') ?? '')));
         $requestedYear = trim((string)($this->request->getGet('school_year') ?? ''));
 
-        $isYearMode = (strtolower($requestedSemester) === 'year');
-        $semester = $isYearMode ? 'year' : ($requestedSemester !== '' ? $requestedSemester : ($configuredSemester !== '' ? $configuredSemester : 'Fall'));
+        // This page intentionally supports only Fall and Whole Year.
+        // Spring is still used internally for the Whole Year calculation, but it is not selectable here.
+        $isYearMode = ($requestedSemester === 'year');
+        $semester = $isYearMode ? 'year' : 'Fall';
         $schoolYear = $requestedYear !== '' ? $requestedYear : $configuredYear;
 
         $schoolYears = $this->getSchoolYearsForScores($schoolYear);
@@ -1092,10 +1093,12 @@ class GradingController extends Controller
             'schoolYears' => $schoolYears,
             'canViewGrading' => $canViewGrading,
             'isYearMode' => $isYearMode,
+            'semesterOptions' => ['Fall'],
             'showAllSemesterOption' => true,
         ]);
     }
 
+
     public function editBelowSixtyEmail()
     {
         $studentId = (int)$this->request->getGet('student_id');
@@ -1766,7 +1769,95 @@ class GradingController extends Controller
     private function fetchBelowSixtyRows(string $schoolYear, string $semester): array
     {
         $isYearMode = strtolower(trim($semester)) === 'year';
-        $semesterKey = $isYearMode ? '' : strtolower(trim($semester));
+
+        if ($isYearMode) {
+            $rows = $this->db->table('semester_scores ss')
+                ->select('s.id AS student_id')
+                ->select('s.school_id')
+                ->select('s.firstname')
+                ->select('s.lastname')
+                ->select('cs.class_section_name')
+                ->select("'year' AS semester", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.homework_avg END) AS fall_homework_avg", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.homework_avg END) AS spring_homework_avg", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.project_avg END) AS fall_project_avg", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.project_avg END) AS spring_project_avg", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.participation_score END) AS fall_participation_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.participation_score END) AS spring_participation_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN COALESCE(ss.test_avg, ss.quiz_avg) END) AS fall_test_avg", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN COALESCE(ss.test_avg, ss.quiz_avg) END) AS spring_test_avg", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.ptap_score END) AS fall_ptap_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.ptap_score END) AS spring_ptap_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.attendance_score END) AS fall_attendance_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.attendance_score END) AS spring_attendance_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.midterm_exam_score END) AS fall_midterm_exam_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.midterm_exam_score END) AS spring_midterm_exam_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.final_exam_score END) AS fall_final_exam_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.final_exam_score END) AS spring_final_exam_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.semester_score END) AS fall_score", false)
+                ->select("MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.semester_score END) AS spring_score", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.semester_score END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.semester_score END)
+                ) / 2 AS semester_score", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.homework_avg END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.homework_avg END)
+                ) / 2 AS homework_avg", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.project_avg END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.project_avg END)
+                ) / 2 AS project_avg", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.participation_score END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.participation_score END)
+                ) / 2 AS participation_score", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN COALESCE(ss.test_avg, ss.quiz_avg) END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN COALESCE(ss.test_avg, ss.quiz_avg) END)
+                ) / 2 AS test_avg", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.ptap_score END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.ptap_score END)
+                ) / 2 AS ptap_score", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.attendance_score END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.attendance_score END)
+                ) / 2 AS attendance_score", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.midterm_exam_score END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.midterm_exam_score END)
+                ) / 2 AS midterm_exam_score", false)
+                ->select("(
+                    MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'fall' THEN ss.final_exam_score END)
+                    + MAX(CASE WHEN LOWER(TRIM(ss.semester)) = 'spring' THEN ss.final_exam_score END)
+                ) / 2 AS final_exam_score", false)
+                ->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)
+                ->where('ss.semester_score IS NOT NULL', null, false)
+                ->where("LOWER(TRIM(ss.semester)) IN ('fall', 'spring')", null, false)
+                ->groupBy('s.id, s.school_id, s.firstname, s.lastname, ss.class_section_id, cs.class_section_name')
+                ->having('fall_score IS NOT NULL', null, false)
+                ->having('spring_score IS NOT NULL', null, false)
+                ->having('semester_score <', 60)
+                ->orderBy('s.lastname', 'ASC')
+                ->orderBy('s.firstname', 'ASC')
+                ->get()
+                ->getResultArray();
+
+            foreach ($rows as &$row) {
+                $row['comment'] = '';
+                $row['status'] = 'Open';
+                $row['note'] = '';
+            }
+            unset($row);
+
+            return $rows;
+        }
+
+        $semesterKey = 'fall';
         $builder = $this->db->table('semester_scores ss')
             ->select([
                 's.id AS student_id',
@@ -1790,11 +1881,8 @@ class GradingController extends Controller
             ->where('s.is_active', 1)
             ->where('ss.school_year', $schoolYear)
             ->where('ss.semester_score IS NOT NULL', null, false)
-            ->where('ss.semester_score <', 60);
-
-        if (!$isYearMode) {
-            $builder->where("LOWER(TRIM(ss.semester))", $semesterKey);
-        }
+            ->where('ss.semester_score <', 60)
+            ->where("LOWER(TRIM(ss.semester))", $semesterKey);
 
         $rows = $builder
             ->orderBy('s.lastname', 'ASC')
@@ -1815,16 +1903,15 @@ class GradingController extends Controller
 
         $commentMap = [];
         if (!empty($studentIds)) {
-            $commentBuilder = $this->db->table('score_comments')
+            $commentRows = $this->db->table('score_comments')
                 ->select('student_id, semester, comment, created_at')
                 ->where('score_type', 'general')
                 ->where('school_year', $schoolYear)
                 ->whereIn('student_id', $studentIds)
-                ->orderBy('created_at', 'DESC');
-            if (!$isYearMode) {
-                $commentBuilder->where("LOWER(TRIM(semester))", $semesterKey);
-            }
-            $commentRows = $commentBuilder->get()->getResultArray();
+                ->where("LOWER(TRIM(semester))", $semesterKey)
+                ->orderBy('created_at', 'DESC')
+                ->get()
+                ->getResultArray();
             foreach ($commentRows as $row) {
                 $sid = (int)($row['student_id'] ?? 0);
                 $sem = strtolower(trim((string)($row['semester'] ?? '')));
@@ -1838,15 +1925,14 @@ class GradingController extends Controller
         $statusMap = [];
         $noteMap = [];
         if (!empty($studentIds)) {
-            $flagBuilder = $this->db->table('current_flag')
+            $flagRows = $this->db->table('current_flag')
                 ->select('student_id, semester, flag_state, open_description, close_description')
                 ->where('flag', 'grade')
                 ->where('school_year', $schoolYear)
-                ->whereIn('student_id', $studentIds);
-            if (!$isYearMode) {
-                $flagBuilder->where("LOWER(TRIM(semester))", $semesterKey);
-            }
-            $flagRows = $flagBuilder->get()->getResultArray();
+                ->whereIn('student_id', $studentIds)
+                ->where("LOWER(TRIM(semester))", $semesterKey)
+                ->get()
+                ->getResultArray();
             foreach ($flagRows as $row) {
                 $sid = (int)($row['student_id'] ?? 0);
                 if ($sid <= 0) continue;
@@ -1884,6 +1970,7 @@ class GradingController extends Controller
         return $rows;
     }
 
+
     private function fetchBelowSixtyEmailRow(int $studentId, string $schoolYear, string $semester): array
     {
         $semesterKey = strtolower(trim($semester));
@@ -2211,95 +2298,124 @@ class GradingController extends Controller
         return 50000;
     }
 
-
     public function belowSixtyDecisions()
-    {
-        $configuredSemester = (string) $this->semester;
-        $configuredYear     = (string) $this->schoolYear;
+{
+    $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;
+    $semester   = trim((string)($this->request->getGet('semester') ?? ''));
+    $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
 
-        $schoolYears = $this->getSchoolYearsForScores($schoolYear);
-        $rows        = $this->fetchBelowSixtyRows($schoolYear, $semester);
+    if ($semester === '') {
+        $semester = $configuredSemester !== '' ? $configuredSemester : 'Fall';
+    }
 
-        $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
-        )));
+    if ($schoolYear === '') {
+        $schoolYear = $configuredYear;
+    }
 
-        $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;
-            }
-        }
+    $schoolYears = $this->getSchoolYearsForScores($schoolYear);
+    $rows        = $this->fetchBelowSixtyRows($schoolYear, $semester);
 
-        foreach ($rows as &$row) {
-            $sid = (int)($row['student_id'] ?? 0);
-            $row['decision']       = $decisionMap[$sid]['decision'] ?? '';
-            $row['decision_notes'] = $decisionMap[$sid]['notes']    ?? '';
-        }
-        unset($row);
+    $studentIds = array_values(array_unique(array_filter(
+        array_map(static fn($r) => (int)($r['student_id'] ?? 0), $rows),
+        static fn($id) => $id > 0
+    )));
 
-        // Load consolidated decisions from student_decisions for this term
-        $sdModel = new StudentDecisionModel();
-        $sdRows  = $sdModel
+    // ── Load manual below-60 semester decisions ─────────────────────────────
+    //
+    // This table still uses semester, because below-60 decisions are tied to
+    // the selected below-60 screen/term.
+    $decisionModel = new BelowSixtyDecisionModel();
+
+    $decisionMap = [];
+
+    if (!empty($studentIds)) {
+        $dRows = $decisionModel
+            ->whereIn('student_id', $studentIds)
             ->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 ($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 YEAR decisions from student_decisions ─────────────
+    //
+    // IMPORTANT:
+    // student_decisions no longer has semester or semester_score.
+    // It is now one row per student per school_year using year_score.
+    $sdMap = [];
+
+    if (!empty($studentIds)) {
+        $sdRows = $this->db->table('student_decisions')
+            ->whereIn('student_id', $studentIds)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->getResultArray();
+
+        foreach ($sdRows as $sd) {
+            $sid = (int)($sd['student_id'] ?? 0);
+
+            if ($sid > 0) {
+                $sdMap[$sid] = $sd;
             }
         }
-
-        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,
-        ]);
     }
 
+    // ── Load the most recent certificate per student for this school year ───
+    $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['year_score']            = $sdMap[$sid]['year_score'] ?? 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');
@@ -2556,278 +2672,343 @@ class GradingController extends Controller
             ->with('status', 'Decision email sent to parent(s).');
     }
 
-    public function allDecisions()
-    {
-        $configuredYear = (string)$this->schoolYear;
+public function allDecisions()
+{
+    $configuredYear = (string)$this->schoolYear;
 
-        $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
-        if ($schoolYear === '') $schoolYear = $configuredYear;
+    $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
+    if ($schoolYear === '') {
+        $schoolYear = $configuredYear;
+    }
 
-        $schoolYears = $this->getSchoolYearsForScores($schoolYear);
+    $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;
+    // Load saved YEAR decisions for this school year.
+    // New structure:
+    // one row per student per school_year
+    // uses year_score, not semester_score
+    // does not use semester = 'year'
+    $decModel = new StudentDecisionModel();
+
+    $saved = $decModel
+        ->where('school_year', $schoolYear)
+        ->findAll();
+
+    $savedMap = [];
+    foreach ($saved as $s) {
+        $sid = (int)($s['student_id'] ?? 0);
+        if ($sid > 0) {
+            $savedMap[$sid] = $s;
+        }
+    }
+
+    // Fetch Fall and Spring semester scores per student.
+    // These raw semester scores are only used to calculate the final year_score.
+    $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 Fall/Spring scores by student.
+    $studentMap = [];
+
+    foreach ($allScoreRows as $sr) {
+        $sid = (int)($sr['student_id'] ?? 0);
+
+        if ($sid <= 0) {
+            continue;
         }
 
-        // 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]),
+        if (!isset($studentMap[$sid])) {
+            $studentMap[$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,
             ];
         }
 
-        $generated = !empty($saved);
+        $semKey = strtolower(trim((string)($sr['sem_key'] ?? '')));
+        $val    = is_numeric($sr['semester_score']) ? (float)$sr['semester_score'] : null;
 
-        return view('grading/all_decisions', [
-            'rows'        => $rows,
-            'schoolYear'  => $schoolYear,
-            'schoolYears' => $schoolYears,
-            'generated'   => $generated,
-        ]);
+        if ($semKey === 'fall') {
+            $studentMap[$sid]['fall_score'] = $val;
+        } elseif ($semKey === 'spring') {
+            $studentMap[$sid]['spring_score'] = $val;
+        }
     }
 
-    public function generateAllDecisions()
-    {
-        $schoolYear = trim((string)$this->request->getPost('school_year'));
+    // Pull below-60 manual decisions for this school year.
+    // Used only when the calculated year_score is below 60.
+    $belowDecModel = new BelowSixtyDecisionModel();
 
-        if ($schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing school year.');
+    $belowRows = $belowDecModel
+        ->where('school_year', $schoolYear)
+        ->findAll();
+
+    $belowMap = [];
+
+    foreach ($belowRows as $b) {
+        $sid = (int)($b['student_id'] ?? 0);
+
+        if ($sid <= 0) {
+            continue;
         }
 
-        // 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();
+        // Keep the first non-empty decision found for this student.
+        if (!isset($belowMap[$sid]) || trim((string)($belowMap[$sid]['decision'] ?? '')) === '') {
+            $belowMap[$sid] = $b;
+        }
+    }
 
-        if (empty($allScoreRows)) {
-            return redirect()->back()->with('error', 'No semester scores found for this school year.');
+    // Build final display rows.
+    $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 = round((float)$fall, 2);
+        } elseif ($spring !== null) {
+            $yearScore = round((float)$spring, 2);
+        } else {
+            $yearScore = null;
         }
 
-        // 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;
+        if (isset($savedMap[$sid])) {
+            $savedRow = $savedMap[$sid];
+
+            $decision = trim((string)($savedRow['decision'] ?? ''));
+            $source   = trim((string)($savedRow['source'] ?? 'pending'));
+            $notes    = (string)($savedRow['notes'] ?? '');
+
+            if (isset($savedRow['year_score']) && $savedRow['year_score'] !== '' && is_numeric($savedRow['year_score'])) {
+                $yearScore = round((float)$savedRow['year_score'], 2);
             }
+        } elseif ($yearScore !== null && $yearScore >= 60) {
+            $decision = 'Pass';
+            $source   = 'auto';
+            $notes    = '';
+        } elseif ($yearScore !== null && isset($belowMap[$sid])) {
+            $decision = trim((string)($belowMap[$sid]['decision'] ?? ''));
+            $source   = $decision !== '' ? 'manual' : 'pending';
+            $notes    = (string)($belowMap[$sid]['notes'] ?? '');
+        } else {
+            $decision = '';
+            $source   = 'pending';
+            $notes    = '';
         }
 
-        // 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;
-            }
+        $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 Fall/Spring scores by student.
+    $studentMap = [];
+
+    foreach ($allScoreRows as $sr) {
+        $sid = (int)($sr['student_id'] ?? 0);
+
+        if ($sid <= 0) {
+            continue;
         }
 
-        // 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($studentMap[$sid])) {
+            $studentMap[$sid] = [
+                'firstname'          => $sr['firstname'] ?? '',
+                'lastname'           => $sr['lastname'] ?? '',
+                'class_section_name' => $sr['class_section_name'] ?? '',
+                'fall_score'         => null,
+                'spring_score'       => null,
             ];
-
-            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.");
+        $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 manual decisions for this school year.
+    $belowDecModel = new BelowSixtyDecisionModel();
+
+    $belowRows = $belowDecModel
+        ->where('school_year', $schoolYear)
+        ->findAll();
+
+    $belowMap = [];
+
+    foreach ($belowRows as $b) {
+        $sid = (int)($b['student_id'] ?? 0);
+
+        if ($sid <= 0) {
+            continue;
+        }
+
+        if (!isset($belowMap[$sid]) || trim((string)($belowMap[$sid]['decision'] ?? '')) === '') {
+            $belowMap[$sid] = $b;
+        }
+    }
+
+    // Load existing year decisions so we update instead of duplicating.
+    // New structure: one row per student per school_year.
+    $decModel = new StudentDecisionModel();
+
+    $existing = $decModel
+        ->where('school_year', $schoolYear)
+        ->findAll();
+
+    $existingMap = [];
+
+    foreach ($existing as $e) {
+        $sid = (int)($e['student_id'] ?? 0);
+
+        if ($sid > 0) {
+            $existingMap[$sid] = $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 = round((float)$fall, 2);
+        } elseif ($spring !== null) {
+            $yearScore = round((float)$spring, 2);
+        } else {
+            continue;
+        }
+
+        if ($yearScore >= 60) {
+            $decision = 'Pass';
+            $source   = 'auto';
+            $notes    = null;
+        } elseif (isset($belowMap[$sid]) && trim((string)($belowMap[$sid]['decision'] ?? '')) !== '') {
+            $decision = trim((string)$belowMap[$sid]['decision']);
+            $source   = 'manual';
+            $notes    = trim((string)($belowMap[$sid]['notes'] ?? ''));
+            $notes    = $notes !== '' ? $notes : null;
+        } else {
+            $decision = null;
+            $source   = 'pending';
+            $notes    = null;
+        }
+
+        // Important fix:
+        // use year_score, not semester_score.
+        // do not save semester = 'year'.
+        $payload = [
+            'student_id'         => $sid,
+            'school_year'        => $schoolYear,
+            'class_section_name' => $info['class_section_name'] ?? null,
+            'year_score'         => $yearScore,
+            'decision'           => $decision,
+            'source'             => $source,
+            'notes'              => $notes,
+            'generated_by'       => $userId,
+        ];
+
+        if (isset($existingMap[$sid])) {
+            $decModel->update((int)$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

app/Controllers/View/ReportCardsController.php

@@ -1014,9 +1014,9 @@ $drawRankCell = static function (
     $pdf->Rect($x, $y, $w, $h);
     $pdf->SetXY($x + $pad, $y + 3);
     $pdf->SetFont('Helvetica', 'B', 11);
-    $pdf->Write(5, ' Ranking: ');
+    $pdf->Write(5, ' Class Rank: ');
 
-    $labelWidth = $pdf->GetStringWidth(' Ranking: ');
+    $labelWidth = $pdf->GetStringWidth(' Class Rank: ');
     $pdf->SetFont('Helvetica', '', 12);
     $pdf->SetXY($x + 2 + $labelWidth, $y + 3);
     $pdf->Write(5, $rankValue);
@@ -1584,13 +1584,18 @@ $scoresEndY = $pdf->GetY();
             $firstSemesterScore = $secondSemesterScore;
         }
 
+        $rankingScore = $secondSemesterScore;
+        if ($normSemester === 'spring' && is_numeric($firstSemesterScore) && is_numeric($secondSemesterScore)) {
+            $rankingScore = round(((float)$firstSemesterScore + (float)$secondSemesterScore) / 2, 1);
+        }
+
         $termRanking = $this->calculateTermRanking(
             $studentId,
             $sectionCode,
             $sectionId,
             $refYear,
             $refSemester !== '' ? $refSemester : (string)($score['semester'] ?? ''),
-            $secondSemesterScore
+            $rankingScore
         );
 
         // Total semester days from attendance records (max total_attendance within same term)
@@ -1727,110 +1732,200 @@ $scoresEndY = $pdf->GetY();
         ];
     }
 
-    private function calculateTermRanking(
-        int $studentId,
-        int $sectionCode,
-        ?int $sectionId,
-        string $schoolYear,
-        ?string $semester,
-        ?float $studentScore
-    ): ?array {
-        if ($studentId <= 0 || $schoolYear === '' || $studentScore === null) {
-            return null;
+private function calculateTermRanking(
+    int $studentId,
+    int $sectionCode,
+    ?int $sectionId,
+    string $schoolYear,
+    ?string $semester,
+    ?float $studentScore
+): ?array {
+    if ($studentId <= 0 || $schoolYear === '' || $studentScore === null) {
+        return null;
+    }
+
+    $sectionIds = array_values(array_unique(array_filter([
+        $sectionCode > 0 ? $sectionCode : null,
+        $sectionId && $sectionId > 0 ? $sectionId : null,
+    ])));
+
+    if (empty($sectionIds)) {
+        return null;
+    }
+
+    $semesterForRank  = trim((string)$semester);
+    $rankByFinalScore = $this->normalizeSemester($semesterForRank) === 'spring';
+
+    $builder = $this->db->table('semester_scores ss')
+        ->select('ss.student_id, ss.semester, ss.semester_score, ss.updated_at, ss.id, s.firstname, s.lastname')
+        ->join('students s', 's.id = ss.student_id', 'inner')
+        ->where('s.is_active', 1)
+        ->where('ss.school_year', $schoolYear)
+        ->whereIn('ss.class_section_id', $sectionIds)
+        ->orderBy('ss.updated_at', 'DESC')
+        ->orderBy('ss.id', 'DESC');
+
+    if ($semesterForRank !== '') {
+        $this->applySemesterFilter($builder, $semesterForRank, 'ss.semester');
+    }
+
+    $rows = $builder->get()->getResultArray();
+
+    if (empty($rows)) {
+        return null;
+    }
+
+    $scoresByStudent = [];
+
+    foreach ($rows as $row) {
+        $sid = (int)($row['student_id'] ?? 0);
+
+        if ($sid <= 0 || isset($scoresByStudent[$sid])) {
+            continue;
         }
 
-        $sectionIds = array_values(array_unique(array_filter([
-            $sectionCode > 0 ? $sectionCode : null,
-            $sectionId && $sectionId > 0 ? $sectionId : null,
-        ])));
+        $scoreVal = $row['semester_score'] ?? null;
 
-        if (empty($sectionIds)) {
-            return null;
+        if (!is_numeric($scoreVal)) {
+            continue;
         }
 
-        $builder = $this->db->table('semester_scores ss')
-            ->select('ss.student_id, ss.semester_score, ss.updated_at, ss.id, s.firstname, s.lastname')
-            ->join('students s', 's.id = ss.student_id', 'inner')
-            ->where('s.is_active', 1)
+        $rawScore = (float)$scoreVal;
+
+        $scoresByStudent[$sid] = [
+            'student_id' => $sid,
+            'score'      => $rawScore,
+            'rank_score' => round($rawScore, 1),
+            'firstname'  => trim((string)($row['firstname'] ?? '')),
+            'lastname'   => trim((string)($row['lastname'] ?? '')),
+        ];
+    }
+
+    if (empty($scoresByStudent) || !isset($scoresByStudent[$studentId])) {
+        return null;
+    }
+
+    // For Spring, rank by final year average:
+    // (first semester score + second semester score) / 2.
+    if ($rankByFinalScore) {
+        $studentIds = array_keys($scoresByStudent);
+
+        $firstRowsBuilder = $this->db->table('semester_scores ss')
+            ->select('ss.student_id, ss.semester, ss.semester_score, ss.updated_at, ss.id')
             ->where('ss.school_year', $schoolYear)
+            ->whereIn('ss.student_id', $studentIds)
             ->whereIn('ss.class_section_id', $sectionIds)
             ->orderBy('ss.updated_at', 'DESC')
             ->orderBy('ss.id', 'DESC');
 
-        if (trim((string)$semester) !== '') {
-            $this->applySemesterFilter($builder, (string)$semester, 'ss.semester');
+        if ($semesterForRank !== '') {
+            $this->applySemesterExclusion($firstRowsBuilder, $semesterForRank, 'ss.semester');
         }
 
-        $rows = $builder->get()->getResultArray();
-        if (empty($rows)) {
-            return null;
-        }
+        $firstRows = $firstRowsBuilder->get()->getResultArray();
 
-        $scoresByStudent = [];
-        foreach ($rows as $row) {
+        $firstScoresByStudent = [];
+
+        foreach ($firstRows as $row) {
             $sid = (int)($row['student_id'] ?? 0);
-            if ($sid <= 0 || isset($scoresByStudent[$sid])) {
+
+            if ($sid <= 0 || isset($firstScoresByStudent[$sid])) {
                 continue;
             }
 
             $scoreVal = $row['semester_score'] ?? null;
+
             if (!is_numeric($scoreVal)) {
                 continue;
             }
 
-            $scoresByStudent[$sid] = [
-                'student_id' => $sid,
-                'score'      => round((float)$scoreVal, 4),
-                'firstname'  => trim((string)($row['firstname'] ?? '')),
-                'lastname'   => trim((string)($row['lastname'] ?? '')),
-            ];
+            $firstScoresByStudent[$sid] = (float)$scoreVal;
         }
 
+        foreach ($scoresByStudent as $sid => &$rankRow) {
+            if (!isset($firstScoresByStudent[$sid])) {
+                unset($scoresByStudent[$sid]);
+                continue;
+            }
+
+            $avg = ((float)$firstScoresByStudent[$sid] + (float)$rankRow['score']) / 2;
+
+            $rankRow['score']      = $avg;
+            $rankRow['rank_score'] = round($avg, 1);
+        }
+
+        unset($rankRow);
+
         if (empty($scoresByStudent) || !isset($scoresByStudent[$studentId])) {
             return null;
         }
 
-        $rankable = array_values($scoresByStudent);
-        usort($rankable, static function (array $a, array $b): int {
-            $scoreCmp = $b['score'] <=> $a['score'];
-            if ($scoreCmp !== 0) {
-                return $scoreCmp;
-            }
+        // Force the selected student to use the exact score already computed for the report.
+        // Then rank using the displayed precision: one decimal.
+        $scoresByStudent[$studentId]['score']      = (float)$studentScore;
+        $scoresByStudent[$studentId]['rank_score'] = round((float)$studentScore, 1);
+    } else {
+        // Fall: also force selected student to match the report-card computed score.
+        $scoresByStudent[$studentId]['score']      = (float)$studentScore;
+        $scoresByStudent[$studentId]['rank_score'] = round((float)$studentScore, 1);
+    }
 
-            $lastCmp = strcasecmp($a['lastname'], $b['lastname']);
-            if ($lastCmp !== 0) {
-                return $lastCmp;
-            }
+    $rankable = array_values($scoresByStudent);
 
-            $firstCmp = strcasecmp($a['firstname'], $b['firstname']);
-            if ($firstCmp !== 0) {
-                return $firstCmp;
-            }
+    usort($rankable, static function (array $a, array $b): int {
+        // Highest displayed/rank score first.
+        $scoreCmp = $b['rank_score'] <=> $a['rank_score'];
 
-            return $a['student_id'] <=> $b['student_id'];
-        });
-
-        $position = null;
-        $previousScore = null;
-        foreach ($rankable as $index => $row) {
-            if ($previousScore === null || abs($row['score'] - $previousScore) > 0.0001) {
-                $position = $index + 1;
-                $previousScore = $row['score'];
-            }
-
-            if ((int)$row['student_id'] === $studentId) {
-                $total = count($rankable);
-                return [
-                    'position' => $position,
-                    'total'    => $total,
-                    'display'  => $this->formatOrdinal($position) . ' of ' . $total,
-                ];
-            }
+        if ($scoreCmp !== 0) {
+            return $scoreCmp;
         }
 
-        return null;
+        // Tie-breakers only control display order.
+        // They do NOT change rank.
+        $lastCmp = strcasecmp($a['lastname'], $b['lastname']);
+
+        if ($lastCmp !== 0) {
+            return $lastCmp;
+        }
+
+        $firstCmp = strcasecmp($a['firstname'], $b['firstname']);
+
+        if ($firstCmp !== 0) {
+            return $firstCmp;
+        }
+
+        return $a['student_id'] <=> $b['student_id'];
+    });
+
+    $position      = null;
+    $previousScore = null;
+
+    foreach ($rankable as $index => $row) {
+        $currentScore = (float)$row['rank_score'];
+
+        // Competition ranking:
+        // 1, 1, 3, 4...
+        // Same score = same rank.
+        if ($previousScore === null || abs($currentScore - $previousScore) > 0.0001) {
+            $position = $index + 1;
+            $previousScore = $currentScore;
+        }
+
+        if ((int)$row['student_id'] === $studentId) {
+            $total = count($rankable);
+
+            return [
+                'position' => $position,
+                'total'    => $total,
+                'score'    => $currentScore,
+                'display'  => $this->formatOrdinal($position) . ' out of ' . $total,
+            ];
+        }
     }
 
+    return null;
+}
+
     private function formatOrdinal(?int $value): string
     {
         $n = (int)$value;

app/Controllers/View/ScoreCommentController.php

@@ -231,18 +231,36 @@ class ScoreCommentController extends BaseController
             $rawCommentsBuilder->groupEnd();
         }
 
+        if (!$isAllSections && $classSectionId > 0) {
+            // Prefer the exact class-section row over legacy NULL class-section rows.
+            // Without this, duplicate rows can overwrite each other unpredictably.
+            $rawCommentsBuilder
+                ->orderBy("CASE WHEN class_section_id = {$classSectionId} THEN 0 ELSE 1 END", '', false)
+                ->orderBy('id', 'DESC');
+        } else {
+            $rawCommentsBuilder->orderBy('id', 'DESC');
+        }
+
         $rawComments = $rawCommentsBuilder->findAll();
 
         $existingAttendance = [];
         foreach ($rawComments as $c) {
-            $sid = (int)$c['student_id'];
-            $typ = (string)$c['score_type'];
+            $sid = (int) $c['student_id'];
+            $typ = strtolower(trim((string) $c['score_type']));
+
+            // The query is ordered with the best row first. Do not let legacy/older
+            // duplicate rows overwrite the selected comment/review.
+            if (isset($comments[$sid][$typ])) {
+                continue;
+            }
+
             $comments[$sid][$typ] = [
                 'comment'        => $c['comment'] ?? null,
                 'comment_review' => $c['comment_review'] ?? null,
                 'commented_by'   => $c['commented_by'] ?? null,
                 'reviewed_by'    => $c['reviewed_by'] ?? null,
             ];
+
             if ($typ === 'attendance') {
                 $existingAttendance[$sid] = $c;
             }
@@ -435,6 +453,16 @@ class ScoreCommentController extends BaseController
                 $existingQuery->groupEnd();
             }
 
+            if (is_int($classSectionId) && $classSectionId > 0) {
+                // Prefer updating the real class-section row. If only a legacy NULL row
+                // exists, it will be picked next and migrated to the class section below.
+                $existingQuery
+                    ->orderBy("CASE WHEN class_section_id = {$classSectionId} THEN 0 ELSE 1 END", '', false)
+                    ->orderBy('id', 'DESC');
+            } else {
+                $existingQuery->orderBy('id', 'DESC');
+            }
+
             $existing = $existingQuery->first();
 
             $data = [

app/Listeners/DecisionEmailListener.php

@@ -65,7 +65,6 @@ class DecisionEmailListener
             '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,

app/Models/StudentDecisionModel.php

@@ -11,10 +11,9 @@ class StudentDecisionModel extends Model
 
     protected $allowedFields = [
         'student_id',
-        'semester',
         'school_year',
         'class_section_name',
-        'semester_score',
+        'year_score',
         'decision',
         'source',
         'notes',

app/Views/admin/certificates/audit_log.php

@@ -64,9 +64,9 @@
                             <th>Certificate #</th>
                             <th>Student</th>
                             <th>Grade</th>
-                            <th>Cert Date</th>
+                            <!--th>Cert Date</th-->
                             <th>School Year</th>
-                            <th>Issued By</th>
+                            <!--th>Issued By</th-->
                             <th>Issued At</th>
                         </tr>
                     </thead>

app/Views/admin/certificates/index.php

@@ -38,11 +38,14 @@ foreach ($statsPerClass as $csid => $cs) {
     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;
+
+$gradeKeys  = array_keys($gradeGroups);
+$defaultKey = $gradeKeys[0] ?? null;
 
 $decisionBadge = [
     'Pass'                 => 'success',
@@ -54,14 +57,20 @@ $decisionBadge = [
 ];
 ?>
 
-<h2 class="text-center mt-4 mb-3"><i class="bi bi-award me-2"></i>Generate Certificates</h2>
+<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">
+        <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>
@@ -82,167 +91,228 @@ $decisionBadge = [
 <!-- 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
+        $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 $isActive = ($key === $defaultKey); ?>
 
-        <?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;
-        ?>
+        <div class="tab-pane fade <?= $isActive ? 'show active' : '' ?>"
+             id="cert-<?= esc($group['slug']) ?>"
+             role="tabpanel"
+             aria-labelledby="cert-<?= esc($group['slug']) ?>-tab">
 
-        <h4 class="mt-4 mb-2 text-center"><?= esc($cs['name']) ?></h4>
+            <?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;
+                ?>
 
-        <?php if (empty($students)): ?>
-            <p class="text-muted text-center">No active students.</p>
-        <?php else: ?>
+                <h4 class="mt-4 mb-2 text-center"><?= esc($cs['name']) ?></h4>
 
-        <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="<?= (int)$csid ?>">
-            <input type="hidden" name="school_year"      value="<?= esc($schoolYear) ?>">
+                <?php if (empty($students)): ?>
+                    <p class="text-muted text-center">No active students.</p>
+                <?php else: ?>
 
-            <!-- 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>
-                    </span>
-                    <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 cert-date-picker"
-                           value="<?= date('Y-m-d') ?>" title="Certificate date">
-                    <input type="hidden" name="cert_date" class="cert-date-hidden" value="<?= esc($certDate) ?>">
-                </div>
-            </div>
+                    <form method="post"
+                          action="<?= site_url('administrator/certificates/generate') ?>"
+                          id="<?= esc($formId) ?>"
+                          class="cert-form mb-5">
+                        <?= csrf_field() ?>
 
-            <!-- Student table -->
-            <div class="table-responsive">
-                <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;" class="text-center">
-                                <input class="form-check-input cert-select-all" type="checkbox">
-                            </th>
-                            <th>First Name</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 cert-student-check" type="checkbox"
-                                       name="student_ids[]" value="<?= $sid ?>"
-                                       <?= $isPass ? '' : 'disabled' ?>>
-                            </td>
-                            <td><?= esc($s['firstname']) ?></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>
+                        <input type="hidden" name="class_section_id" value="<?= (int)$csid ?>">
+                        <input type="hidden" name="school_year" value="<?= esc($schoolYear) ?>">
+
+                        <!-- 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>
+                                </span>
+                                <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 cert-date-picker"
+                                       value="<?= date('Y-m-d') ?>"
+                                       title="Certificate date">
+                                <input type="hidden"
+                                       name="cert_date"
+                                       class="cert-date-hidden"
+                                       value="<?= esc($certDate) ?>">
+                            </div>
+                        </div>
+
+                        <!-- Student table -->
+                        <div class="table-responsive">
+                            <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;" class="text-center">
+                                            <input class="form-check-input cert-select-all" type="checkbox">
+                                        </th>
+                                        <th>First Name</th>
+                                        <th>Last Name</th>
+                                        <th class="text-center">Year Score</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) => trim((string)($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'));
+
+                                        $yearScore = null;
+
+                                        foreach ($stuDec as $d) {
+                                            if (
+                                                array_key_exists('year_score', $d)
+                                                && $d['year_score'] !== null
+                                                && $d['year_score'] !== ''
+                                            ) {
+                                                $yearScore = $d['year_score'];
+                                                break;
+                                            }
+                                        }
+
+                                        $fmtYearScore = is_numeric($yearScore)
+                                            ? number_format((float)$yearScore, 2)
+                                            : '—';
+                                        ?>
+
+                                        <tr>
+                                            <td class="text-center">
+                                                <input class="form-check-input cert-student-check"
+                                                       type="checkbox"
+                                                       name="student_ids[]"
+                                                       value="<?= $sid ?>"
+                                                       <?= $isPass ? '' : 'disabled' ?>>
+                                            </td>
+
+                                            <td><?= esc($s['firstname']) ?></td>
+                                            <td><?= esc($s['lastname']) ?></td>
+
+                                            <td class="text-center fw-semibold">
+                                                <?= esc($fmtYearScore) ?>
+                                            </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): ?>
+                                                        <?php $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; ?>
-                                <?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>
+                                </tbody>
+                            </table>
+                        </div>
 
-            <!-- 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>
-        </form>
+                        <!-- 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>
+                    </form>
 
-        <?php endif; ?>
-        <?php endforeach; ?>
+                <?php endif; ?>
+            <?php endforeach; ?>
 
-    </div>
+        </div>
     <?php endforeach; ?>
 </div>
 
@@ -253,44 +323,102 @@ $decisionBadge = [
 
 <script>
 (function () {
-    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) ?>;
+    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; }
+            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); }
+
+        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' } });
+        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);
+
+        if (d?.csrf_token && d?.csrf_hash) {
+            updateCsrfInForm(form, d.csrf_token, d.csrf_hash);
+        }
     }
 
-    let pdfWindow = null, activePdfBlobUrl = null;
+    let pdfWindow = null;
+    let activePdfBlobUrl = null;
+
     function openPdfWindow() {
-        if (!pdfWindow || pdfWindow.closed) pdfWindow = window.open('', 'certificatePdfWindow');
+        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>`);
+<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); }
+
+        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>`;
     }
 
@@ -307,62 +435,134 @@ $decisionBadge = [
         if (datePicker && dateHidden) {
             datePicker.addEventListener('change', function () {
                 const d = new Date(this.value + 'T00:00:00');
-                if (!isNaN(d)) dateHidden.value = String(d.getMonth()+1).padStart(2,'0')+'/'+String(d.getDate()).padStart(2,'0')+'/'+d.getFullYear();
+
+                if (!isNaN(d)) {
+                    dateHidden.value =
+                        String(d.getMonth() + 1).padStart(2, '0') + '/' +
+                        String(d.getDate()).padStart(2, '0') + '/' +
+                        d.getFullYear();
+                }
             });
         }
 
         function updateState() {
             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 (selectedCount) {
+                selectedCount.textContent = chosen + ' student' + (chosen !== 1 ? 's' : '') + ' selected';
+            }
+
+            if (generateBtn) {
+                generateBtn.disabled = chosen === 0;
+            }
+
             if (selectAll) {
                 const ec = eligibleChecks.length;
-                selectAll.checked       = ec > 0 && chosen === ec;
+                selectAll.checked = ec > 0 && chosen === ec;
                 selectAll.indeterminate = chosen > 0 && chosen < ec;
             }
         }
+
         if (selectAll) {
             selectAll.addEventListener('change', function () {
-                eligibleChecks.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; }
+
+            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; }
+
+            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);
+
+                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');
+                const 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);
+
+                    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);
+                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;
+
+                if (activePane?.id) {
+                    window.location.hash = activePane.id;
+                }
+
                 window.location.reload();
             } catch (_) {
                 showError(pane, 'Certificate generation failed. Please try again.');
@@ -376,49 +576,68 @@ $decisionBadge = [
 })();
 </script>
 
+<?= $this->endSection() ?>
+
 <?= $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;
+    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; }
+
+.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] }]
+                    columnDefs: [
+                        { orderable: false, targets: [0, 4, 5] }
+                    ]
                 });
             } catch (_) {}
         });
     });
 })();
 </script>
-<?= $this->endSection() ?>
-
-<?= $this->endSection() ?>
+<?= $this->endSection() ?>

app/Views/administrator/trophy_final.php

@@ -14,6 +14,47 @@ $totalConfirmed = array_sum(array_column($classResults, 'confirmed'));
 $totalSurprise  = array_sum(array_column($classResults, 'surprises'));
 $totalMissed    = array_sum(array_column($classResults, 'missed'));
 $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted * 100) : ($totalActual === 0 ? 100 : 0);
+
+// Winner gender breakdown.
+// "Winner" means actual year-end trophy winner.
+$totalWinnerBoys  = 0;
+$totalWinnerGirls = 0;
+$totalWinnerOther = 0;
+
+// Sticker names.
+// 2 columns x 10 rows = 20 stickers per page.
+// Stickers print NAME ONLY.
+$winnerStickerNames = [];
+
+foreach ($classResults as $cls) {
+    foreach (($cls['students'] ?? []) as $s) {
+        if (empty($s['actual'])) {
+            continue;
+        }
+
+        $gender = strtolower(trim((string)($s['gender'] ?? '')));
+
+        if (in_array($gender, ['male', 'm', 'boy', 'boys'], true)) {
+            $totalWinnerBoys++;
+        } elseif (in_array($gender, ['female', 'f', 'girl', 'girls'], true)) {
+            $totalWinnerGirls++;
+        } else {
+            $totalWinnerOther++;
+        }
+
+        $name = trim((string)($s['name'] ?? ''));
+
+        if ($name !== '') {
+            $winnerStickerNames[] = $name;
+        }
+    }
+}
+
+$totalWinners = $totalWinnerBoys + $totalWinnerGirls + $totalWinnerOther;
+
+$winnerBoysPct  = $totalWinners > 0 ? round(($totalWinnerBoys / $totalWinners) * 100, 1) : 0;
+$winnerGirlsPct = $totalWinners > 0 ? round(($totalWinnerGirls / $totalWinners) * 100, 1) : 0;
+$winnerOtherPct = $totalWinners > 0 ? round(($totalWinnerOther / $totalWinners) * 100, 1) : 0;
 ?>
 
 <style>
@@ -23,23 +64,141 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
 .status-none      { color:#adb5bd; }
 
 .print-only { display: none !important; }
+.winner-sticker-print-area { display: none; }
+
+@page {
+    size: Letter portrait;
+    margin: 0.35in;
+}
 
 @media print {
     .no-print    { display: none !important; }
     .print-only  { display: block !important; }
     .screen-only { display: none !important; }
+
     body { font-size: 11px; }
     .container-fluid { padding: 0 !important; }
     h2, h3 { font-size: 13px; margin-bottom: .3rem; }
     .print-page-break { break-before: page; }
+
     table { width: 100%; border-collapse: collapse; font-size: 10px; }
     table th, table td { border: 1px solid #bbb; padding: 3px 5px; }
-    table thead { background: #333 !important; color: #fff !important;
-                  -webkit-print-color-adjust: exact; print-color-adjust: exact; }
-    table thead th { position: static !important; top: auto !important; box-shadow: none !important; }
+    table thead {
+        background: #333 !important;
+        color: #fff !important;
+        -webkit-print-color-adjust: exact;
+        print-color-adjust: exact;
+    }
+    table thead th {
+        position: static !important;
+        top: auto !important;
+        box-shadow: none !important;
+    }
+
     .s-confirmed { color: #198754; font-weight: bold; }
     .s-surprise  { color: #0d6efd; font-weight: bold; }
     .s-missed    { color: #fd7e14; font-weight: bold; }
+
+    body.print-stickers-mode {
+        margin: 0 !important;
+        padding: 0 !important;
+        background: #fff !important;
+    }
+
+    body.print-stickers-mode * {
+        box-shadow: none !important;
+    }
+
+    body.print-stickers-mode header,
+    body.print-stickers-mode nav,
+    body.print-stickers-mode aside,
+    body.print-stickers-mode footer,
+    body.print-stickers-mode .navbar,
+    body.print-stickers-mode .sidebar,
+    body.print-stickers-mode .topbar,
+    body.print-stickers-mode .app-header,
+    body.print-stickers-mode .main-header,
+    body.print-stickers-mode .layout-header,
+    body.print-stickers-mode .management-header,
+    body.print-stickers-mode .page-header,
+    body.print-stickers-mode .breadcrumb,
+    body.print-stickers-mode .brand,
+    body.print-stickers-mode .logo,
+    body.print-stickers-mode .header,
+    body.print-stickers-mode .no-print,
+    body.print-stickers-mode .screen-only,
+    body.print-stickers-mode .print-only {
+        display: none !important;
+    }
+
+    body.print-stickers-mode .container-fluid > *:not(#winnerStickerPrintArea) {
+        display: none !important;
+    }
+
+    body.print-stickers-mode .container-fluid {
+        display: block !important;
+        visibility: visible !important;
+        padding: 0 !important;
+        margin: 0 !important;
+        width: 100% !important;
+        max-width: none !important;
+    }
+
+    body.print-stickers-mode #winnerStickerPrintArea {
+        display: block !important;
+        visibility: visible !important;
+        position: static !important;
+        width: 100% !important;
+        height: auto !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        overflow: visible !important;
+    }
+
+    body.print-stickers-mode #winnerStickerPrintArea,
+    body.print-stickers-mode #winnerStickerPrintArea * {
+        visibility: visible !important;
+    }
+
+    body.print-stickers-mode .sticker-page {
+        display: grid !important;
+        grid-template-columns: repeat(2, 1fr);
+        grid-template-rows: repeat(10, 1fr);
+        gap: 0;
+        width: 100%;
+        height: 10.3in;
+        page-break-after: always;
+        break-after: page;
+    }
+
+    body.print-stickers-mode .sticker-page:last-child {
+        page-break-after: auto;
+        break-after: auto;
+    }
+
+    body.print-stickers-mode .sticker-cell {
+        display: flex !important;
+        justify-content: center;
+        align-items: center;
+        text-align: center;
+        border: none;
+        padding: 0;
+        overflow: hidden;
+        min-height: 0;
+        box-sizing: border-box;
+    }
+
+    body.print-stickers-mode .sticker-name {
+        display: block !important;
+        font-size: 20pt;
+        font-weight: 700;
+        line-height: 1.1;
+        color: #000 !important;
+    }
+
+    body.print-stickers-mode .sticker-empty {
+        visibility: hidden !important;
+    }
 }
 </style>
 
@@ -57,10 +216,16 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                 with the <strong>year-end result</strong> based on the average of Fall &amp; Spring scores.
             </p>
         </div>
-        <div class="d-flex gap-2">
+
+        <div class="d-flex gap-2 flex-wrap">
             <button onclick="printWithCharts()" class="btn btn-outline-secondary btn-sm">
                 <i class="bi bi-printer-fill me-1"></i>Print
             </button>
+
+            <button onclick="printWinnerStickers()" class="btn btn-warning btn-sm">
+                <i class="bi bi-tags-fill me-1"></i>Print Winner Stickers
+            </button>
+
             <a href="<?= site_url('administrator/trophy?' . http_build_query(['school_year' => $selectedYear, 'percentile' => $selectedPercentile])) ?>"
                class="btn btn-outline-secondary btn-sm">
                 <i class="bi bi-arrow-left me-1"></i>Back
@@ -75,18 +240,27 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
             <label class="form-label mb-1 small fw-semibold">School Year</label>
             <select name="school_year" class="form-select form-select-sm" style="min-width:130px;">
                 <?php foreach ($years as $yr): ?>
-                    <option value="<?= esc($yr) ?>" <?= $yr === $selectedYear ? 'selected' : '' ?>><?= esc($yr) ?></option>
+                    <option value="<?= esc($yr) ?>" <?= $yr === $selectedYear ? 'selected' : '' ?>>
+                        <?= esc($yr) ?>
+                    </option>
                 <?php endforeach; ?>
             </select>
         </div>
+
         <div class="col-auto">
             <label class="form-label mb-1 small fw-semibold">Percentile</label>
             <div class="input-group input-group-sm" style="width:110px;">
-                <input type="number" name="percentile" class="form-control"
-                       min="1" max="99" step="1" value="<?= (int)$selectedPercentile ?>">
+                <input type="number"
+                       name="percentile"
+                       class="form-control"
+                       min="1"
+                       max="99"
+                       step="1"
+                       value="<?= (int)$selectedPercentile ?>">
                 <span class="input-group-text">%</span>
             </div>
         </div>
+
         <div class="col-auto">
             <button type="submit" class="btn btn-primary btn-sm">Apply</button>
         </div>
@@ -111,7 +285,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
         <div class="row g-3 mb-4">
             <?php foreach ([
                 [$totalPredicted, 'Predicted (Fall)',  'primary',  null,   $totalStudents > 0 ? round($totalPredicted / $totalStudents * 100) . '% of students' : '—'],
-                [$totalActual,    'Actual (Year)',      'warning',  'dark', $totalStudents > 0 ? round($totalActual    / $totalStudents * 100) . '% of students' : '—'],
+                [$totalActual,    'Actual (Year)',      'warning',  'dark', $totalStudents > 0 ? round($totalActual / $totalStudents * 100) . '% of students' : '—'],
                 [$totalConfirmed, 'Confirmed',          'success',  null,   $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted * 100) . '% of predicted' : '—'],
                 [$totalSurprise,  'Surprises',          'info',     'dark', 'Not in prediction'],
                 [$totalMissed,    'Missed',             'orange',   null,   'Were predicted'],
@@ -147,19 +321,29 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                     <span class="fw-bold fs-6"><?= esc($cls['section_name']) ?></span>
                     <span class="badge bg-primary"><?= $cls['predicted_count'] ?> predicted</span>
                     <span class="badge bg-warning text-dark"><?= $cls['actual_count'] ?> actual</span>
+
                     <?php if ($cls['confirmed'] > 0): ?>
                         <span class="badge bg-success"><?= $cls['confirmed'] ?> confirmed</span>
                     <?php endif; ?>
+
                     <?php if ($cls['surprises'] > 0): ?>
                         <span class="badge bg-info text-dark"><?= $cls['surprises'] ?> surprise<?= $cls['surprises'] > 1 ? 's' : '' ?></span>
                     <?php endif; ?>
+
                     <?php if ($cls['missed'] > 0): ?>
                         <span class="badge" style="background:#fd7e14"><?= $cls['missed'] ?> missed</span>
                     <?php endif; ?>
                 </div>
+
                 <div class="d-flex gap-3 small align-items-center">
-                    <span class="text-muted">Fall &#8805; <strong><?= $cls['fall_threshold'] !== null ? number_format((float)$cls['fall_threshold'], 1) : '—' ?></strong></span>
-                    <span class="text-muted">Year &#8805; <strong><?= $cls['year_threshold'] !== null ? number_format((float)$cls['year_threshold'], 1) : '—' ?></strong></span>
+                    <span class="text-muted">
+                        Fall &#8805;
+                        <strong><?= $cls['fall_threshold'] !== null ? number_format((float)$cls['fall_threshold'], 1) : '—' ?></strong>
+                    </span>
+                    <span class="text-muted">
+                        Year &#8805;
+                        <strong><?= $cls['year_threshold'] !== null ? number_format((float)$cls['year_threshold'], 1) : '—' ?></strong>
+                    </span>
                     <span class="fw-semibold">
                         Accuracy:
                         <span class="<?= $cls['accuracy'] >= 80 ? 'text-success' : ($cls['accuracy'] >= 50 ? 'text-warning' : 'text-danger') ?>">
@@ -168,6 +352,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                     </span>
                 </div>
             </div>
+
             <div class="card-body p-0">
                 <table class="table table-sm table-hover mb-0 align-middle" data-no-mgmt-sticky>
                     <thead class="table-light">
@@ -183,12 +368,16 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                             <th class="text-center">Status</th>
                         </tr>
                     </thead>
+
                     <tbody>
                         <?php $rank = 0; foreach ($cls['students'] as $s):
                             if ($s['status'] === 'none') continue;
                             $rank++;
-                            $isMale = strtolower($s['gender'] ?? '') === 'male';
-                            $rowBg  = match ($s['status']) {
+
+                            $genderNorm = strtolower(trim((string)($s['gender'] ?? '')));
+                            $isMale = in_array($genderNorm, ['male', 'm', 'boy'], true);
+
+                            $rowBg = match ($s['status']) {
                                 'confirmed' => 'table-success',
                                 'surprise'  => 'table-primary',
                                 'missed'    => 'table-warning',
@@ -203,9 +392,9 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                                     <?= $isMale ? 'M' : 'F' ?>
                                 </span>
                             </td>
-                            <td class="text-end small"><?= $s['fall_score']   !== null ? number_format($s['fall_score'],   1) : '<span class="text-muted">—</span>' ?></td>
+                            <td class="text-end small"><?= $s['fall_score'] !== null ? number_format($s['fall_score'], 1) : '<span class="text-muted">—</span>' ?></td>
                             <td class="text-end small"><?= $s['spring_score'] !== null ? number_format($s['spring_score'], 1) : '<span class="text-muted">—</span>' ?></td>
-                            <td class="text-end small fw-semibold"><?= $s['year_score']  !== null ? number_format($s['year_score'],  1) : '<span class="text-muted">—</span>' ?></td>
+                            <td class="text-end small fw-semibold"><?= $s['year_score'] !== null ? number_format($s['year_score'], 1) : '<span class="text-muted">—</span>' ?></td>
                             <td class="text-center small">
                                 <?= $s['predicted']
                                     ? '<span class="badge bg-primary">Yes</span>'
@@ -237,6 +426,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
             <div class="card-header bg-dark text-white fw-semibold py-2">
                 <i class="bi bi-bar-chart-fill me-2"></i>Prediction Accuracy Summary — <?= esc($selectedYear) ?>
             </div>
+
             <div class="card-body p-0">
                 <table class="table table-sm table-bordered mb-0 align-middle" data-no-mgmt-sticky>
                     <thead class="table-dark">
@@ -253,6 +443,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                             <th class="text-end pe-2">Year ≥</th>
                         </tr>
                     </thead>
+
                     <tbody>
                         <?php foreach ($classResults as $cls): ?>
                         <tr>
@@ -271,6 +462,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                         </tr>
                         <?php endforeach; ?>
                     </tbody>
+
                     <tfoot class="table-secondary fw-semibold">
                         <tr>
                             <td class="ps-2">Total</td>
@@ -292,7 +484,6 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
 
         <!-- Charts -->
         <div class="row g-4 mt-1 mb-4">
-            <!-- Grouped bar: predicted / actual / confirmed / surprises / missed per class -->
             <div class="col-12 col-lg-8">
                 <div class="border rounded p-3 h-100">
                     <div class="small fw-semibold text-muted mb-2">
@@ -301,7 +492,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                     <canvas id="chart-counts" style="max-height:280px;"></canvas>
                 </div>
             </div>
-            <!-- Bar: accuracy % per class + doughnut overall breakdown -->
+
             <div class="col-12 col-lg-4">
                 <div class="row g-3 h-100">
                     <div class="col-12">
@@ -312,6 +503,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                             <canvas id="chart-accuracy" style="max-height:130px;"></canvas>
                         </div>
                     </div>
+
                     <div class="col-12">
                         <div class="border rounded p-3">
                             <div class="small fw-semibold text-muted mb-2">
@@ -324,6 +516,93 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
             </div>
         </div>
 
+        <!-- Winner gender summary -->
+        <div class="card shadow-sm mt-2 mb-4">
+            <div class="card-header bg-dark text-white fw-semibold py-2">
+                <i class="bi bi-gender-ambiguous me-2"></i>Winner Gender Breakdown
+            </div>
+
+            <div class="card-body">
+                <div class="row g-3 align-items-stretch">
+                    <div class="col-12 col-lg-3">
+                        <div class="border rounded p-3 text-center h-100">
+                            <div class="text-muted small mb-1">Total Winners</div>
+                            <div class="display-6 fw-bold"><?= (int)$totalWinners ?></div>
+                            <div class="small text-muted">Actual year-end trophy winners</div>
+                        </div>
+                    </div>
+
+                    <div class="col-6 col-lg-3">
+                        <div class="border rounded p-3 text-center h-100">
+                            <div class="text-muted small mb-1">Boys</div>
+                            <div class="display-6 fw-bold text-primary"><?= (int)$totalWinnerBoys ?></div>
+                            <div class="fw-semibold"><?= number_format($winnerBoysPct, 1) ?>%</div>
+                        </div>
+                    </div>
+
+                    <div class="col-6 col-lg-3">
+                        <div class="border rounded p-3 text-center h-100">
+                            <div class="text-muted small mb-1">Girls</div>
+                            <div class="display-6 fw-bold" style="color:#E47AB0;"><?= (int)$totalWinnerGirls ?></div>
+                            <div class="fw-semibold"><?= number_format($winnerGirlsPct, 1) ?>%</div>
+                        </div>
+                    </div>
+
+                    <div class="col-12 col-lg-3">
+                        <div class="border rounded p-3 text-center h-100">
+                            <div class="text-muted small mb-1">Unknown / Other</div>
+                            <div class="display-6 fw-bold text-secondary"><?= (int)$totalWinnerOther ?></div>
+                            <div class="fw-semibold"><?= number_format($winnerOtherPct, 1) ?>%</div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="mt-3">
+                    <div class="progress" style="height:26px;">
+                        <?php if ($totalWinners > 0): ?>
+                            <div class="progress-bar bg-primary"
+                                 role="progressbar"
+                                 style="width: <?= $winnerBoysPct ?>%;"
+                                 aria-valuenow="<?= $winnerBoysPct ?>"
+                                 aria-valuemin="0"
+                                 aria-valuemax="100">
+                                Boys <?= number_format($winnerBoysPct, 1) ?>%
+                            </div>
+
+                            <div class="progress-bar"
+                                 role="progressbar"
+                                 style="width: <?= $winnerGirlsPct ?>%; background:#E47AB0;"
+                                 aria-valuenow="<?= $winnerGirlsPct ?>"
+                                 aria-valuemin="0"
+                                 aria-valuemax="100">
+                                Girls <?= number_format($winnerGirlsPct, 1) ?>%
+                            </div>
+
+                            <?php if ($totalWinnerOther > 0): ?>
+                                <div class="progress-bar bg-secondary"
+                                     role="progressbar"
+                                     style="width: <?= $winnerOtherPct ?>%;"
+                                     aria-valuenow="<?= $winnerOtherPct ?>"
+                                     aria-valuemin="0"
+                                     aria-valuemax="100">
+                                    Other <?= number_format($winnerOtherPct, 1) ?>%
+                                </div>
+                            <?php endif; ?>
+                        <?php else: ?>
+                            <div class="progress-bar bg-secondary"
+                                 role="progressbar"
+                                 style="width: 100%;"
+                                 aria-valuenow="0"
+                                 aria-valuemin="0"
+                                 aria-valuemax="100">
+                                No winners
+                            </div>
+                        <?php endif; ?>
+                    </div>
+                </div>
+            </div>
+        </div>
+
     </div><!-- /screen-only -->
 
     <!-- ══ PRINT VIEW ════════════════════════════════════════════════════════ -->
@@ -340,7 +619,6 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
             </p>
         </div>
 
-        <!-- All students flat table -->
         <h3 style="margin-bottom:4px;">Student Detail</h3>
         <table data-no-mgmt-sticky>
             <thead>
@@ -357,6 +635,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                     <th style="text-align:center;">Status</th>
                 </tr>
             </thead>
+
             <tbody>
                 <?php
                 $rank = 0;
@@ -364,7 +643,8 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                     foreach ($cls['students'] as $s):
                         if (!in_array($s['status'], ['confirmed', 'surprise'], true)) continue;
                         $rank++;
-                        $isMale = strtolower($s['gender'] ?? '') === 'male';
+                        $genderNorm = strtolower(trim((string)($s['gender'] ?? '')));
+                        $isMale = in_array($genderNorm, ['male', 'm', 'boy'], true);
                         $statusLabel = match ($s['status']) {
                             'confirmed' => '✓ Confirmed',
                             'surprise'  => '↑ Surprise',
@@ -378,18 +658,17 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                     <td><?= esc($cls['section_name']) ?></td>
                     <td><strong><?= esc($s['name']) ?></strong></td>
                     <td style="text-align:center;"><?= $isMale ? 'M' : 'F' ?></td>
-                    <td style="text-align:right;"><?= $s['fall_score']   !== null ? number_format($s['fall_score'],   1) : '—' ?></td>
+                    <td style="text-align:right;"><?= $s['fall_score'] !== null ? number_format($s['fall_score'], 1) : '—' ?></td>
                     <td style="text-align:right;"><?= $s['spring_score'] !== null ? number_format($s['spring_score'], 1) : '—' ?></td>
-                    <td style="text-align:right;font-weight:bold;"><?= $s['year_score']  !== null ? number_format($s['year_score'],  1) : '—' ?></td>
+                    <td style="text-align:right;font-weight:bold;"><?= $s['year_score'] !== null ? number_format($s['year_score'], 1) : '—' ?></td>
                     <td style="text-align:center;"><?= $s['predicted'] ? 'Yes' : 'No' ?></td>
-                    <td style="text-align:center;"><?= $s['actual']    ? 'Yes' : 'No' ?></td>
+                    <td style="text-align:center;"><?= $s['actual'] ? 'Yes' : 'No' ?></td>
                     <td style="text-align:center;" class="<?= $statusClass ?>"><?= $statusLabel ?></td>
                 </tr>
                 <?php endforeach; endforeach; ?>
             </tbody>
         </table>
 
-        <!-- Accuracy summary (new page) -->
         <div class="print-page-break"></div>
         <h3 style="margin-bottom:4px;">Prediction Accuracy Summary</h3>
         <table data-no-mgmt-sticky style="margin-bottom:14px;">
@@ -407,6 +686,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                     <th style="text-align:right;">Year ≥</th>
                 </tr>
             </thead>
+
             <tbody>
                 <?php foreach ($classResults as $cls): ?>
                 <tr>
@@ -423,6 +703,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
                 </tr>
                 <?php endforeach; ?>
             </tbody>
+
             <tfoot>
                 <tr>
                     <td style="font-weight:bold;">Total</td>
@@ -438,17 +719,18 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
             </tfoot>
         </table>
 
-        <!-- Charts as images (populated by JS before printing) -->
         <div class="print-page-break"></div>
         <h3 style="margin-bottom:6px;">Charts</h3>
+
         <div style="margin-bottom:14px;">
             <p style="font-size:10px;font-weight:bold;margin:0 0 4px;">Trophy Counts per Class</p>
-            <img id="print-chart-counts"   style="width:100%;max-height:220px;object-fit:contain;" src="" alt="">
+            <img id="print-chart-counts" style="width:100%;max-height:220px;object-fit:contain;" src="" alt="">
         </div>
+
         <div style="display:flex;gap:16px;margin-bottom:14px;">
             <div style="flex:1;">
                 <p style="font-size:10px;font-weight:bold;margin:0 0 4px;">Prediction Accuracy per Class</p>
-                <img id="print-chart-accuracy"  style="width:100%;max-height:160px;object-fit:contain;" src="" alt="">
+                <img id="print-chart-accuracy" style="width:100%;max-height:160px;object-fit:contain;" src="" alt="">
             </div>
             <div style="flex:1;">
                 <p style="font-size:10px;font-weight:bold;margin:0 0 4px;">Overall Outcome Breakdown</p>
@@ -456,8 +738,69 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
             </div>
         </div>
 
+        <div style="margin-top:10px;border:1px solid #bbb;padding:8px;">
+            <p style="font-size:11px;font-weight:bold;margin:0 0 6px;">Winner Gender Breakdown</p>
+
+            <table data-no-mgmt-sticky>
+                <thead>
+                    <tr>
+                        <th>Group</th>
+                        <th style="text-align:center;">Winners</th>
+                        <th style="text-align:center;">Percentage</th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                    <tr>
+                        <td>Boys</td>
+                        <td style="text-align:center;"><?= (int)$totalWinnerBoys ?></td>
+                        <td style="text-align:center;"><?= number_format($winnerBoysPct, 1) ?>%</td>
+                    </tr>
+                    <tr>
+                        <td>Girls</td>
+                        <td style="text-align:center;"><?= (int)$totalWinnerGirls ?></td>
+                        <td style="text-align:center;"><?= number_format($winnerGirlsPct, 1) ?>%</td>
+                    </tr>
+                    <?php if ($totalWinnerOther > 0): ?>
+                    <tr>
+                        <td>Unknown / Other</td>
+                        <td style="text-align:center;"><?= (int)$totalWinnerOther ?></td>
+                        <td style="text-align:center;"><?= number_format($winnerOtherPct, 1) ?>%</td>
+                    </tr>
+                    <?php endif; ?>
+                </tbody>
+
+                <tfoot>
+                    <tr>
+                        <td style="font-weight:bold;">Total Winners</td>
+                        <td style="text-align:center;font-weight:bold;"><?= (int)$totalWinners ?></td>
+                        <td style="text-align:center;font-weight:bold;"><?= $totalWinners > 0 ? '100.0%' : '0.0%' ?></td>
+                    </tr>
+                </tfoot>
+            </table>
+        </div>
+
     </div><!-- /print-only -->
 
+    <!-- Winner sticker print area: names only, no header, no score, no class -->
+    <div id="winnerStickerPrintArea" class="winner-sticker-print-area">
+        <?php if (!empty($winnerStickerNames)): ?>
+            <?php foreach (array_chunk($winnerStickerNames, 20) as $chunk): ?>
+                <div class="sticker-page">
+                    <?php foreach ($chunk as $winnerName): ?>
+                        <div class="sticker-cell">
+                            <div class="sticker-name"><?= esc($winnerName) ?></div>
+                        </div>
+                    <?php endforeach; ?>
+
+                    <?php for ($i = 0, $remaining = 20 - count($chunk); $i < $remaining; $i++): ?>
+                        <div class="sticker-cell sticker-empty"></div>
+                    <?php endfor; ?>
+                </div>
+            <?php endforeach; ?>
+        <?php endif; ?>
+    </div>
+
     <?php endif; ?>
 </div>
 
@@ -473,6 +816,7 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
     $cSurprise  = [];
     $cMissed    = [];
     $cAccuracy  = [];
+
     foreach ($classResults as $cls) {
         $cLabels[]    = $cls['section_name'];
         $cPredicted[] = $cls['predicted_count'];
@@ -483,94 +827,105 @@ $overallAccuracy = $totalPredicted > 0 ? round($totalConfirmed / $totalPredicted
         $cAccuracy[]  = $cls['accuracy'];
     }
     ?>
-    var labels    = <?= json_encode($cLabels)    ?>;
+
+    var labels    = <?= json_encode($cLabels) ?>;
     var predicted = <?= json_encode($cPredicted) ?>;
-    var actual    = <?= json_encode($cActual)    ?>;
+    var actual    = <?= json_encode($cActual) ?>;
     var confirmed = <?= json_encode($cConfirmed) ?>;
-    var surprises = <?= json_encode($cSurprise)  ?>;
-    var missed    = <?= json_encode($cMissed)    ?>;
-    var accuracy  = <?= json_encode($cAccuracy)  ?>;
+    var surprises = <?= json_encode($cSurprise) ?>;
+    var missed    = <?= json_encode($cMissed) ?>;
+    var accuracy  = <?= json_encode($cAccuracy) ?>;
 
-    /* ── Chart 1: grouped bar – counts per class ── */
-    new Chart(document.getElementById('chart-counts'), {
-        type: 'bar',
-        data: {
-            labels: labels,
-            datasets: [
-                { label: 'Predicted', data: predicted, backgroundColor: '#4A90E2', borderRadius: 3 },
-                { label: 'Actual',    data: actual,    backgroundColor: '#f0a500', borderRadius: 3 },
-                { label: 'Confirmed', data: confirmed, backgroundColor: '#28a745', borderRadius: 3 },
-                { label: 'Surprises', data: surprises, backgroundColor: '#17a2b8', borderRadius: 3 },
-                { label: 'Missed',    data: missed,    backgroundColor: '#fd7e14', borderRadius: 3 },
-            ]
-        },
-        options: {
-            responsive: true,
-            maintainAspectRatio: true,
-            plugins: { legend: { position: 'bottom' } },
-            scales: {
-                x: { grid: { color: '#f0f0f0' } },
-                y: { beginAtZero: true, ticks: { stepSize: 1 }, grid: { color: '#f0f0f0' } }
-            }
-        }
-    });
-
-    /* ── Chart 2: accuracy % per class ── */
-    new Chart(document.getElementById('chart-accuracy'), {
-        type: 'bar',
-        data: {
-            labels: labels,
-            datasets: [{
-                label: 'Accuracy %',
-                data: accuracy,
-                backgroundColor: accuracy.map(function(a) {
-                    return a >= 80 ? '#28a745' : a >= 50 ? '#f0a500' : '#dc3545';
-                }),
-                borderRadius: 3
-            }]
-        },
-        options: {
-            responsive: true,
-            maintainAspectRatio: true,
-            plugins: { legend: { display: false } },
-            scales: {
-                y: {
-                    beginAtZero: true, max: 100,
-                    ticks: { callback: function(v) { return v + '%'; } },
-                    grid: { color: '#f0f0f0' }
+    if (document.getElementById('chart-counts')) {
+        new Chart(document.getElementById('chart-counts'), {
+            type: 'bar',
+            data: {
+                labels: labels,
+                datasets: [
+                    { label: 'Predicted', data: predicted, backgroundColor: '#4A90E2', borderRadius: 3 },
+                    { label: 'Actual',    data: actual,    backgroundColor: '#f0a500', borderRadius: 3 },
+                    { label: 'Confirmed', data: confirmed, backgroundColor: '#28a745', borderRadius: 3 },
+                    { label: 'Surprises', data: surprises, backgroundColor: '#17a2b8', borderRadius: 3 },
+                    { label: 'Missed',    data: missed,    backgroundColor: '#fd7e14', borderRadius: 3 },
+                ]
+            },
+            options: {
+                responsive: true,
+                maintainAspectRatio: true,
+                plugins: { legend: { position: 'bottom' } },
+                scales: {
+                    x: { grid: { color: '#f0f0f0' } },
+                    y: { beginAtZero: true, ticks: { stepSize: 1 }, grid: { color: '#f0f0f0' } }
                 }
             }
-        }
-    });
+        });
+    }
 
-    /* ── Chart 3: doughnut overall outcome breakdown ── */
-    new Chart(document.getElementById('chart-breakdown'), {
-        type: 'doughnut',
-        data: {
-            labels: ['Confirmed', 'Surprises', 'Missed'],
-            datasets: [{
-                data: [<?= $totalConfirmed ?>, <?= $totalSurprise ?>, <?= $totalMissed ?>],
-                backgroundColor: ['#28a745', '#17a2b8', '#fd7e14'],
-                borderWidth: 2
-            }]
-        },
-        options: {
-            responsive: true,
-            maintainAspectRatio: true,
-            plugins: {
-                legend: { position: 'bottom' },
-                tooltip: {
-                    callbacks: {
-                        label: function(ctx) {
-                            var total = ctx.dataset.data.reduce(function(a, b) { return a + b; }, 0);
-                            var pct   = total > 0 ? Math.round(ctx.parsed / total * 100) : 0;
-                            return ctx.label + ': ' + ctx.parsed + ' (' + pct + '%)';
+    if (document.getElementById('chart-accuracy')) {
+        new Chart(document.getElementById('chart-accuracy'), {
+            type: 'bar',
+            data: {
+                labels: labels,
+                datasets: [{
+                    label: 'Accuracy %',
+                    data: accuracy,
+                    backgroundColor: accuracy.map(function(a) {
+                        return a >= 80 ? '#28a745' : a >= 50 ? '#f0a500' : '#dc3545';
+                    }),
+                    borderRadius: 3
+                }]
+            },
+            options: {
+                responsive: true,
+                maintainAspectRatio: true,
+                plugins: { legend: { display: false } },
+                scales: {
+                    y: {
+                        beginAtZero: true,
+                        max: 100,
+                        ticks: {
+                            callback: function(v) {
+                                return v + '%';
+                            }
+                        },
+                        grid: { color: '#f0f0f0' }
+                    }
+                }
+            }
+        });
+    }
+
+    if (document.getElementById('chart-breakdown')) {
+        new Chart(document.getElementById('chart-breakdown'), {
+            type: 'doughnut',
+            data: {
+                labels: ['Confirmed', 'Surprises', 'Missed'],
+                datasets: [{
+                    data: [<?= $totalConfirmed ?>, <?= $totalSurprise ?>, <?= $totalMissed ?>],
+                    backgroundColor: ['#28a745', '#17a2b8', '#fd7e14'],
+                    borderWidth: 2
+                }]
+            },
+            options: {
+                responsive: true,
+                maintainAspectRatio: true,
+                plugins: {
+                    legend: { position: 'bottom' },
+                    tooltip: {
+                        callbacks: {
+                            label: function(ctx) {
+                                var total = ctx.dataset.data.reduce(function(a, b) {
+                                    return a + b;
+                                }, 0);
+                                var pct = total > 0 ? Math.round(ctx.parsed / total * 100) : 0;
+                                return ctx.label + ': ' + ctx.parsed + ' (' + pct + '%)';
+                            }
                         }
                     }
                 }
             }
-        }
-    });
+        });
+    }
 })();
 
 function captureCharts() {
@@ -579,20 +934,41 @@ function captureCharts() {
         'chart-accuracy':  'print-chart-accuracy',
         'chart-breakdown': 'print-chart-breakdown',
     };
+
     Object.keys(map).forEach(function(canvasId) {
         var canvas = document.getElementById(canvasId);
         var img    = document.getElementById(map[canvasId]);
-        if (canvas && img) img.src = canvas.toDataURL('image/png');
+
+        if (canvas && img) {
+            img.src = canvas.toDataURL('image/png');
+        }
     });
 }
 
 function printWithCharts() {
+    document.body.classList.remove('print-stickers-mode');
     captureCharts();
     window.print();
 }
 
-window.addEventListener('beforeprint', captureCharts);
+function printWinnerStickers() {
+    document.body.classList.add('print-stickers-mode');
+
+    setTimeout(function () {
+        window.print();
+
+        setTimeout(function () {
+            document.body.classList.remove('print-stickers-mode');
+        }, 1000);
+    }, 250);
+}
+
+window.addEventListener('beforeprint', function () {
+    if (!document.body.classList.contains('print-stickers-mode')) {
+        captureCharts();
+    }
+});
 </script>
 <?= $this->endSection() ?>
 
-<?= $this->endSection() ?>
+<?= $this->endSection() ?>

app/Views/certificates/verify.php

@@ -51,19 +51,7 @@
                 <div class="col-6">
                     <div class="field-label">School Year</div>
                     <div class="field-value"><?= esc($record['school_year'] ?? '—') ?></div>
-                </div>
-                <div class="col-6">
-                    <div class="field-label">Certificate Date</div>
-                    <div class="field-value">
-                        <?= $record['cert_date'] ? esc(date('F j, Y', strtotime($record['cert_date']))) : '—' ?>
-                    </div>
-                </div>
-                <div class="col-6">
-                    <div class="field-label">Issued By</div>
-                    <div class="field-value">
-                        <?= esc(trim(($record['admin_firstname'] ?? '') . ' ' . ($record['admin_lastname'] ?? '')) ?: '—') ?>
-                    </div>
-                </div>
+                </div>               
                 <div class="col-12">
                     <div class="field-label">Issued On</div>
                     <div class="field-value">

app/Views/grading/below_sixty.php

@@ -9,15 +9,20 @@
 
         <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
             <div class="text-muted">
-                <?= !empty($isYearMode) ? 'Whole Year' : esc(ucfirst($semester ?? '')) ?> • <?= esc($schoolYear ?? '') ?>
+                <?= !empty($isYearMode) ? 'Whole Year' : 'Fall' ?> • <?= 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 if (!empty($isYearMode)): ?>
+                    <a class="btn btn-outline-primary btn-sm"
+                       href="<?= site_url('grading/below-60/decisions?' . http_build_query([
+                           'semester'    => 'year',
+                           '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
@@ -31,11 +36,17 @@
             if ($value === null || $value === '') {
                 return '—';
             }
+
             if (is_numeric($value)) {
                 return esc(number_format((float)$value, 2, '.', ''));
             }
+
             return esc($value);
         };
+
+        // Fall mode uses Fall.
+        // Whole Year mode uses year.
+        $actionSemester = !empty($isYearMode) ? 'year' : 'fall';
         ?>
 
         <?php if (empty($rows)): ?>
@@ -44,33 +55,28 @@
             </div>
         <?php else: ?>
             <div class="table-responsive below-sixty-table">
-                <table class="table table-bordered table-striped align-middle w-100 no-mgmt-sticky below-sixty-dt" data-no-mgmt-sticky data-no-dt-fixedheader>
+                <table class="table table-bordered table-striped align-middle w-100 no-mgmt-sticky below-sixty-dt"
+                       data-no-mgmt-sticky
+                       data-no-dt-fixedheader>
                     <thead class="table-light">
                         <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>
-                            <th>Test Avg</th>
-                            <th>PTAP Score</th>
-                            <th>Attendance</th>
-                            <th>Midterm Score</th>
-                            <th><?= !empty($isYearMode) ? 'Semester Score' : (strcasecmp($semester ?? '', 'fall') === 0 ? '1st Semester Score' : 'Semester Score') ?></th>
-                            <?php if (empty($isYearMode)): ?>
+                            <th class="text-center">Score</th>
                             <th>Status</th>
                             <th>Email Parent</th>
                             <th>Schedule Meeting</th>
-                            <?php endif; ?>
                         </tr>
                     </thead>
+
                     <tbody>
                         <?php foreach ($rows as $row): ?>
                             <?php
                             $scoreRaw = $row['semester_score'] ?? null;
                             $scoreVal = is_numeric($scoreRaw) ? (float)$scoreRaw : null;
+
                             $scoreClass = '';
+
                             if ($scoreVal !== null) {
                                 if ($scoreVal < 50) {
                                     $scoreClass = 'grade-red';
@@ -78,60 +84,96 @@
                                     $scoreClass = 'grade-orange';
                                 }
                             }
-                            $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+
+                            $studentName  = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
+                            $studentLabel = $studentName !== '' ? $studentName : 'N/A';
+                            $isClosed     = ($row['status'] ?? 'Open') === 'Closed';
                             ?>
-                            <?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($studentLabel) ?></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>
-                                <td class="text-center"><?= $displayScore($row['test_avg'] ?? null) ?></td>
-                                <td class="text-center"><?= $displayScore($row['ptap_score'] ?? null) ?></td>
-                                <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">
+                                    <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($studentLabel) ?>"
+                                            data-school-year="<?= esc((string)($schoolYear ?? '')) ?>">
+                                        Details
+                                    </button>
+                                </td>
+
+                                <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() ?>
-                                        <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 ?? '')) ?>">
-                                        <select name="status" class="form-select form-select-sm" style="width: 110px;">
-                                            <option value="Open" <?= ($row['status'] ?? 'Open') === 'Open' ? 'selected' : '' ?>>Open</option>
-                                            <option value="Closed" <?= ($row['status'] ?? '') === 'Closed' ? 'selected' : '' ?>>Closed</option>
+
+                                        <input type="hidden"
+                                               name="student_id"
+                                               value="<?= esc((string)($row['student_id'] ?? '')) ?>">
+
+                                        <input type="hidden"
+                                               name="semester"
+                                               value="<?= esc($actionSemester) ?>">
+
+                                        <input type="hidden"
+                                               name="school_year"
+                                               value="<?= esc((string)($schoolYear ?? '')) ?>">
+
+                                        <select name="status"
+                                                class="form-select form-select-sm"
+                                                style="width: 110px;">
+                                            <option value="Open" <?= ($row['status'] ?? 'Open') === 'Open' ? 'selected' : '' ?>>
+                                                Open
+                                            </option>
+                                            <option value="Closed" <?= ($row['status'] ?? '') === 'Closed' ? 'selected' : '' ?>>
+                                                Closed
+                                            </option>
                                         </select>
-                                        <input type="text" name="note" class="form-control form-control-sm" style="width: 140px;" placeholder="Note (optional)" value="<?= esc((string)($row['note'] ?? '')) ?>">
-                                        <button type="submit" class="btn btn-sm btn-outline-secondary">Update</button>
+
+                                        <input type="text"
+                                               name="note"
+                                               class="form-control form-control-sm"
+                                               style="width: 140px;"
+                                               placeholder="Note (optional)"
+                                               value="<?= esc((string)($row['note'] ?? '')) ?>">
+
+                                        <button type="submit" class="btn btn-sm btn-outline-secondary">
+                                            Update
+                                        </button>
                                     </form>
                                 </td>
+
                                 <td class="text-center">
                                     <?php if ($isClosed): ?>
-                                        <button type="button" class="btn btn-sm btn-secondary" disabled>Send Email</button>
+                                        <button type="button" class="btn btn-sm btn-secondary" disabled>
+                                            Send Email
+                                        </button>
                                     <?php else: ?>
                                         <a class="btn btn-sm btn-outline-primary"
-                                           href="<?= site_url('grading/below-60/email/edit?student_id=' . (int)($row['student_id'] ?? 0) . '&semester=' . rawurlencode((string)($semester ?? '')) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
+                                           href="<?= site_url('grading/below-60/email/edit?student_id=' . (int)($row['student_id'] ?? 0) . '&semester=' . rawurlencode($actionSemester) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
                                             Send Email
                                         </a>
                                     <?php endif; ?>
                                 </td>
+
                                 <td class="text-center">
                                     <?php if ($isClosed): ?>
-                                        <button class="btn btn-sm btn-secondary" disabled>Schedule</button>
+                                        <button class="btn btn-sm btn-secondary" disabled>
+                                            Schedule
+                                        </button>
                                     <?php else: ?>
                                         <a class="btn btn-sm btn-outline-secondary"
-                                           href="<?= site_url('grading/below-60/schedule?student_id=' . (int)($row['student_id'] ?? 0) . '&semester=' . rawurlencode((string)($semester ?? '')) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
+                                           href="<?= site_url('grading/below-60/schedule?student_id=' . (int)($row['student_id'] ?? 0) . '&semester=' . rawurlencode($actionSemester) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
                                             Schedule
                                         </a>
                                     <?php endif; ?>
                                 </td>
-                                <?php endif; ?>
                             </tr>
                         <?php endforeach; ?>
                     </tbody>
@@ -141,31 +183,266 @@
     </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>
+
 <?= $this->endSection() ?>
 
 <?= $this->section('scripts') ?>
 <style>
-    .grade-orange td { background: #fff3cd !important; color: #8a5d00; font-weight: 600; }
-    .grade-red td { background: #f8d7da !important; color: #842029; font-weight: 600; }
-    .below-sixty-wrapper { padding-top: 0.75rem; }
-    .below-sixty-title { position: relative; z-index: 1; margin-bottom: 1.25rem; }
-    .below-sixty-table { margin-top: 0.75rem; }
+    .grade-orange td {
+        background: #fff3cd !important;
+        color: #8a5d00;
+        font-weight: 600;
+    }
+
+    .grade-red td {
+        background: #f8d7da !important;
+        color: #842029;
+        font-weight: 600;
+    }
+
+    .below-sixty-wrapper {
+        padding-top: 0.75rem;
+    }
+
+    .below-sixty-title {
+        position: relative;
+        z-index: 1;
+        margin-bottom: 1.25rem;
+    }
+
+    .below-sixty-table {
+        margin-top: 0.75rem;
+    }
+
+    .below-sixty-dt td {
+        vertical-align: top;
+    }
 </style>
+
 <script>
-    (function() {
-        if (!window.$ || !$.fn || !$.fn.DataTable) return;
-        $(function() {
+(function () {
+    function normalizeSemesterFilter() {
+        const semesterSelect = document.querySelector('select[name="semester"]');
+
+        if (!semesterSelect) return;
+
+        const wholeYearSelected = <?= !empty($isYearMode) ? 'true' : 'false' ?>;
+
+        semesterSelect.innerHTML = '';
+        semesterSelect.add(new Option('Fall', 'fall', !wholeYearSelected, !wholeYearSelected));
+        semesterSelect.add(new Option('Whole Year', 'year', wholeYearSelected, wholeYearSelected));
+        semesterSelect.value = wholeYearSelected ? 'year' : 'fall';
+    }
+
+    document.addEventListener('DOMContentLoaded', normalizeSemesterFilter);
+
+    if (window.$ && $.fn && $.fn.DataTable) {
+        $(function () {
             const table = $('.below-sixty-dt');
+
             if (!table.length) return;
+
             try {
-                const semesterOffset = <?= !empty($isYearMode) ? '1' : '0' ?>;
                 table.DataTable({
-                    order: [[8 + semesterOffset, 'asc']],
+                    order: [[2, 'asc']],
                     pageLength: 100,
-                    lengthMenu: [10, 25, 50, 100, 200]
+                    lengthMenu: [10, 25, 50, 100, 200],
+                    columnDefs: [
+                        { orderable: false, targets: [3, 4, 5] }
+                    ]
                 });
             } catch (_) {}
         });
-    })();
+    }
+
+    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(value) {
+        if (value === null || value === '' || value === undefined) return '—';
+
+        const parsed = parseFloat(value);
+
+        return isNaN(parsed) ? value : parsed.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>';
+
+            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 hasScoreRow = false;
+
+            Object.entries(SCORE_LABELS).forEach(function (entry) {
+                const key   = entry[0];
+                const label = entry[1];
+                const value = sem[key];
+
+                if (value === null || value === '' || value === undefined) return;
+
+                const bold = key === 'semester_score' ? ' fw-bold' : '';
+
+                html += '<tr><td>' + esc(label) + '</td><td class="text-center' + bold + '">' + esc(fmtScore(value)) + '</td></tr>';
+                hasScoreRow = true;
+            });
+
+            if (!hasScoreRow) {
+                html += '<tr><td colspan="2" class="text-muted">No scores recorded.</td></tr>';
+            }
+
+            html += '</tbody></table>';
+
+            const comments = sem.comments || {};
+
+            const commentEntries = Object.entries(comments).filter(function (entry) {
+                return entry[1] && String(entry[1]).trim();
+            });
+
+            const seen    = {};
+            const deduped = [];
+
+            commentEntries.forEach(function (entry) {
+                const type  = entry[0];
+                const text  = String(entry[1]);
+                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 (entry) {
+                    const label = entry[0];
+                    const text  = entry[1];
+
+                    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 (response) {
+                    return response.json();
+                })
+                .then(function (data) {
+                    if (data.error) {
+                        detailsModalBody.innerHTML = '<div class="alert alert-danger">' + esc(data.error) + '</div>';
+                        return;
+                    }
+
+                    detailsModalBody.innerHTML = buildDetailsHtml(data.semesters);
+                })
+                .catch(function () {
+                    detailsModalBody.innerHTML = '<div class="alert alert-danger">Failed to load details.</div>';
+                });
+        });
+    }
+})();
 </script>
-<?= $this->endSection() ?>
+<?= $this->endSection() ?>

app/Views/grading/below_sixty_decisions.php

@@ -1,25 +1,37 @@
 <?= $this->extend('layout/management_layout') ?>
 <?= $this->section('content') ?>
 
+<?php
+// This page is Whole Year only.
+// Do not expose semester filter here.
+$semester = 'year';
+?>
+
 <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') ?>
+        <h2 class="text-center mt-4 mb-4">Below 60 — Whole Year Decisions</h2>
 
         <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 ?? '') ?>
+                Whole Year • <?= esc($schoolYear ?? '') ?>
             </div>
-            <div class="d-flex gap-2">
+
+            <div class="d-flex gap-2 flex-wrap">
                 <a class="btn btn-outline-secondary btn-sm"
-                   href="<?= site_url('grading/below-60?' . http_build_query(['semester' => $semester, 'school_year' => $schoolYear])) ?>">
+                   href="<?= site_url('grading/below-60?' . http_build_query([
+                       'semester'    => 'year',
+                       '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])) ?>">
+                   href="<?= site_url('grading/decisions?' . http_build_query([
+                       'school_year' => $schoolYear ?? '',
+                   ])) ?>">
                     All Decisions
                 </a>
+
                 <?php if (!empty($canViewGrading)): ?>
                     <a class="btn btn-outline-secondary btn-sm" href="<?= base_url('grading') ?>">
                         Grading
@@ -34,6 +46,7 @@
                 <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')) ?>
@@ -47,7 +60,7 @@
             'Pass'                 => 'Pass',
             'Repeat Class'         => 'Repeat Class',
             'Make-up exam in fall' => 'Make-up exam in fall',
-            'Deferred decision'     => 'Deferred decision',
+            'Deferred decision'    => 'Deferred decision',
             'Expel'                => 'Expel',
             'Withdrawn'            => 'Withdrawn',
         ];
@@ -56,93 +69,136 @@
             'Pass'                 => 'success',
             'Repeat Class'         => 'danger',
             'Make-up exam in fall' => 'info',
-            'Deferred decision'     => '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, '.', ''));
+            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.
+                No students below 60 for the whole year.
             </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>
+                <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 class="text-center">Year 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        = '';
+                            // Whole-year score. Prefer year_score if the controller provides it.
+                            // Fall/Spring details remain available through the Details modal.
+                            $scoreRaw = $row['year_score'] ?? $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'] ?? ''));
+                            $studentLabel    = $studentName !== '' ? $studentName : 'N/A';
                             $currentDecision = (string)($row['decision'] ?? '');
                             $currentNotes    = (string)($row['decision_notes'] ?? '');
                             $badge           = $decisionBadge[$currentDecision] ?? null;
+
+                            $finalDecision = $row['consolidated_decision'] ?? null;
+                            $finalBadge    = $finalDecision !== null ? ($decisionBadge[$finalDecision] ?? 'secondary') : null;
+
+                            $certNumber = (string)($row['certificate_number'] ?? '');
                             ?>
+
                             <tr class="<?= esc($rowClass) ?>">
-                                <td><?= esc($studentName !== '' ? $studentName : 'N/A') ?></td>
+                                <td><?= esc($studentLabel) ?></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-student-name="<?= esc($studentLabel) ?>"
                                             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 ?? '')) ?>">
+
+                                        <input type="hidden"
+                                               name="student_id"
+                                               value="<?= esc((string)($row['student_id'] ?? '')) ?>">
+
+                                        <input type="hidden"
+                                               name="semester"
+                                               value="year">
+
+                                        <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">
+                                            <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>
+
+                                            <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>
+                                        <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-semester="year"
                                                 data-school-year="<?= esc((string)($schoolYear ?? '')) ?>">
                                             Send Email
                                         </button>
@@ -151,21 +207,21 @@
                                     <?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>
+                                        <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>
+                                        <a href="<?= site_url('grading/decisions?' . http_build_query([
+                                            '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)) ?>"
@@ -186,9 +242,14 @@
 
             <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>
+                    <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>
+
+                <span class="text-muted small align-self-center ms-1">
+                    — decision colour key
+                </span>
             </div>
         <?php endif; ?>
     </div>
@@ -202,13 +263,19 @@
                 <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>
+                <button type="button"
+                        class="btn btn-outline-secondary"
+                        data-bs-dismiss="modal">
+                    Close
+                </button>
             </div>
         </div>
     </div>
@@ -232,29 +299,46 @@
                 <div class="alert alert-danger mb-0" id="emailModalErrorMsg"></div>
             </div>
 
-            <form id="decisionEmailForm" method="post"
+            <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="student_id" id="emailStudentId">
+                <input type="hidden" name="semester" id="emailSemester" value="year">
                 <input type="hidden" name="school_year" id="emailSchoolYear">
-                <input type="hidden" name="html"        id="emailHtmlHidden">
+                <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>
+                        <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>
+                    <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>
@@ -265,34 +349,55 @@
 
 <?= $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; }
+    .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] }]
+                    columnDefs: [
+                        { orderable: false, targets: [3] }
+                    ]
                 });
             } catch (_) {}
         });
     }
 
     // ── Details modal ────────────────────────────────────────────
-    const detailsModal     = document.getElementById('detailsModal');
-    const detailsModalBody = document.getElementById('detailsModalBody');
-    const detailsModalTitle= document.getElementById('detailsModalLabel');
+    const detailsModal      = document.getElementById('detailsModal');
+    const detailsModalBody  = document.getElementById('detailsModalBody');
+    const detailsModalTitle = document.getElementById('detailsModalLabel');
 
     const SCORE_LABELS = {
         homework_avg:        'Homework Avg',
@@ -303,7 +408,7 @@
         attendance_score:    'Attendance',
         midterm_exam_score:  'Midterm Score',
         final_exam_score:    'Final Exam',
-        semester_score:      'Semester Score',
+        semester_score:      'Semester Score'
     };
 
     const COMMENT_TYPE_LABELS = {
@@ -312,12 +417,14 @@
         attendance_comment:  'Attendance',
         midterm:             'Midterm',
         final:               'Final Exam',
-        ptap:                'PTAP',
+        ptap:                'PTAP'
     };
 
     function fmtScore(v) {
         if (v === null || v === '' || v === undefined) return '—';
+
         const n = parseFloat(v);
+
         return isNaN(n) ? v : n.toFixed(2);
     }
 
@@ -333,78 +440,110 @@
         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>';
+
+            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>';
+
+                html += '<tr><td>' + esc(label) + '</td><td class="text-center' + bold + '">' + esc(fmtScore(v)) + '</td></tr>';
                 hasRow = true;
             });
-            if (!hasRow) html += '<tr><td colspan="2" class="text-muted">No scores recorded.</td></tr>';
+
+            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 commentEntries = Object.entries(comments).filter(function ([, v]) {
+                return v && String(v).trim();
+            });
+
             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]); }
+                const key = label + '|' + String(text).trim();
+
+                if (!seen[key]) {
+                    seen[key] = true;
+                    deduped.push([label, String(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;
+            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(); })
+            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>';
+                        detailsModalBody.innerHTML = '<div class="alert alert-danger">' + esc(data.error) + '</div>';
                         return;
                     }
+
                     detailsModalBody.innerHTML = buildDetailsHtml(data.semesters);
                 })
                 .catch(function () {
@@ -429,8 +568,8 @@
 
     function showPane(which) {
         loadingPane.style.display = which === 'loading' ? '' : 'none';
-        errorPane.style.display   = which === 'error'   ? '' : 'none';
-        form.style.display        = which === 'form'    ? '' : 'none';
+        errorPane.style.display   = which === 'error' ? '' : 'none';
+        form.style.display        = which === 'form' ? '' : 'none';
     }
 
     function destroyEditor() {
@@ -441,6 +580,7 @@
 
     function initEditor(html) {
         if (!window.tinymce) return;
+
         tinymce.init({
             selector: '#decisionEmailEditor',
             base_url: '<?= base_url('assets/tinymce') ?>',
@@ -462,65 +602,76 @@
             setup(editor) {
                 editor.on('init', function () {
                     editor.setContent(html);
-                    if (htmlHidden) htmlHidden.value = html;
+
+                    if (htmlHidden) {
+                        htmlHidden.value = html;
+                    }
                 });
+
                 editor.on('keyup change undo redo SetContent', function () {
-                    if (htmlHidden) htmlHidden.value = editor.getContent({ format: 'html' });
+                    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' });
+
+            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;
+        semesterIn.value   = 'year';
         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);
+            + '&semester=year'
+            + '&school_year=' + encodeURIComponent(schoolYear);
 
-        fetch(url, { headers: { 'X-Requested-With': 'XMLHttpRequest' } })
-            .then(function (res) { return res.json(); })
+        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 || '');
             })
@@ -531,4 +682,4 @@
     });
 })();
 </script>
-<?= $this->endSection() ?>
+<?= $this->endSection() ?>

app/Views/grading/comments.php

@@ -32,7 +32,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
             </div>
         <?php endif; ?>
  <div class="d-flex justify-content-between mt-4 flex-wrap gap-2">
-                <button type="submit" class="btn btn-success" <?= $lockAttr ?>>
+                <button type="submit" form="commentsForm" class="btn btn-success" <?= $lockAttr ?>>
                     <i class="bi bi-save"></i> Save All Changes
                 </button>
                 <a href="<?= base_url('/grading') ?>" class="btn btn-secondary">
@@ -177,7 +177,10 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
                                 </td>
                             <?php elseif ($semester === 'Spring'): ?>
                                 <td>
+                                    <?php $finalCommentId = 'final-comment-' . $studentId; ?>
+                                    <?php $finalReviewId = 'final-review-' . $studentId; ?>
                                     <textarea
+                                        id="<?= esc($finalCommentId) ?>"
                                         name="comments[<?= $studentId ?>][final]"
                                         rows="2"
                                         class="form-control"
@@ -186,7 +189,6 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
                                         maxlength="350"
                                         placeholder="Enter Final comment" <?= $lockAttr ?>><?= esc($comments[$studentId]['final']['comment'] ?? '') ?></textarea>
                                 </td>
-                                <?php $finalReviewId = 'final-review-' . $studentId; ?>
                                 <td>
                                     <div class="d-flex gap-2 align-items-start">
                                         <textarea
@@ -196,6 +198,13 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
                                             class="form-control review-field"
                                             placeholder="Enter Final review" <?= $lockAttr ?>><?= esc($comments[$studentId]['final']['comment_review'] ?? '') ?></textarea>
                                         <div class="d-flex flex-column gap-1 align-items-stretch">
+                                            <button
+                                                type="button"
+                                                class="btn btn-outline-secondary btn-sm copy-final-btn"
+                                                data-copy-source="#<?= esc($finalCommentId) ?>"
+                                                data-copy-target="#<?= esc($finalReviewId) ?>" <?= $lockAttr ?>>
+                                                Paste
+                                            </button>
                                             <div class="small text-muted proofread-status" data-status-for="<?= esc($finalReviewId) ?>"></div>
                                             <ul class="proofread-list small mb-0" data-list-for="<?= esc($finalReviewId) ?>"></ul>
                                         </div>
@@ -474,18 +483,9 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
             });
         };
 
-        document.querySelectorAll('.copy-ptap-btn').forEach(button => {
-            button.addEventListener('click', function() {
-                const source = document.querySelector(this.dataset.copySource || '');
-                const target = document.querySelector(this.dataset.copyTarget || '');
-                if (!source || !target) return;
-                target.value = source.value;
-                target.style.height = 'auto';
-                target.style.height = (target.scrollHeight) + 'px';
-                target.focus();
-            });
-        });
+        wireCopyButtons('.copy-ptap-btn');
         wireCopyButtons('.copy-midterm-btn');
+        wireCopyButtons('.copy-final-btn');
     });
 </script>
 <?= $this->endSection() ?>