Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions SAPSec.Web/Areas/Primary/Views/School/Ks2.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,27 @@
@model SchoolDetails
@{
Layout = "_Layout";
ViewData["Title"] = "KS2 performance measures";
}

<span class="govuk-caption-xl">@Model.Name</span>
<h1 class="govuk-heading-xl">KS2</h1>
<div class="app-school-page">
<span class="govuk-caption-xl">@Model.Name</span>
<h1 class="govuk-heading-xl">@ViewData["Title"]</h1>

<p class="govuk-body">
KS2 information for this primary school will appear here.
</p>
<p class="govuk-body">
Compare this school's KS2 performance measures with:
</p>

<ul class="govuk-list govuk-list--bullet">
<li><b>50</b> similar primary phase schools (including all-throughs)</li>
<li>the local authority average</li>
<li>the national average</li>
</ul>

<p class="govuk-body">
Find out <a href="/school/primary/@Model.Urn/what-is-a-similar-school" class="govuk-link">how DfE defines what a similar school is</a>.
</p>

<partial name="_Ks2ProgressRWMInfo" />

</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<section class="govuk-!-margin-bottom-7 govuk-!-margin-top-9 app-progress" aria-labelledby="progress-rwm-heading">
<h2 class="govuk-heading-m" id="progress-rwm-heading">Progress score in reading, writing and maths</h2>
<div class="app-message-panel">
<p class="govuk-body govuk-!-margin-bottom-0">
There are no KS1-KS2 progress scores for the academic years 2023/24 and 2024/25, as there is no KS1 baseline available due to COVID-19 disruption.
</p>
</div>
</section>
3 changes: 3 additions & 0 deletions SAPSec.Web/Areas/Primary/Views/_ViewImports.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, SmartBreadcrumbs
@addTagHelper *, SAPSec.Web
6 changes: 3 additions & 3 deletions SAPSec.Web/AssetSrc/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1128,14 +1128,14 @@ $app-ks4-color-track: #f3f2f1;
transform: translateX(-50%);
}

.app-ks4-message-panel {
.app-message-panel {
border-left: 5px solid $app-ks4-color-border;
padding-left: 14px;
max-width: 660px;
margin-top: 4px;
}

.app-ks4-school-page {
.app-school-page {
--chart-color-school: #ca357c;
--chart-color-similar-schools: #2a1950;
--chart-color-local-authority: #5694ca;
Expand All @@ -1148,7 +1148,7 @@ $app-ks4-color-track: #f3f2f1;
padding-bottom: 0.1rem;
}

.app-ks4-progress {
.app-progress {
background: $app-ks4-color-panel-bg;
padding: 16px;
}
Expand Down
2 changes: 1 addition & 1 deletion SAPSec.Web/Views/School/Ks4CoreSubjects.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
string SimilarSchoolsUrl() => Url.Action("ViewSimilarSchools", "SimilarSchools", new { urn = Model.SchoolDetails.Urn }) ?? $"/school/{Model.SchoolDetails.Urn}/view-similar-schools";
string SimilarSchoolComparisonUrl(string similarSchoolUrn) => Url.Action("Index", "SimilarSchoolsComparison", new { urn = Model.SchoolDetails.Urn, similarSchoolUrn }) ?? $"/school/{Model.SchoolDetails.Urn}/view-similar-schools/{similarSchoolUrn}";
}
<div class="app-ks4-school-page">
<div class="app-school-page">
<span class="govuk-caption-xl">@Model.SchoolDetails.Name</span>
<h1 class="govuk-heading-xl">@ViewData["Title"]</h1>

Expand Down
2 changes: 1 addition & 1 deletion SAPSec.Web/Views/School/Ks4HeadlineMeasures.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
string SimilarSchoolsUrl() => Url.Action("ViewSimilarSchools", "SimilarSchools", new { urn = Model.SchoolDetails.Urn }) ?? $"/school/{Model.SchoolDetails.Urn}/view-similar-schools";
string SimilarSchoolComparisonUrl(string similarSchoolUrn) => Url.Action("Index", "SimilarSchoolsComparison", new { urn = Model.SchoolDetails.Urn, similarSchoolUrn }) ?? $"/school/{Model.SchoolDetails.Urn}/view-similar-schools/{similarSchoolUrn}";
}
<div class="app-ks4-school-page">
<div class="app-school-page">
<span class="govuk-caption-xl">@Model.SchoolDetails.Name</span>
<h1 class="govuk-heading-xl">@ViewData["Title"]</h1>

Expand Down
4 changes: 2 additions & 2 deletions SAPSec.Web/Views/Shared/_Ks4Progress8Info.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="govuk-!-margin-bottom-7 govuk-!-margin-top-9 app-ks4-progress" aria-labelledby="progress8-heading">
<section class="govuk-!-margin-bottom-7 govuk-!-margin-top-9 app-progress" aria-labelledby="progress8-heading">
<h2 class="govuk-heading-m" id="progress8-heading">Progress 8</h2>
<details class="govuk-details app-ks4-copy govuk-!-margin-bottom-3 app-ks4-details" data-module="govuk-details">
<summary class="govuk-details__summary">
Expand All @@ -22,7 +22,7 @@
</div>
</details>

<div class="app-ks4-message-panel">
<div class="app-message-panel">
<p class="govuk-body govuk-!-margin-bottom-0">
There are no Progress 8 scores for the academic years 2024 to 2025 and 2025 to 2026, as there is no KS2 assessment data available to calculate the baseline. This is due to COVID-19 disruption.
</p>
Expand Down
Loading