add school year model

src/pages/inventory/InventorySummaryPage.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useState } from 'react'
 import { Link, useSearchParams } from 'react-router-dom'
 import { ApiHttpError } from '../../api/http'
+import { useSchoolYearOptions } from '../../hooks/useSchoolYearOptions'
 import { fetchInventorySummary } from '../../api/inventory'
 import { AcademicFilterBar } from '../discounts/AcademicFilterBar'
 import { INVENTORY_BOOK_BASE } from './inventoryPaths'
@@ -20,6 +21,10 @@ export function InventorySummaryPage() {
   const [schoolYears, setSchoolYears] = useState<string[]>([])
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState<string | null>(null)
+  const { options, currentYear: canonicalCurrentYear } = useSchoolYearOptions({
+    legacyYears: schoolYears,
+    preferredYear: selectedYear,
+  })
 
   const load = useCallback(() => {
     setLoading(true)
@@ -94,19 +99,19 @@ export function InventorySummaryPage() {
             value={
               selectedYear.toLowerCase() === 'all'
                 ? 'all'
-                : selectedYear === currentYear && !searchParams.get('school_year')
+                : selectedYear === (currentYear || canonicalCurrentYear) && !searchParams.get('school_year')
                   ? '__current__'
                   : selectedYear
             }
             onChange={(e) => onYearFilter(e.target.value)}
           >
-            <option value="__current__">Current ({currentYear || '—'})</option>
+            <option value="__current__">Current ({currentYear || canonicalCurrentYear || '—'})</option>
             <option value="all">All Years</option>
-            {schoolYears
-              .filter((y) => y !== currentYear)
-              .map((y) => (
-                <option key={y} value={y}>
-                  {y}
+            {options
+              .filter((option) => option.value !== (currentYear || canonicalCurrentYear))
+              .map((option) => (
+                <option key={option.value} value={option.value}>
+                  {option.label}
                 </option>
               ))}
           </select>

src/pages/inventory/TeacherBookDistributePage.tsx

@@ -1,6 +1,7 @@
 import { type FormEvent, useCallback, useEffect, useState } from 'react'
 import { useSearchParams } from 'react-router-dom'
 import { ApiHttpError } from '../../api/http'
+import { useSchoolYearOptions } from '../../hooks/useSchoolYearOptions'
 import { fetchTeacherBookDistribute, postTeacherBookDistribute } from '../../api/inventory'
 
 type BookGroup = { label: string; items: Record<string, unknown>[] }
@@ -23,6 +24,9 @@ export function TeacherBookDistributePage() {
   const [loading, setLoading] = useState(true)
   const [saving, setSaving] = useState(false)
   const [error, setError] = useState<string | null>(null)
+  const { selectedYear } = useSchoolYearOptions({
+    preferredYear: schoolYear,
+  })
 
   const load = useCallback(() => {
     setLoading(true)
@@ -74,6 +78,8 @@ export function TeacherBookDistributePage() {
     setSelected((prev) => ({ ...prev, [k]: checked }))
   }
 
+  const effectiveSchoolYear = schoolYear || selectedYear
+
   function checkAll(on: boolean) {
     const next: Record<string, boolean> = {}
     if (on) {
@@ -179,7 +185,7 @@ export function TeacherBookDistributePage() {
           <div className="alert alert-info py-2">
             <div className="d-flex justify-content-between flex-wrap gap-2">
               <div>
-                <strong>School Year:</strong> {schoolYear}, <strong>Semester:</strong> {semester}
+                <strong>School Year:</strong> {effectiveSchoolYear || '—'}, <strong>Semester:</strong> {semester}
               </div>
               <div>
                 <strong>On Hand:</strong> {onHand}
@@ -239,7 +245,7 @@ export function TeacherBookDistributePage() {
                           {String(student.semester ?? semester)}
                         </td>
                         <td style={{ textAlign: 'center' }}>
-                          {String(student.school_year ?? schoolYear)}
+                          {String(student.school_year ?? effectiveSchoolYear)}
                         </td>
                         <td style={{ textAlign: 'center' }}>
                           {given ? (