refactor(primary): move gender split out of header into Pupils & Inclusion
Build and Push Docker Images / Build Backend (FastAPI) (push) Successful in 12s
Build and Push Docker Images / Build Frontend (Next.js) (push) Successful in 48s
Build and Push Docker Images / Build Pipeline (Meltano + dbt + Airflow) (push) Successful in 12s
Build and Push Docker Images / Trigger Portainer Update (push) Successful in 1s
Build and Push Docker Images / Build Backend (FastAPI) (push) Successful in 12s
Build and Push Docker Images / Build Frontend (Next.js) (push) Successful in 48s
Build and Push Docker Images / Build Pipeline (Meltano + dbt + Airflow) (push) Successful in 12s
Build and Push Docker Images / Trigger Portainer Update (push) Successful in 1s
Header "Pupils" line reverts to plain inline text matching Headteacher and website weight. Gender split lives in Pupils & Inclusion as a card alongside pupil premium / EAL / SEN support — peers of similar weight. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -83,95 +83,58 @@
|
|||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Pupils block — the "Pupils: N" inline text is upgraded to a richer
|
/* Gender split card — sits in the Pupils & Inclusion heroStatGrid */
|
||||||
display whenever we have census gender data and the school is Mixed. */
|
.genderSplitValue {
|
||||||
.pupilsBlock {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.7rem;
|
|
||||||
padding: 0.3rem 0.65rem 0.3rem 0.4rem;
|
|
||||||
background: rgba(243, 237, 228, 0.5);
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pupilsFigure {
|
|
||||||
font-family: var(--font-playfair), 'Playfair Display', serif;
|
|
||||||
font-size: 1.6rem;
|
|
||||||
font-weight: 700;
|
|
||||||
line-height: 1;
|
|
||||||
letter-spacing: -0.01em;
|
|
||||||
color: var(--text-primary, #1a1612);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pupilsInfo {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 0.15rem;
|
|
||||||
min-width: 140px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pupilsLegend {
|
|
||||||
font-size: 0.72rem;
|
|
||||||
color: var(--text-muted, #6d685f);
|
|
||||||
font-weight: 500;
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pupilsCapacity {
|
|
||||||
color: var(--text-muted, #6d685f);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pupilsSplitRow {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: baseline;
|
align-items: baseline;
|
||||||
gap: 0.35rem;
|
gap: 0.3rem;
|
||||||
font-size: 0.75rem;
|
font-family: var(--font-playfair), "Playfair Display", Georgia, serif;
|
||||||
font-weight: 600;
|
font-size: 1.55rem;
|
||||||
|
font-weight: 700;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pupilsSplitGirls {
|
.genderSplitGirls {
|
||||||
color: #b45778;
|
color: #b45778;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pupilsSplitBoys {
|
.genderSplitBoys {
|
||||||
color: var(--accent-teal, #2d7d7d);
|
color: var(--accent-teal, #2d7d7d);
|
||||||
}
|
}
|
||||||
|
|
||||||
.pupilsSplitSep {
|
.genderSplitLabel {
|
||||||
color: var(--border-color, #e5dfd5);
|
font-family: var(--font-body, inherit);
|
||||||
font-weight: 400;
|
font-size: 0.78rem;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--text-muted, #6d685f);
|
||||||
|
letter-spacing: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pupilsBar {
|
.genderSplitSep {
|
||||||
|
color: var(--border-color, #c8beb0);
|
||||||
|
font-weight: 400;
|
||||||
|
font-size: 1.2rem;
|
||||||
|
padding: 0 0.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.genderBar {
|
||||||
display: flex;
|
display: flex;
|
||||||
height: 4px;
|
height: 6px;
|
||||||
border-radius: 999px;
|
border-radius: 999px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background: var(--border-color, #e5dfd5);
|
background: var(--border-color, #e5dfd5);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-width: 140px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.pupilsBarGirls {
|
.genderBarGirls {
|
||||||
background: #b45778;
|
background: #b45778;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pupilsBarBoys {
|
.genderBarBoys {
|
||||||
background: var(--accent-teal, #2d7d7d);
|
background: var(--accent-teal, #2d7d7d);
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 640px) {
|
|
||||||
.pupilsBlock {
|
|
||||||
display: flex;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.pupilsInfo {
|
|
||||||
flex: 1;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions {
|
.actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
|
|||||||
@@ -109,11 +109,19 @@ export function SchoolDetailView({
|
|||||||
return `This school is in one of England's less deprived areas (decile ${decile}/10).`;
|
return `This school is in one of England's less deprived areas (decile ${decile}/10).`;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Gender split availability (only meaningful for Mixed schools with census data)
|
||||||
|
const isMixedSchool = schoolInfo.gender === 'Mixed' || schoolInfo.gender == null;
|
||||||
|
const hasGenderSplit = isMixedSchool
|
||||||
|
&& census?.female_pupils != null
|
||||||
|
&& census?.male_pupils != null
|
||||||
|
&& (census.female_pupils + census.male_pupils) > 0;
|
||||||
|
|
||||||
// Guard for Pupils & Inclusion — only show if at least one metric is available
|
// Guard for Pupils & Inclusion — only show if at least one metric is available
|
||||||
const hasInclusionData = (latestResults?.disadvantaged_pct != null)
|
const hasInclusionData = (latestResults?.disadvantaged_pct != null)
|
||||||
|| (latestResults?.eal_pct != null)
|
|| (latestResults?.eal_pct != null)
|
||||||
|| (latestResults?.sen_support_pct != null)
|
|| (latestResults?.sen_support_pct != null)
|
||||||
|| senDetail != null;
|
|| senDetail != null
|
||||||
|
|| hasGenderSplit;
|
||||||
|
|
||||||
const hasSchoolLife = absenceData != null || census?.class_size_avg != null;
|
const hasSchoolLife = absenceData != null || census?.class_size_avg != null;
|
||||||
const hasPhonics = phonics != null && phonics.year1_phonics_pct != null;
|
const hasPhonics = phonics != null && phonics.year1_phonics_pct != null;
|
||||||
@@ -236,54 +244,14 @@ export function SchoolDetailView({
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{(() => {
|
{(() => {
|
||||||
const censusTotal = census?.total_pupils ?? null;
|
const total = census?.total_pupils ?? latestResults?.total_pupils ?? null;
|
||||||
const female = census?.female_pupils ?? null;
|
if (total == null) return null;
|
||||||
const male = census?.male_pupils ?? null;
|
return (
|
||||||
const total = censusTotal ?? latestResults?.total_pupils ?? null;
|
<span className={styles.headerDetail}>
|
||||||
const isMixed = schoolInfo.gender === 'Mixed' || schoolInfo.gender == null;
|
<strong>Pupils:</strong> {total.toLocaleString()}
|
||||||
const hasSplit = isMixed && female != null && male != null && female + male > 0;
|
{schoolInfo.capacity != null && ` (capacity: ${schoolInfo.capacity})`}
|
||||||
|
</span>
|
||||||
if (hasSplit && total != null) {
|
);
|
||||||
const sum = female! + male!;
|
|
||||||
const girlsPct = Math.round((female! / sum) * 100);
|
|
||||||
const boysPct = 100 - girlsPct;
|
|
||||||
return (
|
|
||||||
<div className={styles.pupilsBlock}>
|
|
||||||
<div className={styles.pupilsFigure}>{total.toLocaleString()}</div>
|
|
||||||
<div className={styles.pupilsInfo}>
|
|
||||||
<div className={styles.pupilsLegend}>
|
|
||||||
pupils
|
|
||||||
{schoolInfo.capacity != null && (
|
|
||||||
<span className={styles.pupilsCapacity}> · capacity {schoolInfo.capacity.toLocaleString()}</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className={styles.pupilsSplitRow}>
|
|
||||||
<span className={styles.pupilsSplitGirls}>{girlsPct}% girls</span>
|
|
||||||
<span className={styles.pupilsSplitSep}>·</span>
|
|
||||||
<span className={styles.pupilsSplitBoys}>{boysPct}% boys</span>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
className={styles.pupilsBar}
|
|
||||||
role="img"
|
|
||||||
aria-label={`Gender split: ${girlsPct}% girls, ${boysPct}% boys`}
|
|
||||||
>
|
|
||||||
<span className={styles.pupilsBarGirls} style={{ width: `${girlsPct}%` }} />
|
|
||||||
<span className={styles.pupilsBarBoys} style={{ width: `${boysPct}%` }} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (total != null) {
|
|
||||||
return (
|
|
||||||
<span className={styles.headerDetail}>
|
|
||||||
<strong>Pupils:</strong> {total.toLocaleString()}
|
|
||||||
{schoolInfo.capacity != null && ` (capacity: ${schoolInfo.capacity})`}
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
})()}
|
})()}
|
||||||
{schoolInfo.trust_name && (
|
{schoolInfo.trust_name && (
|
||||||
<span className={styles.headerDetail}>
|
<span className={styles.headerDetail}>
|
||||||
@@ -962,6 +930,35 @@ export function SchoolDetailView({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{hasGenderSplit && (() => {
|
||||||
|
const female = census!.female_pupils!;
|
||||||
|
const male = census!.male_pupils!;
|
||||||
|
const girlsPct = Math.round((female / (female + male)) * 100);
|
||||||
|
const boysPct = 100 - girlsPct;
|
||||||
|
return (
|
||||||
|
<div className={styles.heroStatCard}>
|
||||||
|
<div className={styles.heroStatLabel}>Boys and girls</div>
|
||||||
|
<div className={styles.genderSplitValue}>
|
||||||
|
<span className={styles.genderSplitGirls}>{girlsPct}%</span>
|
||||||
|
<span className={styles.genderSplitLabel}>girls</span>
|
||||||
|
<span className={styles.genderSplitSep}>·</span>
|
||||||
|
<span className={styles.genderSplitBoys}>{boysPct}%</span>
|
||||||
|
<span className={styles.genderSplitLabel}>boys</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
className={styles.genderBar}
|
||||||
|
role="img"
|
||||||
|
aria-label={`Gender split: ${girlsPct}% girls, ${boysPct}% boys`}
|
||||||
|
>
|
||||||
|
<span className={styles.genderBarGirls} style={{ width: `${girlsPct}%` }} />
|
||||||
|
<span className={styles.genderBarBoys} style={{ width: `${boysPct}%` }} />
|
||||||
|
</div>
|
||||||
|
<div className={styles.heroStatHint}>
|
||||||
|
{female.toLocaleString()} girls, {male.toLocaleString()} boys
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})()}
|
||||||
</div>
|
</div>
|
||||||
{senDetail && (
|
{senDetail && (
|
||||||
<>
|
<>
|
||||||
|
|||||||
Reference in New Issue
Block a user