Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove AO required #996

Merged
merged 6 commits into from
Feb 21, 2024
Merged

Remove AO required #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
acc7bcf
Remove AO required
Feb 20, 2024
2161a96
Merge branch 'main' into feature/156877-remove-ao-required
dneed-nimble Feb 21, 2024
8eb13a4
Updated tests
Feb 21, 2024
c9228ba
Merge branch 'feature/156877-remove-ao-required' of https://github.co…
Feb 21, 2024
287ca10
Merge branch 'main' into feature/156877-remove-ao-required
dneed-nimble Feb 21, 2024
7550606
Merge branch 'main' into feature/156877-remove-ao-required
dneed-nimble Feb 21, 2024
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
3 changes: 1 addition & 2 deletions Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
public int Id { get; set; }
public int? Urn { get; set; }
public int? FormAMatProjectId { get; set; }
public int? FormAMatProjectId { get; set; }
public DateTime CreatedOn { get; set; }
public string SchoolName { get; set; }
public string SchoolPhase { get; set; }
Expand All @@ -32,7 +32,6 @@
public string Author { get; set; }
public string Version { get; set; }
public string ClearedBy { get; set; }
public string AcademyOrderRequired { get; set; }
public string PreviousHeadTeacherBoardDateQuestion { get; set; }
public DateTime? PreviousHeadTeacherBoardDate { get; set; }
public string PreviousHeadTeacherBoardLink { get; set; }
Expand Down Expand Up @@ -60,7 +59,7 @@

// External Application Form
public bool? ExternalApplicationFormSaved { get; set; }
public string? ExternalApplicationFormUrl { get; set; }

Check warning on line 62 in Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs

View workflow job for this annotation

GitHub Actions / build 

The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.

// School Overview
public string PublishedAdmissionNumber { get; set; }
Expand Down
1 change: 0 additions & 1 deletion Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/UpdateAcademyConversionProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class UpdateAcademyConversionProject
public string RecommendationForProject { get; set; }
public string Author { get; set; }
public string ClearedBy { get; set; }
public string AcademyOrderRequired { get; set; }
public string Form7Received { get; set; }
public DateTime? Form7ReceivedDate { get; set; }
public DateTime? ProposedAcademyOpeningDate { get; set; }
Expand Down
1 change: 0 additions & 1 deletion Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Models/HtbTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public void ItBuildsTheSchoolAndTrustInformationAndProjectDatesAndSchoolPerforma
Assert.Equal(_project.LocalAuthority, _template.LocalAuthority);

Assert.Equal(_project.RecommendationForProject, _template.RecommendationForProject);
Assert.Equal(_project.AcademyOrderRequired, _template.AcademyOrderRequired);
Assert.Equal($"{_project.AcademyTypeAndRoute} - {_project.ConversionSupportGrantAmount?.ToMoneyString(true)}", _template.AcademyTypeRouteAndConversionGrant);
Assert.Equal(_project.HeadTeacherBoardDate.ToDateString(), _template.HeadTeacherBoardDate);
Assert.Equal(_project.ProposedAcademyOpeningDate.ToDateString(), _template.ProposedAcademyOpeningDate);
Expand Down
15 changes: 7 additions & 8 deletions ....PrepareConversions.Tests/Pages/TaskList/PreviewHTBTemplate/PreviewHTBIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,6 @@ public async Task Should_display_school_and_trust_information_section()
Document.QuerySelector("#project-recommendation")!.TextContent.Should().Be(project.RecommendationForProject);
Document.QuerySelector("#author")!.TextContent.Should().Be(project.Author);
Document.QuerySelector("#cleared-by")!.TextContent.Should().Be(project.ClearedBy);
Document.QuerySelector("#academy-order-required")!.TextContent.Should().Be(project.AcademyOrderRequired);
Document.QuerySelector("#advisory-board-date")!.TextContent.Should().Be(project.HeadTeacherBoardDate.ToDateString());
Document.QuerySelector("#previous-advisory-board")!.TextContent.Should().Be(project.PreviousHeadTeacherBoardDate.ToDateString());
Document.QuerySelector("#school-name")!.TextContent.Should().Be(project.SchoolName);
Expand Down Expand Up @@ -606,7 +605,7 @@ public async Task Should_navigate_to_school_and_trust_prev_htb_page_and_back()

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/preview-project-template");

