From 10fbd34c2ff87c8210ee4a3a574ab08c0b655af3 Mon Sep 17 00:00:00 2001 From: Dominic NEED Date: Thu, 1 Feb 2024 08:49:35 +0000 Subject: [PATCH 1/6] Changed call to trust template to go to singular page --- .../TagHelpers/TemplateGuidanceTaskListTagHelper.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/TagHelpers/TemplateGuidanceTaskListTagHelper.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/TagHelpers/TemplateGuidanceTaskListTagHelper.cs index 872906b3d..72776226e 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/TagHelpers/TemplateGuidanceTaskListTagHelper.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/TagHelpers/TemplateGuidanceTaskListTagHelper.cs @@ -12,9 +12,7 @@ public class TemplateGuidanceTaskListTagHelper : TagHelper public override void Process(TagHelperContext context, TagHelperOutput output) { - output.Content.SetHtmlContent(IsSponsored - ? GetHtmlContent(_title, $"{ProjectId}/sponsor-guidance", _linkText) - : GetHtmlContent(_title, $"{ProjectId}/trust-guidance", _linkText)); + output.Content.SetHtmlContent(GetHtmlContent(_title, $"{ProjectId}/trust-guidance", _linkText)); } private static string GetHtmlContent(string title, string urlSlug, string linkText) @@ -34,4 +32,5 @@ private static string GetHtmlContent(string title, string urlSlug, string linkTe "; } } -} \ No newline at end of file +} + From c660bcf49a3f8a5ba741ae69a881d70abde72547 Mon Sep 17 00:00:00 2001 From: Dominic NEED Date: Thu, 1 Feb 2024 08:49:59 +0000 Subject: [PATCH 2/6] Deleted Sponsored Trust guidance --- .../SponsoredTemplateGuidance.cshtml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/SponsoredTemplateGuidance.cshtml diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/SponsoredTemplateGuidance.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/SponsoredTemplateGuidance.cshtml deleted file mode 100644 index 1fff982f9..000000000 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/SponsoredTemplateGuidance.cshtml +++ /dev/null @@ -1,17 +0,0 @@ -@page "/task-list/{id:int}/sponsor-guidance" -@using Dfe.PrepareConversions.TagHelpers -@model Dfe.PrepareConversions.Pages.BaseAcademyConversionProjectPageModel -@{ - ViewData["Title"] = "Prepare your sponsor template"; -} -@section BeforeMain -{ - -} -
-
- @Model.Project.SchoolName -

Prepare your sponsor template

- @await Html.PartialAsync("_GenericTemplateGuidance") -
-
\ No newline at end of file From daec503c500e59564b0972f5ce19ae221f7c8639 Mon Sep 17 00:00:00 2001 From: Dominic NEED Date: Thu, 1 Feb 2024 09:44:36 +0000 Subject: [PATCH 3/6] Added new trust template content --- .../TrustTemplateGuidance.cshtml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml index c6abecb2f..41fe4b5d3 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml @@ -11,7 +11,22 @@
@Model.Project.SchoolName -

Prepare your trust template

- @await Html.PartialAsync("_GenericTemplateGuidance") +

Prepare the trust template

+

You must prepare a trust template for the advisory board meeting. It helps them learn about the trust the academy will join. That informs their decision about if the project can proceed.

+

+ How to prepare the trust template +

+
    +
  1. Check if a trust template already exists in the trust SharePoint folder
    2. +
  2. + Download a new template (opens in new tab) if one does not exist or it is more than 3 months since it was last updated +
    3. +
  3. + Enter or update the information in the trust template +
    4. +
  4. Save the completed trust template in the trust's SharePoint folder
    5. +
  5. Share the template with your team leader for approval
    6. +
+

Once approved, it is ready to take to the advisory board meeting.

\ No newline at end of file From 991b77b324908284972672ee0c9c07f349282e33 Mon Sep 17 00:00:00 2001 From: Dominic NEED Date: Tue, 6 Feb 2024 09:17:09 +0000 Subject: [PATCH 4/6] Added return to taks list button --- .../Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml index 41fe4b5d3..82c1d64d0 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml @@ -28,5 +28,9 @@
  • Share the template with your team leader for approval

    • Once approved, it is ready to take to the advisory board meeting.

    + + Return to task list + + \ No newline at end of file From 1f2869acd3e32788cddeb8fa27388fd2d980cb00 Mon Sep 17 00:00:00 2001 From: Dominic NEED Date: Tue, 6 Feb 2024 09:24:14 +0000 Subject: [PATCH 5/6] Remove redundant tests in lieu of new content --- ...SponsorTemplateGuidanceIntegrationTests.cs | 49 --------------- .../TrustTemplateGuidanceIntegrationTests.cs | 60 ------------------- .../TrustTemplateGuidance.cshtml | 2 +- 3 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/TrustTemplate/SponsorTemplateGuidanceIntegrationTests.cs diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/TrustTemplate/SponsorTemplateGuidanceIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/TrustTemplate/SponsorTemplateGuidanceIntegrationTests.cs deleted file mode 100644 index 42a4b57c5..000000000 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/TrustTemplate/SponsorTemplateGuidanceIntegrationTests.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Dfe.PrepareConversions.Data.Models; -using Dfe.PrepareConversions.Tests.Extensions; -using FluentAssertions; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Xunit; - -namespace Dfe.PrepareConversions.Tests.Pages.TaskList.TrustTemplate -{ - public class SponsorTemplateGuidanceIntegrationTests : BaseIntegrationTests - { - public SponsorTemplateGuidanceIntegrationTests(IntegrationTestingWebApplicationFactory factory) : base(factory) { } - - [Fact] - public async Task Should_navigate_between_sponsor_template_guidance_and_task_list() - { - AcademyConversionProject project = AddGetProject(x => - { - x.AcademyTypeAndRoute = AcademyTypeAndRoutes.Sponsored; - }); - - await OpenAndConfirmPathAsync($"/task-list/{project.Id}"); - await NavigateAsync("Prepare your template"); - - Document.Url.Should().BeUrl($"/task-list/{project.Id}/sponsor-guidance"); - - await NavigateAsync("Back"); - - Document.Url.Should().BeUrl($"/task-list/{project.Id}"); - } - - [Fact] - public async Task Should_navigate_and_display_correct_heading_for_sponsored() - { - AcademyConversionProject project = AddGetProject(x => - { - x.AcademyTypeAndRoute = AcademyTypeAndRoutes.Sponsored; - }); - - await OpenAndConfirmPathAsync($"/task-list/{project.Id}/sponsor-guidance"); - - Document.QuerySelector("h1.govuk-heading-l")!.InnerHtml.Should().Be("Prepare your sponsor template"); - } - - } -} \ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/TrustTemplate/TrustTemplateGuidanceIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/TrustTemplate/TrustTemplateGuidanceIntegrationTests.cs index 3f5176cb5..6a3b6e2b6 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/TrustTemplate/TrustTemplateGuidanceIntegrationTests.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/TrustTemplate/TrustTemplateGuidanceIntegrationTests.cs @@ -27,64 +27,4 @@ public async Task Should_navigate_between_trust_template_guidance_and_task_list( Document.Url.Should().BeUrl($"/task-list/{project.Id}"); } - - [Fact] - public async Task Should_navigate_to_getting_your_template_section() - { - AcademyConversionProject project = AddGetProject(); - - await OpenAndConfirmPathAsync($"/task-list/{project.Id}/trust-guidance"); - - await NavigateAsync("Getting your template from SharePoint", 0); - - Document.Url.Should().BeUrl($"/task-list/{project.Id}/trust-guidance#sharepoint"); - } - - [Fact] - public async Task Should_navigate_to_updating_your_template_in_the_trust_area_section() - { - AcademyConversionProject project = AddGetProject(); - - await OpenAndConfirmPathAsync($"/task-list/{project.Id}/trust-guidance"); - - await NavigateAsync("Updating your template in the trust area in KIM", 0); - - Document.Url.Should().BeUrl($"/task-list/{project.Id}/trust-guidance#trust"); - } - - [Fact] - public async Task Should_navigate_to_updating_your_template_in_the_sponsor_area_section() - { - AcademyConversionProject project = AddGetProject(); - - await OpenAndConfirmPathAsync($"/task-list/{project.Id}/trust-guidance"); - - await NavigateAsync("Updating your template in the sponsor area in KIM (if the trust has sponsor status)", 0); - - Document.Url.Should().BeUrl($"/task-list/{project.Id}/trust-guidance#sponsor"); - } - - [Fact] - public async Task Should_navigate_to_download_your_trust_template_section() - { - AcademyConversionProject project = AddGetProject(); - - await OpenAndConfirmPathAsync($"/task-list/{project.Id}/trust-guidance"); - - await NavigateAsync("Download your trust template from KIM", 0); - - Document.Url.Should().BeUrl($"/task-list/{project.Id}/trust-guidance#download"); - } - - [Fact] - public async Task Should_navigate_to_send_template_for_review_section() - { - AcademyConversionProject project = AddGetProject(); - - await OpenAndConfirmPathAsync($"/task-list/{project.Id}/trust-guidance"); - - await NavigateAsync("Send your project template and trust template for review", 0); - - Document.Url.Should().BeUrl($"/task-list/{project.Id}/trust-guidance#send"); - } } diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml index 82c1d64d0..7552e1b87 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml @@ -19,7 +19,7 @@
    1. Check if a trust template already exists in the trust SharePoint folder
    2. - Download a new template (opens in new tab) if one does not exist or it is more than 3 months since it was last updated + Download a new template (opens in new tab) if one does not exist or it is more than 3 months since it was last updated
    3. Enter or update the information in the trust template From 1949098e5cb1409cb38d5fdadf66ab2e706ce7f0 Mon Sep 17 00:00:00 2001 From: Dominic NEED Date: Tue, 6 Feb 2024 09:31:22 +0000 Subject: [PATCH 6/6] Added Advisory board template guidance --- .../TrustTemplate/TrustTemplateGuidance.cshtml | 12 ++++++++---- .../Dfe.PrepareConversions/appsettings.json | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml index 7552e1b87..69451cd0d 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/TrustTemplate/TrustTemplateGuidance.cshtml @@ -1,11 +1,14 @@ @page "/task-list/{id:int}/trust-guidance" @using Dfe.PrepareConversions.TagHelpers +@using Microsoft.Extensions.Configuration @model Dfe.PrepareConversions.Pages.BaseAcademyConversionProjectPageModel +@inject IConfiguration Configuration + @{ ViewData["Title"] = "Prepare your trust template"; } @section BeforeMain - { +{ }
      @@ -19,15 +22,16 @@
      1. Check if a trust template already exists in the trust SharePoint folder
      2. - Download a new template (opens in new tab) if one does not exist or it is more than 3 months since it was last updated + Download a new template (opens in new tab) + if one does not exist or it is more than 3 months since it was last updated
      3. Enter or update the information in the trust template
      4. Save the completed trust template in the trust's SharePoint folder
        5. -
      5. Share the template with your team leader for approval
        6. +
      6. Share the template with your team leader for approval
      -

      Once approved, it is ready to take to the advisory board meeting.

      +

      Once approved, it is ready to take to the advisory board meeting.

      Return to task list diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json index 9e06cf149..11811eba7 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json @@ -36,6 +36,9 @@ "ServiceLink": { "TransfersUrl": "https://dev.prepare-transfers.education.gov.uk" }, + "ApplicationLinks": { + "SharePointTemplateUrl": "https://educationgovuk.sharepoint.com/sites/lvedfe00116/SitePages/Headteacher-Board-Operational-Processes.aspx?xsdata=..." + }, "ApplicationInsights": { "ConnectionString": "", "InstrumentationKey": ""