Create ofsted pages #641

nwarms · 2024-11-28T16:17:37Z

User Story 183586: Build: New Ofsted data (iteration 1 - Add Ofsted pages)

Create the ofsted page in the service nav and ofsted pages in the sub nav of the page.

Changes

Create CategoriesOfConcernsExtensions.cs and SafeguardingScoreExtensions.cs with display and sort string methods
Updated OfstedRatingScoreExtensions.cs with the new ofsted ratings
Deleted the old ofsted pages from the Academies section
Created CurrentRatings.cshtml, ImportantDates.cshtml, PreviousRatings.cshtml and SafeguardingAndConcerns.cshtml
Created OfstedAreaModel.cs for all the page models in the ofsted area to use
Created the _OfstedLayout.cshtml and _BeforeOrAfterTag.cshtml for use across the Ofsted pages
Updated the TrustAreaModel.cs to add the Osfted pages to navigation
Added tests for these changes

Screenshots of UI changes

Before

After

Checklist

Pull request attached to the appropriate user story in Azure DevOps
ADR decision log updated (if needed)
Release notes added to CHANGELOG.md
Testing complete - all manual and automated tests pass

… was added compared to when the inspection took place

sonarcloud · 2024-11-28T16:20:32Z

Quality Gate passed

Issues
0 New issues
4 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

dynamictulip · 2024-11-28T16:24:50Z

DfE.FindInformationAcademiesTrusts/Extensions/CategoriesOfConcernExtensions.cs

