fix(detail): banded first-choice interpretation + plain-English P8 absence copy

Batch C (points 7-10):
- Point 7: the admissions section shows the first-choice offer rate but no
  sense of how severe a low rate is. Reuse the compare screen's banded
  summariseAdmissions ('More than half of first choices missed out' etc.)
  as an interpretive line under the tiles. (Selective/faith framing was
  already present via admissionsTag.)
- Point 8: replace the jargon P8-suspended banner ('not used for
  accountability purposes ... treat with caution') with the compare
  screen's plain-English 'no KS2 baseline (COVID)' explanation.
- Points 9 (disadvantaged cohort sizes) and 10 (FSM benchmark) don't apply
  to the detail page: it shows disadvantaged composition, not disadvantaged
  attainment, and no FSM-vs-benchmark comparison — so there's no small-cohort
  caveat or cross-definition fallback to fix here.
- Also fixed a stray lowercase 'national avg' provenance string Batch B
  missed.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0146VHeLAWjDVE2B5uU67jCB

nextjs-app/__tests__/lib/utils.test.ts

@@ -9,6 +9,7 @@ import {
   isValidPostcode,
   debounce,
   buildOfstedListBadge,
+  ofstedLegacyAreas,
   metricKind,
   shortName,
   computeYBounds,
@@ -111,6 +112,35 @@ describe('debounce', () => {
   });
 });
 
