fix(compare): Ofsted rows show the grade still in force and the latest visit

'Inspected' is the school's latest visit, so Washwood Heath reads 21 May 2025 rather than '3 Mar 2020 · 4+ years ago' (audit M1). The Result row names the inspection a grade came from, or says 'No overall grade'; 'Grade carried forward' and 'transitional framework' go.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

nextjs-app/components/compare/CompareAtAGlance.tsx

@@ -78,21 +78,18 @@ export function CompareAtAGlance({
           return (
             <Cell key={school.urn} school={school} index={i}>
               {display.kind === 'report_card' && <ReportCardChips summary={display.summary} />}
-              {(display.kind === 'graded' || display.kind === 'carried_forward') && (
+              {(display.kind === 'graded' || display.kind === 'confirmed') && (
                 <>
                   <span className={`${s.badge} ${display.grade <= 2 ? s.badgeGood : display.grade === 3 ? s.badgeWarn : s.badgeBad}`}>
                     {display.gradeLabel}
                   </span>
-                  {display.carriedForward && <span className={s.small}>Grade carried forward</span>}
+                  {display.kind === 'confirmed' && <span className={s.small}>Confirmed at an ungraded inspection</span>}
                 </>
               )}
-              {display.kind === 'transitional' && (
-                <>
-                  <span className={s.badge} style={{ backgroundColor: 'var(--bg-secondary)', color: 'var(--text-secondary)' }}>
-                    No overall grade
-                  </span>
-                  <span className={s.small}>Sub-judgements only</span>
-                </>
+              {display.kind === 'no_overall_grade' && (
+                <span className={s.badge} style={{ backgroundColor: 'var(--bg-secondary)', color: 'var(--text-secondary)' }}>
+                  No overall grade
+                </span>
               )}
               {display.kind === 'none' && <span className={s.small}>No inspection in our dataset</span>}
             </Cell>

nextjs-app/components/compare/CompareOfsted.tsx

@@ -1,7 +1,8 @@
 /**
  * Ofsted section — one visual grammar for inspection detail across all
- * three regimes (legacy graded, interim carried-forward, renewed-framework
- * report card). Copy comes verbatim from the reviewed mockups.
+ * three regimes (legacy graded, no overall grade, renewed-framework report
+ * card). The grade shown is the one still in force, with the inspection that
+ * awarded or confirmed it; "Inspected" is the latest visit.
  */
 
 'use client';
@@ -12,7 +13,8 @@ import {
   rcAreaLabel,
   type OfstedDisplay,
 } from '@/lib/compareLogic';
-import type { ComparisonData, OfstedInspection, School } from '@/lib/types';
+import { gradeSourceLine } from '@/lib/ofstedStatus';
+import type { ComparisonData, OfstedCurrentGrade, OfstedInspection, School } from '@/lib/types';
 import { Cell, Chip, Measure, Section, SectionGrid, sectionStyles as s } from './sectionShared';
 
 const GRADE_TONE: Record<number, 'good' | 'warn' | 'bad'> = {
@@ -39,7 +41,7 @@ function yearsSince(iso: string | null): number | null {
   return (Date.now() - d.getTime()) / (365.25 * 24 * 3600 * 1000);
 }
 
-function ResultCell({ display }: { display: OfstedDisplay }) {
+function ResultCell({ display, current }: { display: OfstedDisplay; current: OfstedCurrentGrade | null }) {
   if (display.kind === 'none') {
     return <span className={s.small}>No inspection outcome in our dataset</span>;
   }
@@ -51,15 +53,13 @@ function ResultCell({ display }: { display: OfstedDisplay }) {
       </>
     );
   }
-  if (display.kind === 'transitional') {
+  if (display.kind === 'no_overall_grade') {
     return (
       <>
         <span className={s.badge} style={{ backgroundColor: 'var(--bg-secondary)', color: 'var(--text-secondary)' }}>
           No overall grade
         </span>
-        <span className={s.small}>
-          Inspected under transitional framework (sub-judgements only)
-        </span>
+        <span className={s.small}>Ofsted stopped giving overall grades in September 2024</span>
       </>
     );
   }
@@ -68,11 +68,7 @@ function ResultCell({ display }: { display: OfstedDisplay }) {
       <span className={`${s.badge} ${display.grade <= 2 ? s.badgeGood : display.grade === 3 ? s.badgeWarn : s.badgeBad}`}>
         {display.gradeLabel}
       </span>
-      <span className={s.small}>
-        {display.carriedForward
-          ? 'Grade carried forward from an earlier inspection (ungraded visit since)'
-          : 'Overall grade (older-style inspection)'}
-      </span>
+      {current && <span className={s.small}>{gradeSourceLine(current)}</span>}
     </>
   );
 }
@@ -179,7 +175,7 @@ export function CompareOfsted({
         <Measure label="Result">
         {schools.map((school, i) => (
           <Cell key={school.urn} school={school} index={i}>
-            <ResultCell display={displays[i]} />
+            <ResultCell display={displays[i]} current={data[String(school.urn)]?.ofsted?.current_grade ?? null} />
           </Cell>
         ))}
         </Measure>
@@ -187,19 +183,15 @@ export function CompareOfsted({
         <Measure label="Inspected">
         {schools.map((school, i) => {
           const ofsted = data[String(school.urn)]?.ofsted;
-          // A report card is dated by its OWN inspection date. The legacy
-          // inspection_date belongs to an older inspection and must never
-          // be shown against a report card (report cards exist only from
-          // Nov 2025).
-          const dateIso =
-            displays[i].kind === 'report_card'
-              ? ofsted?.rc_inspection_date ?? null
-              : ofsted?.inspection_date ?? null;
+          // The school's latest visit of any kind (a report card's own date
+          // when there is one), never an older inspection a grade comes from.
+          const dateIso = ofsted?.latest_visit?.date ?? ofsted?.rc_inspection_date ?? null;
           const age = yearsSince(dateIso);
           return (
             <Cell key={school.urn} school={school} index={i}>
               {formatInspectionDate(dateIso)}{' '}
               {age != null && age > 4 && <Chip tone="neutral">4+ years ago</Chip>}
+              {ofsted?.latest_visit?.outcome && <span className={s.small}>{ofsted.latest_visit.outcome}</span>}
             </Cell>
           );
         })}