apply the school year concept

app/Views/admin/certificates/index.php

@@ -61,22 +61,6 @@ $decisionBadge = [
     <i class="bi bi-award me-2"></i>Generate Certificates
 </h2>
 
-<!-- School year filter -->
-<div class="d-flex justify-content-end mb-3">
-    <form method="get" action="<?= site_url('administrator/certificates') ?>" class="d-flex gap-2 align-items-center">
-        <label class="form-label mb-0 me-1 text-muted small">School Year</label>
-        <input type="text"
-               name="school_year"
-               class="form-control form-control-sm"
-               style="width:130px;"
-               value="<?= esc($schoolYear) ?>"
-               placeholder="e.g. 2024-2025">
-        <button type="submit" class="btn btn-sm btn-outline-primary">
-            <i class="bi bi-arrow-repeat me-1"></i>Reload
-        </button>
-    </form>
-</div>
-
 <?php if (session()->getFlashdata('error')): ?>
     <div class="alert alert-danger alert-dismissible fade show" role="alert">
         <?= esc(session()->getFlashdata('error')) ?>

app/Views/admin/class_progress_list.php

@@ -30,8 +30,15 @@
           $lowProgressSectionIds = $lowProgressSectionIds ?? [];
           $lowProgressQuery = implode(',', $lowProgressSectionIds);
           $lowProgressUrl = base_url('administrator/teacher-submissions');
+          $lowProgressParams = [];
+          if (!empty($filters['school_year'])) {
+            $lowProgressParams['school_year'] = $filters['school_year'];
+          }
           if ($lowProgressQuery !== '') {
-            $lowProgressUrl .= '?low_progress_sections=' . rawurlencode($lowProgressQuery);
+            $lowProgressParams['low_progress_sections'] = $lowProgressQuery;
+          }
+          if (!empty($lowProgressParams)) {
+            $lowProgressUrl .= '?' . http_build_query($lowProgressParams);
           }
         ?>
         <a
@@ -48,6 +55,16 @@
   <form class="card shadow-sm mb-3" method="get" action="<?= base_url('admin/progress') ?>">
     <div class="card-body">
       <div class="row g-3">
+        <div class="col-md-3">
+          <label class="form-label">School year</label>
+          <select name="school_year" class="form-select">
+            <?php foreach (($schoolYears ?? []) as $year): ?>
+              <option value="<?= esc($year) ?>" <?= (string)($filters['school_year'] ?? $schoolYear ?? '') === (string)$year ? 'selected' : '' ?>>
+                <?= esc($year) ?>
+              </option>
+            <?php endforeach; ?>
+          </select>
+        </div>
         <div class="col-md-3">
           <label class="form-label">From</label>
           <input type="date" name="from" class="form-control" value="<?= esc($filters['from'] ?? '') ?>">

app/Views/admin/competition_winners/index.php

@@ -3,7 +3,12 @@
 
 <div class="container mt-4">
   <div class="d-flex justify-content-between align-items-center mb-3">
-    <h3 class="mb-0">Competition Winners</h3>
+    <div>
+      <h3 class="mb-0">Competition Winners</h3>
+      <?php if (!empty($schoolYear)): ?>
+        <div class="text-muted small">School Year: <?= esc($schoolYear) ?></div>
+      <?php endif; ?>
+    </div>
     <a class="btn btn-primary" href="/admin/competition-winners/create">+ New Competition</a>
   </div>
 
@@ -19,6 +24,7 @@
       <tr>
         <th>ID</th>
         <th>Title</th>
+        <th>School Year</th>
         <th>Class Section</th>
         <th>Winners Rule</th>
         <th>Published</th>
@@ -36,6 +42,7 @@
       <tr>
         <td><?= esc($c['id']) ?></td>
         <td><?= esc($c['title']) ?></td>
+        <td><?= esc($c['school_year'] ?? '') ?></td>
         <td><?= esc($sectionName) ?></td>
         <td>Tiered per class</td>
         <td><?= $c['is_published'] ? 'Yes' : 'No' ?></td>