+describe('ofstedLegacyAreas', () => {
+  it('returns only real grades (1-4) and drops sentinel/null values', () => {
+    const areas = ofstedLegacyAreas({
+      quality_of_education: 1,
+      behaviour_attitudes: 2,
+      personal_development: null,
+      leadership_management: 9, // sentinel "not applicable" — must be dropped
+      early_years_provision: 9, // secondary school — not applicable
+      sixth_form_provision: 2,
+    });
+    expect(areas.map((a) => a.label)).toEqual([
+      'Quality of Teaching',
+      'Behaviour in School',
+      'Sixth Form',
+    ]);
+    expect(areas.every((a) => a.value >= 1 && a.value <= 4)).toBe(true);
+  });
+
+  it('includes the sixth-form judgement where present (was previously dropped)', () => {
+    const areas = ofstedLegacyAreas({ sixth_form_provision: 1 });
+    expect(areas).toEqual([{ label: 'Sixth Form', value: 1 }]);
+  });
+
+  it('includes Early Years for a primary school', () => {
+    const areas = ofstedLegacyAreas({ quality_of_education: 2, early_years_provision: 1 });
+    expect(areas.map((a) => a.label)).toContain('Early Years (Reception)');
+  });
+});
+
 describe('buildOfstedListBadge', () => {
   it('returns grade word + year for OEIF Outstanding', () => {
     const badge = buildOfstedListBadge({ ofsted_grade: 1, ofsted_date: '2023-11-15', ofsted_framework: 'OEIF' });

nextjs-app/components/SchoolDetailView.tsx

@@ -18,9 +18,10 @@ import type {
   SchoolDeprivation, SchoolFinance, NationalAverages,
 } from '@/lib/types';
 import {
-  formatPercentage, formatProgress, formatAcademicYear, isProposedToClose,
+  formatPercentage, formatProgress, formatAcademicYear, isProposedToClose, ofstedLegacyAreas,
 } from '@/lib/utils';
 import { DeltaChip } from './DeltaChip';
+import { summariseAdmissions } from '@/lib/compareLogic';
 
 const PerformanceChart = dynamic(
   () => import('./PerformanceChart').then((m) => m.PerformanceChart),
@@ -85,6 +86,10 @@ export function SchoolDetailView({
   // Trend toggle only appears with ≥2 years carrying an offer rate.
   const admissionsOfferYears = admissionsHistory.filter((h) => h.first_preference_offer_pct != null).length;
   const showAdmissionsTrend = admissionsOfferYears >= 2;
+  // Banded interpretation of the first-choice offer rate ("More than half of
+  // first choices missed out" etc.) — the same banding the compare screen
+  // uses, so a low offer rate reads as how severe it actually is.
+  const admissionsSummary = summariseAdmissions(admissions);
   // Only the section links scroll horizontally; Back and "All" stay pinned.
   const sectionLinksRef = useRef<HTMLDivElement | null>(null);
   const [sectionNavAtEnd, setSectionNavAtEnd] = useState(false);
@@ -285,17 +290,12 @@ export function SchoolDetailView({
     : ofsted?.inspection_date ?? null;
 
   // ── Ofsted: detect if all OEIF sub-grades match the overall ───────────
-  const oeifAllSameGrade = (() => {
-    if (!ofsted || isReportCard) return false;
-    const subs = [
-      ofsted.quality_of_education,
-      ofsted.behaviour_attitudes,
-      ofsted.personal_development,
-      ofsted.leadership_management,
-      ...(ofsted.early_years_provision != null ? [ofsted.early_years_provision] : []),
-    ].filter((v): v is number => v != null);
-    return subs.length >= 3 && subs.every(v => v === ofsted.overall_effectiveness);
-  })();
+  const oeifAreas = ofsted ? ofstedLegacyAreas(ofsted) : [];
+  const oeifAllSameGrade =
+    !!ofsted &&
+    !isReportCard &&
+    oeifAreas.length >= 3 &&
+    oeifAreas.every((a) => a.value === ofsted.overall_effectiveness);
 
   // Label shown in the mobile "section" menu button — the section in view.
   const activeNavLabel = (navItems.find((n) => n.id === activeSection) ?? navItems[0])?.label ?? '';
@@ -583,7 +583,9 @@ export function SchoolDetailView({
                 )}
               </div>
               <p className={styles.ofstedDisclaimer}>
-                From September 2024, Ofsted no longer makes an overall effectiveness judgement in inspections of state-funded schools.
+                {ofsted.grade_source === 'ungraded_carried_forward'
+                  ? 'This overall grade is carried forward from an earlier inspection — Ofsted has since visited without issuing a new overall grade. From September 2024, Ofsted no longer makes an overall effectiveness judgement.'
+                  : 'From September 2024, Ofsted no longer makes an overall effectiveness judgement in inspections of state-funded schools.'}
               </p>
               {oeifAllSameGrade ? (
                 <p className={styles.ofstedAllSame}>
@@ -591,15 +593,7 @@ export function SchoolDetailView({
                 </p>
               ) : (
                 <div className={styles.metricsGrid}>
-                  {[
-                    { label: 'Quality of Teaching', value: ofsted.quality_of_education },
-                    { label: 'Behaviour in School', value: ofsted.behaviour_attitudes },
-                    { label: 'Pupils\' Wider Development', value: ofsted.personal_development },
-                    { label: 'School Leadership', value: ofsted.leadership_management },
-                    ...(ofsted.early_years_provision != null
-                      ? [{ label: 'Early Years (Reception)', value: ofsted.early_years_provision }]
-                      : []),
-                  ].map(({ label, value }) => value != null && (
+                  {oeifAreas.map(({ label, value }) => (
                     <div key={label} className={styles.metricCard}>
                       <div className={styles.metricLabel}>{label}</div>
                       <div className={`${styles.metricValue} ${styles[`ofstedGrade${value}`]}`}>
@@ -917,6 +911,9 @@ export function SchoolDetailView({
                   </div>
                 )}
               </dl>
+              {admissionsSummary.chip && (
+                <p className={styles.admissionsTrendSummary}>{admissionsSummary.chip.text}</p>
+              )}
             </div>
 
             {/* Multi-year trend */}
@@ -952,7 +949,7 @@ export function SchoolDetailView({
                     <DeltaChip value={latestResults.disadvantaged_pct} baseline={primaryAvg.disadvantaged_pct} unit="pts" size="sm" />
                   )}
                 </div>
-                <div className={styles.heroStatHint}>Pupils from disadvantaged backgrounds{primaryAvg.disadvantaged_pct != null ? ` · national avg: ${primaryAvg.disadvantaged_pct.toFixed(0)}%` : ''}</div>
+                <div className={styles.heroStatHint}>Pupils from disadvantaged backgrounds{primaryAvg.disadvantaged_pct != null ? ` · England avg: ${primaryAvg.disadvantaged_pct.toFixed(0)}%` : ''}</div>
               </div>
             )}
             {latestResults?.eal_pct != null && (

nextjs-app/components/SecondarySchoolDetailView.tsx

@@ -23,7 +23,7 @@ import type {
   SchoolAdmissions, SenDetail, Phonics,
   SchoolDeprivation, SchoolFinance, NationalAverages,
 } from '@/lib/types';
-import { formatPercentage, formatProgress, formatAcademicYear, formatAgeRange, isProposedToClose } from '@/lib/utils';
+import { formatPercentage, formatProgress, formatAcademicYear, formatAgeRange, isProposedToClose, ofstedLegacyAreas } from '@/lib/utils';
 import { DeltaChip } from './DeltaChip';
 import { track, getNavigationSource } from '@/lib/analytics';
 import styles from './SecondarySchoolDetailView.module.css';
@@ -201,17 +201,12 @@ export function SecondarySchoolDetailView({
     : ofsted?.inspection_date ?? null;
 
   // ── Ofsted: detect if all OEIF sub-grades match the overall ───────────
-  const oeifAllSameGrade = (() => {
-    if (!ofsted || isReportCard) return false;
-    const subs = [
-      ofsted.quality_of_education,
-      ofsted.behaviour_attitudes,
-      ofsted.personal_development,
-      ofsted.leadership_management,
-      ...(ofsted.early_years_provision != null ? [ofsted.early_years_provision] : []),
-    ].filter((v): v is number => v != null);
-    return subs.length >= 3 && subs.every(v => v === ofsted.overall_effectiveness);
-  })();
+  const oeifAreas = ofsted ? ofstedLegacyAreas(ofsted) : [];
+  const oeifAllSameGrade =
+    !!ofsted &&
+    !isReportCard &&
+    oeifAreas.length >= 3 &&
+    oeifAreas.every((a) => a.value === ofsted.overall_effectiveness);
 
   // National Attainment 8 baseline for the "Results Over Time" chart.
   const heroAtt8Nat = secondaryAvg.attainment_8_score ?? null;
@@ -404,7 +399,9 @@ export function SecondarySchoolDetailView({
                 )}
               </div>
               <p className={styles.ofstedDisclaimer}>
-                From September 2024, Ofsted no longer makes an overall effectiveness judgement in inspections.
+                {ofsted.grade_source === 'ungraded_carried_forward'
+                  ? 'This overall grade is carried forward from an earlier inspection — Ofsted has since visited without issuing a new overall grade. From September 2024, Ofsted no longer makes an overall effectiveness judgement.'
+                  : 'From September 2024, Ofsted no longer makes an overall effectiveness judgement in inspections.'}
               </p>
               {oeifAllSameGrade ? (
                 <p className={styles.ofstedAllSame}>
@@ -412,15 +409,7 @@ export function SecondarySchoolDetailView({
                 </p>
               ) : (
                 <div className={styles.metricsGrid}>
-                  {[
-                    { label: 'Quality of Teaching', value: ofsted.quality_of_education },
-                    { label: 'Behaviour in School', value: ofsted.behaviour_attitudes },
-                    { label: 'Pupils\' Wider Development', value: ofsted.personal_development },
-                    { label: 'School Leadership', value: ofsted.leadership_management },
-                    ...(ofsted.early_years_provision != null
-                      ? [{ label: 'Early Years (Reception)', value: ofsted.early_years_provision }]
-                      : []),
-                  ].map(({ label, value }) => value != null && (
+                  {oeifAreas.map(({ label, value }) => (
                     <div key={label} className={styles.metricCard}>
                       <div className={styles.metricLabel}>{label}</div>
                       <div className={`${styles.metricValue} ${styles[`ofstedGrade${value}`]}`}>
@@ -468,7 +457,8 @@ export function SecondarySchoolDetailView({
 
           {p8Suspended && (
             <div className={styles.p8Banner}>
-              Progress 8 scores for 2024/25 are not used for accountability purposes following the KS2 assessment disruption. Treat with caution.
+              Progress 8 isn&apos;t published for 2024/25: this GCSE year group sat no KS2 tests
+              (COVID), so DfE has no starting point to measure their progress from.
             </div>
           )}
 

nextjs-app/lib/utils.ts

@@ -680,6 +680,42 @@ export function buildSchoolSummary(
   return parts.join(', ') + '.';
 }
 
+// ─── Legacy (OEIF) sub-judgement areas ────────────────────────────────────────
+
+export interface OfstedLegacyArea {
+  label: string;
+  value: number;
+}
+
+/**
+ * The published OEIF sub-judgement areas for the legacy Ofsted layout, in
+ * display order. Only real grades (1–4) are returned: Ofsted's sentinel
+ * codes for "not applicable / no judgement" (9, and any 0/8 variants) and
+ * nulls are filtered out, so a cryptic "9" never renders as a rating.
+ * Sixth Form provision is included where a school has one — it was
+ * previously dropped from the detail grid entirely.
+ */
+export function ofstedLegacyAreas(ofsted: {
+  quality_of_education?: number | null;
+  behaviour_attitudes?: number | null;
+  personal_development?: number | null;
+  leadership_management?: number | null;
+  early_years_provision?: number | null;
+  sixth_form_provision?: number | null;
+}): OfstedLegacyArea[] {
+  const candidates: Array<[string, number | null | undefined]> = [
+    ['Quality of Teaching', ofsted.quality_of_education],
+    ['Behaviour in School', ofsted.behaviour_attitudes],
+    ["Pupils' Wider Development", ofsted.personal_development],
+    ['School Leadership', ofsted.leadership_management],
+    ['Early Years (Reception)', ofsted.early_years_provision],
+    ['Sixth Form', ofsted.sixth_form_provision],
+  ];
+  return candidates
+    .filter((c): c is [string, number] => c[1] != null && c[1] >= 1 && c[1] <= 4)
+    .map(([label, value]) => ({ label, value }));
+}
+
 // ─── List-level Ofsted badge ──────────────────────────────────────────────────
 
 export interface OfstedListBadge {