fix decisions and rank

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
 {
@@ -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')
+            $decisionRows = $db->table('student_decisions')
-                ->select('student_id, semester, semester_score')
                 ->whereIn('student_id', $allIds)
                 ->where('school_year', $schoolYear)
-                ->where('semester_score IS NOT NULL', null, false)
+                ->get()
-                ->get()->getResultArray() as $sr) {
+                ->getResultArray();
-                $allScoreMap[(int)$sr['student_id']][ucfirst(strtolower($sr['semester']))] =
+
-                    is_numeric($sr['semester_score']) ? (float)$sr['semester_score'] : null;
+            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 ──────────────────────────────────────────
+        // ── Certificate records: most recent per student ───────────────────────
-        $allBelowMap = [];
-        if (!empty($allIds)) {
-            foreach ($db->table('below_sixty_decisions')
-                ->whereIn('student_id', $allIds)
-                ->where('school_year', $schoolYear)
-                ->get()->getResultArray() as $b) {
-                $allBelowMap[(int)$b['student_id']][ucfirst(strtolower($b['semester']))] = (string)$b['decision'];
-            }
-        }
-
-        // ── Certificate records (most recent per student) ──────────────────────
         $certsByStudent = [];
+
         if (!empty($allIds)) {
             foreach ($db->table('certificate_records')
                 ->select('student_id, certificate_number, issued_at')
                 ->whereIn('student_id', $allIds)
                 ->where('school_year', $schoolYear)
                 ->orderBy('issued_at', 'DESC')
-                ->get()->getResultArray() as $c) {
+                ->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 ────────────────────
+        // ── Build per-class buckets and stats ──────────────────────────────────
-        $decisionsByStudent = [];
+        $studentsByClass = [];
-        $studentsByClass    = [];   // [csid => [student rows...]]
+        $statsPerClass   = [];
-        $statsPerClass      = [];   // [csid => {name, total, pass, cert}]
 
         foreach ($allEnrolled as $row) {
             $sid  = (int)$row['student_id'];
             $csid = (int)$row['class_section_id'];
 
-            // Decisions per semester
+            if (!isset($statsPerClass[$csid])) {
-            foreach ($allScoreMap[$sid] ?? [] as $sem => $score) {
+                $statsPerClass[$csid] = [
-                if ($score === null) continue;
+                    'name'  => $row['class_section_name'],
-                if ($score >= 60) {
+                    'total' => 0,
-                    $dec = 'Pass'; $src = 'auto';
+                    'pass'  => 0,
-                } elseif (!empty($allBelowMap[$sid][$sem])) {
+                    'cert'  => 0,
-                    $dec = $allBelowMap[$sid][$sem]; $src = 'manual';
+                ];
-                } else {
-                    $dec = ''; $src = 'pending';
-                }
-                $decisionsByStudent[$sid][$sem] = ['decision' => $dec, 'source' => $src];
             }
 
-            // Per-class stats
-            if (!isset($statsPerClass[$csid])) {
-                $statsPerClass[$csid] = ['name' => $row['class_section_name'], 'total' => 0, 'pass' => 0, 'cert' => 0];
-            }
             $statsPerClass[$csid]['total']++;
 
-            $sems   = $allScoreMap[$sid] ?? [];
+            // If no generated decision exists yet, explicitly mark pending.
-            $isPass = !empty($sems);
+            if (!isset($decisionsByStudent[$sid])) {
-            foreach ($sems as $sem => $score) {
+                $decisionsByStudent[$sid]['Decision'] = [
-                if ($score === null) { $isPass = false; break; }
+                    'decision'   => '',
-                if ($score >= 60) continue;
+                    'source'     => 'pending',
-                $md = $allBelowMap[$sid][$sem] ?? '';
+                    'notes'      => '',
-                if ($md === '' || $md !== 'Pass') { $isPass = false; break; }
+                    '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,8 +234,10 @@ class CertificateController extends BaseController
         }
 
         $certDateFormatted = '';
+
         if (!empty($record['cert_date'])) {
             $ts = strtotime((string)$record['cert_date']);
+
             if ($ts) {
                 $certDateFormatted = date('m/d/Y', $ts);
             }
@@ -216,8 +251,9 @@ class CertificateController extends BaseController
             '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];
@@ -252,7 +288,9 @@ class CertificateController extends BaseController
                         '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));
@@ -269,7 +307,9 @@ class CertificateController extends BaseController
                         '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;
             }
 
@@ -311,51 +356,56 @@ class CertificateController extends BaseController
                         '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);
 
-        // Load any existing certificates for these students this school year
+        // Load existing certificates for these students this school year.
-        $db         = \Config\Database::connect();
         $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['verify_token'] = $this->ensureVerificationTokenForRecord($existing);
             } else {
                 $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['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;
     }
@@ -435,6 +495,7 @@ class CertificateController extends BaseController
         $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,7 +511,7 @@ class CertificateController extends BaseController
         foreach ($students as $student) {
             $pdf->AddPage();
 
-            $name       = $student['firstname'] . ' ' . $student['lastname'];
+            $name        = trim((string)($student['firstname'] ?? '') . ' ' . (string)($student['lastname'] ?? ''));
             $grade       = $this->formatGrade($student['grade'] ?? '');
             $certNumber  = $student['cert_number'] ?? '';
             $verifyToken = $student['verify_token'] ?? '';
@@ -460,10 +521,18 @@ class CertificateController extends BaseController
                 : null;
 
             $this->drawCertificate(
-                $pdf, $W, $H,
+                $pdf,
-                $name, $grade, $certDate, $certNumber,
+                $W,
+                $H,
+                $name,
+                $grade,
+                $certDate,
+                $certNumber,
                 $verifyUrl,
-                $imgDir, $edwardianFont, $garamondBold, $ebGaramond
+                $imgDir,
+                $edwardianFont,
+                $garamondBold,
+                $ebGaramond
             );
         }
 
@@ -499,21 +568,24 @@ 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
+        // ── QR code — left-aligned with "Presented to:", vertically centred on that line.
-        $qrSize = 42; // pt
+        $qrSize = 42;
+
         if (!empty($verifyUrl)) {
-            $qrX = 120;                       // ~1 cm from left edge
+            $qrX = 120;
-            $qrY = 171 + (24 - $qrSize) / 2; // vertically centred on "Presented to:" row
+            $qrY = 171 + (24 - $qrSize) / 2;
+
             $style = [
                 'border'  => false,
                 'padding' => 0,
                 'fgcolor' => [0, 0, 0],
                 'bgcolor' => false,
             ];
+
             $pdf->write2DBarcode($verifyUrl, 'QRCODE,L', $qrX, $qrY, $qrSize, $qrSize, $style, 'N');
         }
 
-        // ── Student name — center based on actual string width
+        // ── 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);
@@ -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++) {

app/Controllers/View/GradingController.php

@@ -2298,33 +2298,45 @@ class GradingController extends Controller
         return 50000;
     }
 
-
     public function belowSixtyDecisions()
-    {
+{
     $configuredSemester = (string) $this->semester;
     $configuredYear     = (string) $this->schoolYear;
 
     $semester   = trim((string)($this->request->getGet('semester') ?? ''));
     $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
-        if ($semester === '') $semester = $configuredSemester !== '' ? $configuredSemester : 'Fall';
+
-        if ($schoolYear === '') $schoolYear = $configuredYear;
+    if ($semester === '') {
+        $semester = $configuredSemester !== '' ? $configuredSemester : 'Fall';
+    }
+
+    if ($schoolYear === '') {
+        $schoolYear = $configuredYear;
+    }
 
     $schoolYears = $this->getSchoolYearsForScores($schoolYear);
     $rows        = $this->fetchBelowSixtyRows($schoolYear, $semester);
 
-        $decisionModel = new BelowSixtyDecisionModel();
     $studentIds = array_values(array_unique(array_filter(
         array_map(static fn($r) => (int)($r['student_id'] ?? 0), $rows),
         static fn($id) => $id > 0
     )));
 
+    // ── 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();
+
         foreach ($dRows as $d) {
             $decisionMap[(int)$d['student_id']] = $d;
         }
@@ -2332,37 +2344,51 @@ class GradingController extends Controller
 
     foreach ($rows as &$row) {
         $sid = (int)($row['student_id'] ?? 0);
+
         $row['decision']       = $decisionMap[$sid]['decision'] ?? '';
         $row['decision_notes'] = $decisionMap[$sid]['notes'] ?? '';
     }
+
     unset($row);
 
-        // Load consolidated decisions from student_decisions for this term
+    // ── Load consolidated YEAR decisions from student_decisions ─────────────
-        $sdModel = new StudentDecisionModel();
+    //
-        $sdRows  = $sdModel
+    // IMPORTANT:
-            ->where('semester', $semester)
+    // student_decisions no longer has semester or semester_score.
-            ->where('school_year', $schoolYear)
+    // It is now one row per student per school_year using year_score.
-            ->findAll();
     $sdMap = [];
+
+    if (!empty($studentIds)) {
+        $sdRows = $this->db->table('student_decisions')
+            ->whereIn('student_id', $studentIds)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->getResultArray();
+
         foreach ($sdRows as $sd) {
-            $sdMap[(int)$sd['student_id']] = $sd;
+            $sid = (int)($sd['student_id'] ?? 0);
+
+            if ($sid > 0) {
+                $sdMap[$sid] = $sd;
+            }
+        }
     }
 
-        // Load the most recent certificate per student for this school_year
+    // ── 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();
+            ->get()
+            ->getResultArray();
+
         foreach ($certRows as $cr) {
             $sid = (int)($cr['student_id'] ?? 0);
+
             if ($sid > 0 && !isset($certMap[$sid])) {
                 $certMap[$sid] = (string)($cr['certificate_number'] ?? '');
             }
@@ -2371,9 +2397,12 @@ class GradingController extends Controller
 
     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');
@@ -2385,7 +2414,7 @@ class GradingController extends Controller
         'schoolYears'    => $schoolYears,
         'canViewGrading' => $canViewGrading,
     ]);
-    }
+}
 
     public function saveBelowSixtyDecision()
     {
@@ -2643,27 +2672,38 @@ class GradingController extends Controller
             ->with('status', 'Decision email sent to parent(s).');
     }
 
-    public function allDecisions()
+public function allDecisions()
-    {
+{
     $configuredYear = (string)$this->schoolYear;
 
     $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
-        if ($schoolYear === '') $schoolYear = $configuredYear;
+    if ($schoolYear === '') {
+        $schoolYear = $configuredYear;
+    }
 
     $schoolYears = $this->getSchoolYearsForScores($schoolYear);
 
-        // Load saved year decisions (semester='year') for this school year
+    // 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('semester', 'year')
         ->where('school_year', $schoolYear)
         ->findAll();
+
     $savedMap = [];
     foreach ($saved as $s) {
-            $savedMap[(int)$s['student_id']] = $s;
+        $sid = (int)($s['student_id'] ?? 0);
+        if ($sid > 0) {
+            $savedMap[$sid] = $s;
+        }
     }
 
-        // Fetch Fall and Spring semester_scores per student for this school year
+    // 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',
@@ -2683,15 +2723,21 @@ class GradingController extends Controller
         ->orderBy('cs.class_section_name', 'ASC')
         ->orderBy('s.lastname', 'ASC')
         ->orderBy('s.firstname', 'ASC')
-            ->get()->getResultArray();
+        ->get()
+        ->getResultArray();
 
-        // Group by student: keep one base info row + fall/spring scores
+    // Group Fall/Spring scores by student.
     $studentMap = [];
+
     foreach ($allScoreRows as $sr) {
-            $sid = (int)$sr['student_id'];
+        $sid = (int)($sr['student_id'] ?? 0);
+
+        if ($sid <= 0) {
+            continue;
+        }
+
         if (!isset($studentMap[$sid])) {
             $studentMap[$sid] = [
-                    'student_id'         => $sid,
                 'school_id'          => $sr['school_id'] ?? '',
                 'firstname'          => $sr['firstname'] ?? '',
                 'lastname'           => $sr['lastname'] ?? '',
@@ -2700,8 +2746,10 @@ class GradingController extends Controller
                 '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') {
@@ -2709,22 +2757,32 @@ class GradingController extends Controller
         }
     }
 
-        // Pull below-60 decisions for either semester (use worst available)
+    // Pull below-60 manual decisions for this school year.
+    // Used only when the calculated year_score is below 60.
     $belowDecModel = new BelowSixtyDecisionModel();
+
     $belowRows = $belowDecModel
         ->where('school_year', $schoolYear)
         ->findAll();
+
     $belowMap = [];
+
     foreach ($belowRows as $b) {
-            $sid = (int)$b['student_id'];
+        $sid = (int)($b['student_id'] ?? 0);
-            // prefer a non-empty decision over empty
+
-            if (!isset($belowMap[$sid]) || (string)($belowMap[$sid]['decision'] ?? '') === '') {
+        if ($sid <= 0) {
+            continue;
+        }
+
+        // Keep the first non-empty decision found for this student.
+        if (!isset($belowMap[$sid]) || trim((string)($belowMap[$sid]['decision'] ?? '')) === '') {
             $belowMap[$sid] = $b;
         }
     }
 
-        // Build final rows with year_score = (fall + spring) / 2
+    // Build final display rows.
     $rows = [];
+
     foreach ($studentMap as $sid => $info) {
         $fall   = $info['fall_score'];
         $spring = $info['spring_score'];
@@ -2732,23 +2790,29 @@ class GradingController extends Controller
         if ($fall !== null && $spring !== null) {
             $yearScore = round(($fall + $spring) / 2, 2);
         } elseif ($fall !== null) {
-                $yearScore = $fall;
+            $yearScore = round((float)$fall, 2);
         } elseif ($spring !== null) {
-                $yearScore = $spring;
+            $yearScore = round((float)$spring, 2);
         } else {
             $yearScore = null;
         }
 
         if (isset($savedMap[$sid])) {
-                $decision = (string)($savedMap[$sid]['decision'] ?? '');
+            $savedRow = $savedMap[$sid];
-                $source   = (string)($savedMap[$sid]['source']   ?? 'auto');
+
-                $notes    = (string)($savedMap[$sid]['notes']    ?? '');
+            $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 = (string)($belowMap[$sid]['decision'] ?? '');
+            $decision = trim((string)($belowMap[$sid]['decision'] ?? ''));
             $source   = $decision !== '' ? 'manual' : 'pending';
             $notes    = (string)($belowMap[$sid]['notes'] ?? '');
         } else {
@@ -2781,17 +2845,18 @@ class GradingController extends Controller
         'schoolYears' => $schoolYears,
         'generated'   => $generated,
     ]);
-    }
+}
 
-    public function generateAllDecisions()
+
-    {
+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
+    // Fetch Fall and Spring scores per student.
     $allScoreRows = $this->db->table('semester_scores ss')
         ->select([
             's.id AS student_id',
@@ -2807,16 +2872,23 @@ class GradingController extends Controller
         ->where('ss.school_year', $schoolYear)
         ->whereIn('LOWER(TRIM(ss.semester))', ['fall', 'spring'])
         ->where('ss.semester_score IS NOT NULL', null, false)
-            ->get()->getResultArray();
+        ->get()
+        ->getResultArray();
 
     if (empty($allScoreRows)) {
         return redirect()->back()->with('error', 'No semester scores found for this school year.');
     }
 
-        // Group by student
+    // Group Fall/Spring scores by student.
     $studentMap = [];
+
     foreach ($allScoreRows as $sr) {
-            $sid = (int)$sr['student_id'];
+        $sid = (int)($sr['student_id'] ?? 0);
+
+        if ($sid <= 0) {
+            continue;
+        }
+
         if (!isset($studentMap[$sid])) {
             $studentMap[$sid] = [
                 'firstname'          => $sr['firstname'] ?? '',
@@ -2826,8 +2898,10 @@ class GradingController extends Controller
                 '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') {
@@ -2835,28 +2909,43 @@ class GradingController extends Controller
         }
     }
 
-        // Pull below-60 decisions for any semester of this year
+    // 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'];
+        $sid = (int)($b['student_id'] ?? 0);
-            if (!isset($belowMap[$sid]) || (string)($belowMap[$sid]['decision'] ?? '') === '') {
+
+        if ($sid <= 0) {
+            continue;
+        }
+
+        if (!isset($belowMap[$sid]) || trim((string)($belowMap[$sid]['decision'] ?? '')) === '') {
             $belowMap[$sid] = $b;
         }
     }
 
-        // Load existing year decisions to upsert
+    // 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('semester', 'year')
         ->where('school_year', $schoolYear)
         ->findAll();
+
     $existingMap = [];
+
     foreach ($existing as $e) {
-            $existingMap[(int)$e['student_id']] = $e;
+        $sid = (int)($e['student_id'] ?? 0);
+
+        if ($sid > 0) {
+            $existingMap[$sid] = $e;
+        }
     }
 
     $userId     = (int)(session()->get('user_id') ?? 0) ?: null;
@@ -2869,9 +2958,9 @@ class GradingController extends Controller
         if ($fall !== null && $spring !== null) {
             $yearScore = round(($fall + $spring) / 2, 2);
         } elseif ($fall !== null) {
-                $yearScore = $fall;
+            $yearScore = round((float)$fall, 2);
         } elseif ($spring !== null) {
-                $yearScore = $spring;
+            $yearScore = round((float)$spring, 2);
         } else {
             continue;
         }
@@ -2880,22 +2969,25 @@ class GradingController extends Controller
             $decision = 'Pass';
             $source   = 'auto';
             $notes    = null;
-            } elseif (isset($belowMap[$sid]) && (string)($belowMap[$sid]['decision'] ?? '') !== '') {
+        } elseif (isset($belowMap[$sid]) && trim((string)($belowMap[$sid]['decision'] ?? '')) !== '') {
-                $decision = (string)$belowMap[$sid]['decision'];
+            $decision = trim((string)$belowMap[$sid]['decision']);
             $source   = 'manual';
-                $notes    = ($belowMap[$sid]['notes'] ?? '') !== '' ? (string)$belowMap[$sid]['notes'] : null;
+            $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,
-                'semester'           => 'year',
             'school_year'        => $schoolYear,
             'class_section_name' => $info['class_section_name'] ?? null,
-                'semester_score'     => $yearScore,
+            'year_score'         => $yearScore,
             'decision'           => $decision,
             'source'             => $source,
             'notes'              => $notes,
@@ -2903,17 +2995,19 @@ class GradingController extends Controller
         ];
 
         if (isset($existingMap[$sid])) {
-                $decModel->update($existingMap[$sid]['id'], $payload);
+            $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()
     {

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, ' Rank: ');
 
-    $labelWidth = $pdf->GetStringWidth(' Ranking: ');
+    $labelWidth = $pdf->GetStringWidth(' Rank: ');
     $pdf->SetFont('Helvetica', '', 12);
     $pdf->SetXY($x + 2 + $labelWidth, $y + 3);
     $pdf->Write(5, $rankValue);
@@ -1879,7 +1879,7 @@ $scoresEndY = $pdf->GetY();
                 return [
                     'position' => $position,
                     'total'    => $total,
-                    'display'  => $this->formatOrdinal($position) . ' of ' . $total,
+                    'display'  => $this->formatOrdinal($position) . ' out of ' . $total,
                 ];
             }
         }

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

@@ -38,9 +38,12 @@ 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;
 
@@ -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;"
+        <input type="text"
-               value="<?= esc($schoolYear) ?>" placeholder="e.g. 2024-2025">
+               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>
@@ -91,10 +100,12 @@ $decisionBadge = [
         $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"
@@ -116,6 +127,7 @@ $decisionBadge = [
 <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"
@@ -138,9 +150,12 @@ $decisionBadge = [
                     <p class="text-muted text-center">No active students.</p>
                 <?php else: ?>
 
-        <form method="post" action="<?= site_url('administrator/certificates/generate') ?>"
+                    <form method="post"
-              id="<?= esc($formId) ?>" class="cert-form mb-5">
+                          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) ?>">
 
@@ -157,14 +172,23 @@ $decisionBadge = [
                                     <strong class="text-primary"><?= $csCert ?></strong> Generated
                                 </span>
                                 <span class="text-muted small">
-                        <strong class="<?= $csRemain > 0 ? 'text-warning' : 'text-muted' ?>"><?= $csRemain ?></strong> Remaining
+                                    <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"
+                                <input type="date"
-                           value="<?= date('Y-m-d') ?>" title="Certificate date">
+                                       class="form-control cert-date-picker"
-                    <input type="hidden" name="cert_date" class="cert-date-hidden" value="<?= esc($certDate) ?>">
+                                       value="<?= date('Y-m-d') ?>"
+                                       title="Certificate date">
+                                <input type="hidden"
+                                       name="cert_date"
+                                       class="cert-date-hidden"
+                                       value="<?= esc($certDate) ?>">
                             </div>
                         </div>
 
@@ -179,45 +203,91 @@ $decisionBadge = [
                                         </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) => $d['decision'], $stuDec);
+
+                                        $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 !== '')));
+
+                                        $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'));
+
+                                        $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"
+                                                <input class="form-check-input cert-student-check"
-                                       name="student_ids[]" value="<?= $sid ?>"
+                                                       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): $color = $decisionBadge[$dec] ?? 'secondary'; ?>
+                                                    <?php foreach ($displayDecs as $dec): ?>
-                                        <span class="badge bg-<?= esc($color) ?> me-1"><?= esc($dec) ?></span>
+                                                        <?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">
+                                                       target="_blank"
+                                                       class="font-monospace small">
                                                         <?= esc($certNo) ?>
                                                     </a>
                                                 <?php else: ?>
@@ -259,38 +329,96 @@ $decisionBadge = [
     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>
+<style>
-<body><div class="viewer-shell"><div class="viewer-status" id="viewerStatus">Preparing certificate PDF...</div><iframe class="viewer-frame" id="pdfFrame"></iframe></div>
+html,body{margin:0;height:100%;background:#f3f4f6;font-family:Arial,sans-serif}
-<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>`);
+.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.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' } });
+                if (csrfVal) {
-                const nn = resp.headers.get('X-CSRF-TOKEN-NAME'), nh = resp.headers.get('X-CSRF-TOKEN');
+                    fd.set(currentCsrfTokenName, csrfVal);
-                if (nn && nh) updateCsrfInForm(form, nn, nh);
+                }
+
+                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);
+
+                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,43 +576,64 @@ $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.done {
-.cert-status-dot.no-eligible { background-color: #adb5bd; }
+    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 (_) {}
         });
@@ -420,5 +641,3 @@ $decisionBadge = [
 })();
 </script>
 <?= $this->endSection() ?>
-
-<?= $this->endSection() ?>

app/Views/grading/below_sixty.php

@@ -11,13 +11,18 @@
             <div class="text-muted">
                 <?= !empty($isYearMode) ? 'Whole Year' : 'Fall' ?> • <?= esc($schoolYear ?? '') ?>
             </div>
+
             <div class="d-flex gap-2">
-                <?php if (empty($isYearMode)): ?>
+                <?php if (!empty($isYearMode)): ?>
                     <a class="btn btn-outline-primary btn-sm"
-                   href="<?= site_url('grading/below-60/decisions?' . http_build_query(['semester' => 'fall', 'school_year' => $schoolYear ?? ''])) ?>">
+                       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,14 +36,16 @@
             if ($value === null || $value === '') {
                 return '—';
             }
+
             if (is_numeric($value)) {
                 return esc(number_format((float)$value, 2, '.', ''));
             }
+
             return esc($value);
         };
 
-        // Fall mode displays Fall semester_score.
+        // Fall mode uses Fall.
-        // Whole Year mode displays the controller-provided annual score: (fall_score + spring_score) / 2.
+        // Whole Year mode uses year.
         $actionSemester = !empty($isYearMode) ? 'year' : 'fall';
         ?>
 
@@ -48,7 +55,9 @@
             </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>
@@ -59,12 +68,15 @@
                             <th>Schedule Meeting</th>
                         </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';
@@ -72,15 +84,19 @@
                                     $scoreClass = 'grade-orange';
                                 }
                             }
+
                             $studentName  = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
                             $studentLabel = $studentName !== '' ? $studentName : 'N/A';
                             $isClosed     = ($row['status'] ?? 'Open') === 'Closed';
                             ?>
+
                             <tr class="<?= esc($scoreClass) ?>">
                                 <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;"
@@ -90,23 +106,54 @@
                                         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">
+                                    <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($actionSemester) ?>">
+                                        <input type="hidden"
-                                        <input type="hidden" name="school_year" value="<?= esc((string)($schoolYear ?? '')) ?>">
+                                               name="student_id"
-                                        <select name="status" class="form-select form-select-sm" style="width: 110px;">
+                                               value="<?= esc((string)($row['student_id'] ?? '')) ?>">
-                                            <option value="Open" <?= ($row['status'] ?? 'Open') === 'Open' ? 'selected' : '' ?>>Open</option>
+
-                                            <option value="Closed" <?= ($row['status'] ?? '') === 'Closed' ? 'selected' : '' ?>>Closed</option>
+                                        <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($actionSemester) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
@@ -114,9 +161,12 @@
                                         </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($actionSemester) . '&school_year=' . rawurlencode((string)($schoolYear ?? ''))) ?>">
@@ -141,13 +191,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>
@@ -157,20 +213,46 @@
 
 <?= $this->section('scripts') ?>
 <style>
-    .grade-orange td { background: #fff3cd !important; color: #8a5d00; font-weight: 600; }
+    .grade-orange td {
-    .grade-red td { background: #f8d7da !important; color: #842029; font-weight: 600; }
+        background: #fff3cd !important;
-    .below-sixty-wrapper { padding-top: 0.75rem; }
+        color: #8a5d00;
-    .below-sixty-title { position: relative; z-index: 1; margin-bottom: 1.25rem; }
+        font-weight: 600;
-    .below-sixty-table { margin-top: 0.75rem; }
+    }
-    .below-sixty-dt td { vertical-align: top; }
+
+    .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() {
+(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));
@@ -180,15 +262,19 @@
     document.addEventListener('DOMContentLoaded', normalizeSemesterFilter);
 
     if (window.$ && $.fn && $.fn.DataTable) {
-            $(function() {
+        $(function () {
             const table = $('.below-sixty-dt');
+
             if (!table.length) return;
+
             try {
                 table.DataTable({
                     order: [[2, 'asc']],
                     pageLength: 100,
                     lengthMenu: [10, 25, 50, 100, 200],
-                        columnDefs: [{ orderable: false, targets: [3, 4, 5] }]
+                    columnDefs: [
+                        { orderable: false, targets: [3, 4, 5] }
+                    ]
                 });
             } catch (_) {}
         });
@@ -221,7 +307,9 @@
 
     function fmtScore(value) {
         if (value === null || value === '' || value === undefined) return '—';
+
         const parsed = parseFloat(value);
+
         return isNaN(parsed) ? value : parsed.toFixed(2);
     }
 
@@ -239,23 +327,30 @@
         }
 
         let html = '';
-            semesters.forEach(function(sem) {
+
+        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) {
+
+            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;
             });
@@ -263,20 +358,24 @@
             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) {
+
+            const commentEntries = Object.entries(comments).filter(function (entry) {
                 return entry[1] && String(entry[1]).trim();
             });
 
             const seen    = {};
             const deduped = [];
-                commentEntries.forEach(function(entry) {
+
+            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]);
@@ -286,14 +385,17 @@
             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) {
+
+                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>';
             }
         });
@@ -302,8 +404,9 @@
     }
 
     if (detailsModal) {
-            document.addEventListener('click', function(e) {
+        document.addEventListener('click', function (e) {
             const btn = e.target.closest('.btn-show-details');
+
             if (!btn) return;
 
             const studentId   = btn.dataset.studentId;
@@ -312,26 +415,34 @@
 
             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' } })
+            fetch(url, {
-                    .then(function(response) { return response.json(); })
+                headers: {
-                    .then(function(data) {
+                    '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() {
+                .catch(function () {
                     detailsModalBody.innerHTML = '<div class="alert alert-danger">Failed to load details.</div>';
                 });
         });
     }
-    })();
+})();
 </script>
 <?= $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>
+        <h2 class="text-center mt-4 mb-4">Below 60 — Whole Year Decisions</h2>
-
-        <?= $this->include('partials/academic_filter') ?>
 
         <div class="d-flex justify-content-between align-items-center mb-3 flex-wrap gap-2">
             <div class="text-muted">
-                <?= esc(ucfirst($semester ?? '')) ?> • <?= esc($schoolYear ?? '') ?>
+                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')) ?>
@@ -62,87 +75,130 @@
         ];
 
         $displayScore = function ($value) {
-            if ($value === null || $value === '') return '—';
+            if ($value === null || $value === '') {
-            if (is_numeric($value)) return esc(number_format((float)$value, 2, '.', ''));
+                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;
+                            // 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"
-                                        <input type="hidden" name="school_year" value="<?= esc((string)($schoolYear ?? '')) ?>">
+                                               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 ?? ''])) ?>"
+                                        <a href="<?= site_url('grading/decisions?' . http_build_query([
-                                           class="text-muted small">Generate</a>
+                                            '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="semester" id="emailSemester" value="year">
                 <input type="hidden" name="school_year" id="emailSchoolYear">
                 <input type="hidden" name="html" id="emailHtmlHidden">
 
                 <div class="modal-body">
                     <div class="mb-3">
                         <label class="form-label fw-semibold" for="emailSubjectInput">Subject</label>
-                        <input type="text" class="form-control" id="emailSubjectInput" name="subject" required>
+                        <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="button"
-                    <button type="submit" class="btn btn-primary" id="emailSendBtn">Send Email</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,25 +349,46 @@
 
 <?= $this->section('scripts') ?>
 <style>
-    .grade-orange td { background: #fff3cd !important; color: #8a5d00; }
+    .grade-orange td {
-    .grade-red td    { background: #f8d7da !important; color: #842029; }
+        background: #fff3cd !important;
-    .decision-notes  { font-size: 0.85rem; resize: vertical; min-height: 60px; }
+        color: #8a5d00;
-    .decisions-dt td { vertical-align: top; }
+    }
+
+    .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 (_) {}
         });
@@ -292,7 +397,7 @@
     // ── Details modal ────────────────────────────────────────────
     const detailsModal      = document.getElementById('detailsModal');
     const detailsModalBody  = document.getElementById('detailsModalBody');
-    const detailsModalTitle= document.getElementById('detailsModalLabel');
+    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();
+                const key = label + '|' + String(text).trim();
-                if (!seen[key]) { seen[key] = true; deduped.push([label, text]); }
+
+                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 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' } })
+            fetch(url, {
-                .then(function (r) { return r.json(); })
+                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 () {
@@ -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)
+            + '&semester=year'
-            + '&school_year='+ encodeURIComponent(schoolYear);
+            + '&school_year=' + encodeURIComponent(schoolYear);
 
-        fetch(url, { headers: { 'X-Requested-With': 'XMLHttpRequest' } })
+        fetch(url, {
-            .then(function (res) { return res.json(); })
+            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 || '');
             })