await NavigateAsync("Change", 20);
await NavigateAsync("Change", 19);
Document.Url.Should().Contain($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

await NavigateAsync("Back");
Expand Down Expand Up @@ -637,7 +636,7 @@ public async Task Should_navigate_to_school_and_trust_prev_htb_question_page_and

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/preview-project-template");

await NavigateAsync("Change", 20);
await NavigateAsync("Change", 19);
Document.Url.Should().Contain($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

Document.QuerySelector<IHtmlInputElement>("#previous-head-teacher-board-date-question")!.IsChecked.Should().BeFalse();
Expand Down Expand Up @@ -671,7 +670,7 @@ public async Task Should_navigate_to_school_and_trust_prev_htb_question_page_and

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/preview-project-template");

await NavigateAsync("Change", 20);
await NavigateAsync("Change", 19);
Document.Url.Should().Contain($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

Document.QuerySelector<IHtmlInputElement>("#previous-head-teacher-board-date-question")!.IsChecked.Should().BeFalse();
Expand All @@ -691,7 +690,7 @@ public async Task Should_navigate_to_school_and_trust_prev_htb_question_page_and

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/preview-project-template");

await NavigateAsync("Change", 20);
await NavigateAsync("Change", 19);
Document.Url.Should().Contain($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

await NavigateAsync("Back");
Expand All @@ -711,7 +710,7 @@ public async Task Should_navigate_to_school_and_trust_prev_htb_input_page_and_ba

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/preview-project-template");

await NavigateAsync("Change", 20);
await NavigateAsync("Change", 19);
Document.Url.Should().Contain($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

Document.QuerySelector<IHtmlInputElement>("#previous-head-teacher-board-date-question").IsChecked = true;
Expand Down Expand Up @@ -747,7 +746,7 @@ public async Task Should_navigate_to_school_and_trust_prev_htb_input_page_and_ba

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/preview-project-template");

await NavigateAsync("Change", 20);
await NavigateAsync("Change", 19);
Document.Url.Should().Contain($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

Document.QuerySelector<IHtmlInputElement>("#previous-head-teacher-board-date-question")!.IsChecked.Should().BeTrue();
Expand Down Expand Up @@ -793,7 +792,7 @@ public async Task Should_navigate_to_school_and_trust_prev_htb_input_page_and_ba

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/preview-project-template");

await NavigateAsync("Change", 20);
await NavigateAsync("Change", 19);
Document.Url.Should().Contain($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

Document.QuerySelector<IHtmlInputElement>("#previous-head-teacher-board-date-question")!.IsChecked.Should().BeTrue();
Expand Down
84 changes: 0 additions & 84 deletions ...ns.Tests/Pages/TaskList/SchoolAndTrustInformation/AcademyOrderRequiredIntegrationTests.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...epareConversions.Tests/Pages/TaskList/SchoolAndTrustInformation/AuthorIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public async Task Should_navigate_to_and_update_author()
});

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/conversion-details");
await NavigateAsync("Change", 7);
await NavigateAsync("Change", 6);

Document.Url.Should().BeUrl($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/author");
Document.QuerySelector<IHtmlInputElement>("#author")!.Value.Should().Be(project.Author);
Expand Down
2 changes: 1 addition & 1 deletion ...reConversions.Tests/Pages/TaskList/SchoolAndTrustInformation/ClearedByIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public async Task Should_navigate_to_and_update_cleared_by()
});

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/conversion-details");
await NavigateAsync("Change", 8);
await NavigateAsync("Change", 7);

Document.Url.Should().BeUrl($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/clear-head-teacher-board-template");

Expand Down
6 changes: 1 addition & 5 deletions ...es/TaskList/SchoolAndTrustInformation/ConfirmSchoolAndTrustInformationIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using AngleSharp.Html.Dom;
using Dfe.Academisation.ExtensionMethods;
using Dfe.PrepareConversions.Data.Models;
using Dfe.PrepareConversions.Extensions;
using Dfe.PrepareConversions.Tests.Extensions;
using FluentAssertions;
using System;
Expand Down Expand Up @@ -35,7 +34,6 @@ public async Task Should_be_in_progress_and_display_school_and_trust_information
Document.QuerySelector("#project-recommendation")!.TextContent.Should().Be(project.RecommendationForProject);
Document.QuerySelector("#author")!.TextContent.Should().Be(project.Author);
Document.QuerySelector("#cleared-by")!.TextContent.Should().Be(project.ClearedBy);
Document.QuerySelector("#academy-order-required")!.TextContent.Should().Be(project.AcademyOrderRequired);
Document.QuerySelector("#advisory-board-date")!.TextContent.Should().Be(project.HeadTeacherBoardDate.ToDateString());
Document.QuerySelector("#previous-advisory-board")!.TextContent.Should().Be(project.PreviousHeadTeacherBoardDate.ToDateString());
Document.QuerySelector("#school-name")!.TextContent.Should().Be(project.SchoolName);
Expand Down Expand Up @@ -117,7 +115,6 @@ public async Task Should_be_not_started_and_display_empty_when_school_and_trust_
project.RecommendationForProject = null;
project.Author = null;
project.ClearedBy = null;
project.AcademyOrderRequired = null;
project.HeadTeacherBoardDate = null;
project.PreviousHeadTeacherBoardDate = null;
project.SchoolName = null;
Expand Down Expand Up @@ -145,7 +142,6 @@ public async Task Should_be_not_started_and_display_empty_when_school_and_trust_
Document.QuerySelector("#project-recommendation")!.TextContent.Should().Be("Empty");
Document.QuerySelector("#author")!.TextContent.Should().Be("Empty");
Document.QuerySelector("#cleared-by")!.TextContent.Should().Be("Empty");
Document.QuerySelector("#academy-order-required")!.TextContent.Should().Be("Empty");
Document.QuerySelector("#advisory-board-date")!.TextContent.Should().Be("Empty");
Document.QuerySelector("#previous-advisory-board")!.TextContent.Should().Be("Empty");
Document.QuerySelector("#school-name")!.TextContent.Should().Be("Empty");
Expand Down Expand Up @@ -194,7 +190,7 @@ public async Task Should_show_error_summary_when_grant_amount_less_than_full_amo
await OpenAndConfirmPathAsync($"/task-list/{project.Id}");

await NavigateAsync("Conversion details");
await NavigateAsync("Change", 2);
await NavigateAsync("Change", 1);

await Document.QuerySelector<IHtmlFormElement>("form")!.SubmitAsync();

Expand Down
6 changes: 3 additions & 3 deletions .../Pages/TaskList/SchoolAndTrustInformation/PreviousHeadTeacherBoardDateIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public async Task Should_navigate_to_and_update_previous_head_teacher_board_date
});

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/conversion-details");
await NavigateAsync("Change", 6);
await NavigateAsync("Change", 5);

Document.Url.Should().BeUrl($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

Expand Down Expand Up @@ -83,7 +83,7 @@ public async Task Should_navigate_to_confirm_page_when_user_does_not_select_valu
});

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/conversion-details");
await NavigateAsync("Change", 6);
await NavigateAsync("Change", 5);

Document.Url.Should().BeUrl($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

Expand All @@ -109,7 +109,7 @@ public async Task Should_update_previous_head_teacher_board_date_question_and_na
.With(r => r.Urn, project.Urn));

await OpenAndConfirmPathAsync($"/task-list/{project.Id}/conversion-details");
await NavigateAsync("Change", 6);
await NavigateAsync("Change", 5);

Document.Url.Should().BeUrl($"/task-list/{project.Id}/confirm-school-trust-information-project-dates/previous-advisory-board");

Expand Down
3 changes: 0 additions & 3 deletions Dfe.PrepareConversions/Dfe.PrepareConversions/Models/AcademyConversionProjectPostModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ public class AcademyConversionProjectPostModel
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string ClearedBy { get; set; }

[BindProperty(Name = "academy-order-required")]
public string AcademyOrderRequired { get; set; }

[BindProperty(Name = "form-7-received")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string Form7Received { get; set; }
Expand Down
12 changes: 4 additions & 8 deletions Dfe.PrepareConversions/Dfe.PrepareConversions/Models/HtbTemplate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ public class HtbTemplate
[DocumentText("ClearedBy")]
public string ClearedBy { get; set; }

[DocumentText("AcademyOrderRequired")]
public string AcademyOrderRequired { get; set; }

[DocumentText("PreviousHeadTeacherBoardDate")]
public string PreviousHeadTeacherBoardDate { get; set; }

Expand Down Expand Up @@ -139,16 +136,16 @@ public class HtbTemplate

[DocumentText("PupilsAttendingGroup")]
public string PupilsAttendingGroup { get; set; }

[DocumentText("NumberOfAlternativeProvisionPlaces")]
public string NumberOfAlternativeProvisionPlaces { get; set; }

[DocumentText("NumberOfMedicalPlaces")]
public string NumberOfMedicalPlaces { get; set; }

[DocumentText("NumberOfPost16Places")]
public string NumberOfPost16Places { get; set; }

[DocumentText("NumberOfSENUnitPlaces")]
public string NumberOfSENUnitPlaces { get; set; }

Expand Down Expand Up @@ -256,7 +253,6 @@ public static HtbTemplate Build(AcademyConversionProject project,
Author = $"Author: {project.Author}",
Version = $"Version: {DateTime.Today.ToDateString()}",
ClearedBy = $"Cleared by: {project.ClearedBy}",
AcademyOrderRequired = project.AcademyOrderRequired,
PreviousHeadTeacherBoardDate = project.PreviousHeadTeacherBoardDate.HasValue ? project.PreviousHeadTeacherBoardDate.ToDateString() : "No",
PreviousHeadTeacherBoardLink = project.PreviousHeadTeacherBoardLink,
TrustReferenceNumber = project.TrustReferenceNumber,
Expand Down
1 change: 0 additions & 1 deletion Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ public static class SchoolAndTrustInformationSection
public static readonly LinkItem ProjectRecommendation = AddLinkItem(page: "/TaskList/SchoolAndTrustInformation/ProjectRecommendation");
public static readonly LinkItem Author = AddLinkItem(page: "/TaskList/SchoolAndTrustInformation/Author");
public static readonly LinkItem ClearedBy = AddLinkItem(page: "/TaskList/SchoolAndTrustInformation/ClearedBy");
public static readonly LinkItem AcademyOrderRequired = AddLinkItem(page: "/TaskList/SchoolAndTrustInformation/AcademyOrderRequired");
public static readonly LinkItem HeadTeacherBoardDate = AddLinkItem(page: "/TaskList/SchoolAndTrustInformation/AdvisoryBoardDate");
public static readonly LinkItem PreviousHeadTeacherBoardDateQuestion = AddLinkItem(page: "/TaskList/SchoolAndTrustInformation/PreviousAdvisoryBoard");
public static readonly LinkItem PreviousHeadTeacherBoardDate = AddLinkItem(page: "/TaskList/SchoolAndTrustInformation/PreviousAdvisoryBoardDate");
Expand Down
1 change: 0 additions & 1 deletion ...versions/Dfe.PrepareConversions/Pages/Components/SchoolAndTrustInformation/default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<govuk-summary-list-row name="name-of-trust" label="Trust name" key-width="@kw" asp-for="NameOfTrust" />
<govuk-summary-list-row name="trust-reference-number" label="Trust reference number" key-width="@kw" asp-for="TrustReferenceNumber" />
<govuk-summary-list-row if="@Model.IsDao is false" name="project-recommendation" label="Recommendation" key-width="@kw" value="@Model.RecommendationForProject" asp-page="@Links.SchoolAndTrustInformationSection.ProjectRecommendation.Page" asp-route-id="@Model.Id" hidden-text="recommendation" />
<govuk-summary-list-row if="@Model.IsDao is false" name="academy-order-required" label="Is an academy order (AO) required?" key-width="@kw" value="@Model.AcademyOrderRequired" asp-page="@Links.SchoolAndTrustInformationSection.AcademyOrderRequired.Page" asp-route-id="@Model.Id" hidden-text="academy order required" />
<govuk-summary-list-row if="@Model.IsDao" name="form-7-received" label="Has the Schools Notification Mailbox (SNM) received a Form 7?" key-width="@kw" value="@Model.Form7Received" asp-route-id="@Model.Id" asp-page="@Links.SchoolAndTrustInformationSection.Form7Received.Page" hidden-text="form 7 received" />
<govuk-summary-list-row name="form-7-received-date" if="@Model.WasForm7Received" label="Date SNM received Form 7" key-width="@kw" value="@Model.Form7ReceivedDate" asp-route-id="@Model.Id" asp-page="@Links.SchoolAndTrustInformationSection.Form7ReceivedDate.Page" hidden-text="date form 7 received" />
<govuk-summary-list-row if="@Model.IsDao" name="dao-pack-sent-date" label="Date directive academy order (DAO) pack sent" key-width="@kw" value="@Model.DaoPackSentDate" asp-page="@Links.SchoolAndTrustInformationSection.DaoPackSent.Page" asp-route-id="@Model.Id" />
Expand Down
Loading
Loading