+        return rating switch
+        {
+            CategoriesOfConcern.None => "None",
+            CategoriesOfConcern.SpecialMeasures => "Special Measures",


Suggested change

CategoriesOfConcern.SpecialMeasures => "Special Measures",

CategoriesOfConcern.SpecialMeasures => "Special measures",

dynamictulip · 2024-11-28T16:25:01Z

DfE.FindInformationAcademiesTrusts/Extensions/CategoriesOfConcernExtensions.cs

+        {
+            CategoriesOfConcern.None => "None",
+            CategoriesOfConcern.SpecialMeasures => "Special Measures",
+            CategoriesOfConcern.SeriousWeakness => "Serious Weakness",


Suggested change

CategoriesOfConcern.SeriousWeakness => "Serious Weakness",

CategoriesOfConcern.SeriousWeakness => "Serious weakness",

dynamictulip · 2024-11-28T16:25:12Z

DfE.FindInformationAcademiesTrusts/Extensions/CategoriesOfConcernExtensions.cs

+            CategoriesOfConcern.None => "None",
+            CategoriesOfConcern.SpecialMeasures => "Special Measures",
+            CategoriesOfConcern.SeriousWeakness => "Serious Weakness",
+            CategoriesOfConcern.NoticeToImprove => "Notice To Improve",


Suggested change

CategoriesOfConcern.NoticeToImprove => "Notice To Improve",

CategoriesOfConcern.NoticeToImprove => "Notice to improve",

dynamictulip · 2024-11-28T16:25:33Z

DfE.FindInformationAcademiesTrusts/Extensions/OfstedRatingScoreExtensions.cs

@@ -26,8 +28,9 @@ public static string ToDisplayString(this OfstedRatingScore rating)
            OfstedRatingScore.RequiresImprovement => "Requires improvement",
            OfstedRatingScore.Inadequate => "Inadequate",
            OfstedRatingScore.None => "Not yet inspected",
+            OfstedRatingScore.NoJudgement => "No Judgement",


Suggested change

OfstedRatingScore.NoJudgement => "No Judgement",

OfstedRatingScore.NoJudgement => "No judgement",

dynamictulip · 2024-11-28T16:25:44Z

DfE.FindInformationAcademiesTrusts/Extensions/SafeguardingScoreExtensions.cs

+            SafeguardingScore.None => "None",
+            SafeguardingScore.Yes => "Yes",
+            SafeguardingScore.No => "No",
+            SafeguardingScore.NotRecorded => "Not Recorded",


Suggested change

SafeguardingScore.NotRecorded => "Not Recorded",

SafeguardingScore.NotRecorded => "Not recorded",

dynamictulip · 2024-11-28T16:26:06Z

CHANGELOG.md

+
+### Removed
+
+- Remove acadmies in trust ofsted page


Suggested change

- Remove acadmies in trust ofsted page

- Remove academies in trust Ofsted page

dynamictulip · 2024-11-28T16:28:08Z

DfE.FindInformationAcademiesTrusts/Pages/Trusts/Ofsted/CurrentRatings.cshtml

+    <caption class="govuk-table__caption govuk-table__caption--m">Current ratings</caption>
+    <thead class="govuk-table__head">
+      <tr class="govuk-table__row">
+        <th scope="col" class="govuk-table__header" aria-sort="ascending" data-testid="ofsted-current-ratings-school-name-header">


Missing govuk-body (which leads to browser font re-sizing a11y issues)

Same on all tables for the school name column

dynamictulip · 2024-11-28T16:29:21Z

DfE.FindInformationAcademiesTrusts/Pages/Trusts/Ofsted/CurrentRatings.cshtml

+        <th scope="col" class="govuk-table__header govuk-body column-header-ofsted-rating" aria-sort="none" data-testid="ofsted-current-ratings-early-years-provision-header">
+          Early years provision
+        </th>
+        <th scope="col" class="govuk-table__header govuk-body column-header-ofsted-rating" aria-sort="none" data-testid="ofsted-current-ratings-sixth-form-provision-header">


We seem to be overriding the width of most columns on most tables but overrides should be the exception rather than the norm.
I think it would be better to only override the width of the school name column and before/after joining column if they need to be specific widths

dynamictulip · 2024-11-28T16:30:48Z

DfE.FindInformationAcademiesTrusts/Extensions/CategoriesOfConcernExtensions.cs

+            CategoriesOfConcern.SpecialMeasures => "Special Measures",
+            CategoriesOfConcern.SeriousWeakness => "Serious Weakness",
+            CategoriesOfConcern.NoticeToImprove => "Notice To Improve",
+            _ => "Unknown"


From old PR: #634 (comment)

dynamictulip · 2024-11-28T17:12:20Z

DfE.FindInformationAcademiesTrusts/Pages/Trusts/Ofsted/PreviousRatings.cshtml

+            @academy.PreviousOfstedRating.SixthFormProvision.ToDisplayString()
+          </td>
+          <td class="govuk-table__cell govuk-body" data-sort-value="@(academy.IsPreviousInspectionAfterJoining ? "After" : "Before")" data-testid="ofsted-previous-ratings-before-or-after-joining ">
+            @await Html.PartialAsync("_BeforeOrAfterTag", academy.IsCurrentInspectionAfterJoining)


Suggested change

@await Html.PartialAsync("_BeforeOrAfterTag", academy.IsCurrentInspectionAfterJoining)

@await Html.PartialAsync("_BeforeOrAfterTag", academy.IsPreviousInspectionAfterJoining)

dynamictulip · 2024-11-28T17:14:07Z

DfE.FindInformationAcademiesTrusts/Pages/Trusts/Ofsted/SafeguardingAndConcerns.cshtml

+          <td class="govuk-table__cell govuk-body" data-sort-value="@academy.CurrentOfstedRating.CategoryOfConcern.ToDataSortValue()" data-testid="category-of-concern" data-testid="ofsted-safeguarding-and-concerns-category-of-concern">
+            @academy.CurrentOfstedRating.CategoryOfConcern.ToDisplayString()
+          </td>
+          <td class="govuk-table__cell govuk-body" data-sort-value="@(academy.IsPreviousInspectionAfterJoining ? "After" : "Before")" data-testid="ofsted-safeguarding-and-concerns-before-or-after-joining">


Suggested change

<td class="govuk-table__cell govuk-body" data-sort-value="@(academy.IsPreviousInspectionAfterJoining ? "After" : "Before")" data-testid="ofsted-safeguarding-and-concerns-before-or-after-joining">

<td class="govuk-table__cell govuk-body" data-sort-value="@(academy.IsCurrentInspectionAfterJoining ? "After" : "Before")" data-testid="ofsted-safeguarding-and-concerns-before-or-after-joining">

dynamictulip · 2024-11-28T18:06:41Z

DfE.FindInformationAcademiesTrusts/Pages/Trusts/Ofsted/_BeforeOrAfterTag.cshtml

@@ -0,0 +1,13 @@
+@model bool


For readability and to enable extra states (like not inspected) we could use an enum instead of a bool to store the before/after state

public enum BeforeOrAfterJoining { Before, After }

nwarms added 13 commits November 28, 2024 16:15

Create ofsted area model

26c0ded

Create the ofsted layout

ae5b442

Create new ofsted pages

0b7dc38

Update TrustsAreaModel to add ofsted to the navigations links

1d693bc

Create the before and after tag partial

88fbd40

Update stylings for table

07ada4e

Create CategoriesOfConcernExtensions

819a1e3

Create SafeguardingAndConcernsExtensions

d8d5945

Update OfstedRatingScoreExtensions with new scores

8402bfc

Update AcademyOfstedServiceModel with bools to check when the academy…

b07b3fa

… was added compared to when the inspection took place

Remove the old ofsted pages from the academies area

eb856ab

Add and update tests for the new ofsted pages

59be4b3

Update CHANGELOG

30ac718

nwarms requested review from dneed-nimble and dynamictulip as code owners November 28, 2024 16:17

nwarms temporarily deployed to development November 28, 2024 16:17 — with GitHub Actions Inactive

nwarms temporarily deployed to development November 28, 2024 16:23 — with GitHub Actions Inactive

dynamictulip reviewed Nov 28, 2024

View reviewed changes

nwarms temporarily deployed to development November 28, 2024 16:25 — with GitHub Actions Inactive

dynamictulip reviewed Nov 28, 2024

View reviewed changes

dynamictulip mentioned this pull request Nov 28, 2024

Create ofsted pages #634

Closed

4 tasks

nwarms deployed to development November 28, 2024 16:26 — with GitHub Actions Active

dynamictulip reviewed Nov 28, 2024

View reviewed changes

nwarms had a problem deploying to development November 28, 2024 16:28 — with GitHub Actions Failure

dynamictulip reviewed Nov 28, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create ofsted pages #641

Create ofsted pages #641

nwarms commented Nov 28, 2024

sonarcloud bot commented Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

dynamictulip Nov 28, 2024

	CategoriesOfConcern.SpecialMeasures => "Special Measures",
	CategoriesOfConcern.SpecialMeasures => "Special measures",

	CategoriesOfConcern.SeriousWeakness => "Serious Weakness",
	CategoriesOfConcern.SeriousWeakness => "Serious weakness",

	CategoriesOfConcern.NoticeToImprove => "Notice To Improve",
	CategoriesOfConcern.NoticeToImprove => "Notice to improve",

	OfstedRatingScore.NoJudgement => "No Judgement",
	OfstedRatingScore.NoJudgement => "No judgement",

	SafeguardingScore.NotRecorded => "Not Recorded",
	SafeguardingScore.NotRecorded => "Not recorded",

	- Remove acadmies in trust ofsted page
	- Remove academies in trust Ofsted page

	@await Html.PartialAsync("_BeforeOrAfterTag", academy.IsCurrentInspectionAfterJoining)
	@await Html.PartialAsync("_BeforeOrAfterTag", academy.IsPreviousInspectionAfterJoining)

	<td class="govuk-table__cell govuk-body" data-sort-value="@(academy.IsPreviousInspectionAfterJoining ? "After" : "Before")" data-testid="ofsted-safeguarding-and-concerns-before-or-after-joining">
	<td class="govuk-table__cell govuk-body" data-sort-value="@(academy.IsCurrentInspectionAfterJoining ? "After" : "Before")" data-testid="ofsted-safeguarding-and-concerns-before-or-after-joining">

Create ofsted pages #641

Are you sure you want to change the base?

Create ofsted pages #641

Conversation

nwarms commented Nov 28, 2024

Changes

Screenshots of UI changes

Before

After

Checklist

sonarcloud bot commented Nov 28, 2024

Quality Gate passed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment