diff --git a/SAPSec.Web/Areas/Primary/Views/School/Ks2.cshtml b/SAPSec.Web/Areas/Primary/Views/School/Ks2.cshtml index eedd9f83..3561db50 100644 --- a/SAPSec.Web/Areas/Primary/Views/School/Ks2.cshtml +++ b/SAPSec.Web/Areas/Primary/Views/School/Ks2.cshtml @@ -2,11 +2,27 @@ @model SchoolDetails @{ Layout = "_Layout"; + ViewData["Title"] = "KS2 performance measures"; } -@Model.Name -

KS2

+
+ @Model.Name +

@ViewData["Title"]

-

- KS2 information for this primary school will appear here. -

+

+ Compare this school's KS2 performance measures with: +

+ + + +

+ Find out how DfE defines what a similar school is. +

+ + + +
\ No newline at end of file diff --git a/SAPSec.Web/Areas/Primary/Views/Shared/_Ks2ProgressRWMInfo.cshtml b/SAPSec.Web/Areas/Primary/Views/Shared/_Ks2ProgressRWMInfo.cshtml new file mode 100644 index 00000000..8b3cc4f6 --- /dev/null +++ b/SAPSec.Web/Areas/Primary/Views/Shared/_Ks2ProgressRWMInfo.cshtml @@ -0,0 +1,8 @@ +
+

Progress score in reading, writing and maths

+
+

+ 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. +

+
+
diff --git a/SAPSec.Web/Areas/Primary/Views/_ViewImports.cshtml b/SAPSec.Web/Areas/Primary/Views/_ViewImports.cshtml new file mode 100644 index 00000000..bf01c524 --- /dev/null +++ b/SAPSec.Web/Areas/Primary/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, SmartBreadcrumbs +@addTagHelper *, SAPSec.Web \ No newline at end of file diff --git a/SAPSec.Web/AssetSrc/scss/main.scss b/SAPSec.Web/AssetSrc/scss/main.scss index 093a3d04..e275bf16 100644 --- a/SAPSec.Web/AssetSrc/scss/main.scss +++ b/SAPSec.Web/AssetSrc/scss/main.scss @@ -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; @@ -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; } diff --git a/SAPSec.Web/Views/School/Ks4CoreSubjects.cshtml b/SAPSec.Web/Views/School/Ks4CoreSubjects.cshtml index c4fdecb9..bdf54119 100644 --- a/SAPSec.Web/Views/School/Ks4CoreSubjects.cshtml +++ b/SAPSec.Web/Views/School/Ks4CoreSubjects.cshtml @@ -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}"; } -
+
@Model.SchoolDetails.Name

@ViewData["Title"]

diff --git a/SAPSec.Web/Views/School/Ks4HeadlineMeasures.cshtml b/SAPSec.Web/Views/School/Ks4HeadlineMeasures.cshtml index fb51e86f..c0bf9fa1 100644 --- a/SAPSec.Web/Views/School/Ks4HeadlineMeasures.cshtml +++ b/SAPSec.Web/Views/School/Ks4HeadlineMeasures.cshtml @@ -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}"; } -
+
@Model.SchoolDetails.Name

@ViewData["Title"]

diff --git a/SAPSec.Web/Views/Shared/_Ks4Progress8Info.cshtml b/SAPSec.Web/Views/Shared/_Ks4Progress8Info.cshtml index 07b7c9c9..c8a71cc5 100644 --- a/SAPSec.Web/Views/Shared/_Ks4Progress8Info.cshtml +++ b/SAPSec.Web/Views/Shared/_Ks4Progress8Info.cshtml @@ -1,4 +1,4 @@ -
+

Progress 8

@@ -22,7 +22,7 @@
-
+

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.