From 801aafacaee2e9e2400d5057a17304cfe4841510 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Fri, 24 May 2024 17:01:36 +0100
Subject: [PATCH 01/23] document changes

---
 .../Models/AcademyConversionProject.cs        |  1 +
 .../Configuration/SharePointApiOptions.cs     | 11 +++
 .../Dfe.PrepareConversions/Models/Links.cs    | 13 +++
 .../BaseAcademyConversionProjectPageModel.cs  |  5 +-
 .../Pages/ProjectDocuments/Index.cshtml       | 39 ++++++++
 .../Pages/ProjectDocuments/Index.cshtml.cs    | 74 ++++++++++++++
 .../Pages/Shared/_FilesPartial.cshtml         | 24 +++++
 .../Pages/Shared/_SubMenu.cshtml              |  7 ++
 .../Pages/TaskList/Index.cshtml.cs            |  5 +-
 .../Services/FileService.cs                   | 99 +++++++++++++++++++
 .../Helpers/AadAuthorisationHelper.cs         | 32 ++++++
 .../Services/Helpers/FileUploadConstants.cs   | 18 ++++
 .../Dfe.PrepareConversions/Startup.cs         | 13 ++-
 .../ViewModels/FilesViewModel.cs              | 16 +++
 .../ViewModels/ProjectViewModel.cs            |  2 +
 .../Dfe.PrepareConversions/appsettings.json   |  9 +-
 16 files changed, 364 insertions(+), 4 deletions(-)
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointApiOptions.cs
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FilesPartial.cshtml
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Services/FileService.cs
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/AadAuthorisationHelper.cs
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/FileUploadConstants.cs
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FilesViewModel.cs

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
index dbea87fc3..80005be2d 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
@@ -8,6 +8,7 @@ public class AcademyConversionProject
    public int Id { get; set; }
    public int? Urn { get; set; }
    public int? FormAMatProjectId { get; set; }
+   public Guid? SharePointId { get; set; }
    public bool? IsFormAMat { get; set; }
    public DateTime CreatedOn { get; set; }
    public string SchoolName { get; set; }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointApiOptions.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointApiOptions.cs
new file mode 100644
index 000000000..42db3465b
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointApiOptions.cs
@@ -0,0 +1,11 @@
+namespace Dfe.PrepareConversions.Configuration
+{
+   public class SharePointApiOptions
+   {
+      public bool Enabled { get; set; }
+      public string ApiUrl { get; set; }
+      public string ClientId { get; set; }
+      public string Secret { get; set; }
+      public string Authority { get; set; }
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
index 4df359b2f..d66b7f2b8 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
@@ -1,3 +1,4 @@
+using DocumentFormat.OpenXml.InkML;
 using System;
 using System.Collections.Generic;
 
@@ -9,6 +10,9 @@ public static class Links
    private static string _transfersUrl;
    public static string TransfersUrl => _transfersUrl;
 
+   private static bool _isProjectDocumentsEnabled;
+   public static bool IsProjectDocumentsEnabled => _isProjectDocumentsEnabled;
+
    private static LinkItem AddLinkItem(string page, string backText = "Back")
    {
       LinkItem item = new() { Page = page, BackText = backText };
@@ -19,6 +23,10 @@ public static void InitializeTransfersUrl(string transfersUrl)
    {
       _transfersUrl = transfersUrl;
    }
+
+   public static void InializeProjectDocumentsEnabled(bool isProjectDocumentsEnabled) {
+      _isProjectDocumentsEnabled = isProjectDocumentsEnabled;
+   }
    public static LinkItem ByPage(string page)
    {
       return _links.Find(x => string.Equals(page, x.Page, StringComparison.InvariantCultureIgnoreCase));
@@ -64,6 +72,11 @@ public static class ProjectNotes
       public static readonly LinkItem NewNote = AddLinkItem(page: "/ProjectNotes/NewNote");
    }
 
+   public static class ProjectDocuments
+   {
+      public static readonly LinkItem Index = AddLinkItem(page: "/ProjectDocuments/Index");
+   }
+
    public static class TaskList
    {
       public static readonly LinkItem Index = AddLinkItem(backText: "Back", page: "/TaskList/Index");
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/BaseAcademyConversionProjectPageModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/BaseAcademyConversionProjectPageModel.cs
index 78228c386..cc8b31d09 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/BaseAcademyConversionProjectPageModel.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/BaseAcademyConversionProjectPageModel.cs
@@ -1,10 +1,12 @@
-using Dfe.PrepareConversions.Data;
+
+using Dfe.PrepareConversions.Data;
 using Dfe.PrepareConversions.Data.Models;
 using Dfe.PrepareConversions.Data.Services;
 using Dfe.PrepareConversions.Models;
 using Dfe.PrepareConversions.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Configuration;
 using System.Security.Claims;
 using System.Threading.Tasks;
 
@@ -46,6 +48,7 @@ protected async Task<IActionResult> SetProject(int id)
       }
 
       Project = new ProjectViewModel(project.Body);
+
       return Page();
    }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml
new file mode 100644
index 000000000..d9dfa2b70
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml
@@ -0,0 +1,39 @@
+@page "/project-documents/{id:int}"
+@using Dfe.PrepareConversions.Data.Models
+@using Dfe.PrepareConversions.Services.Helpers
+@model Dfe.PrepareConversions.Pages.ProjectDocuments.IndexModel
+@{
+    ViewData["Title"] = "Project documents";
+}
+
+@section BeforeMain
+{
+    <a asp-page="@Model.ReturnPage" asp-route-id="@Model.ReturnId" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
+}
+
+<partial name="Shared/_ProjectHeader" model="Model.Project" />
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <form asp-page-handler="GetFile" method="get">
+     
+        
+        <partial name="Shared/_FilesPartial" model='new FilesViewModel {
+	      Urn = Model.Project.SchoolURN,
+	      EntityId = Model.Project.SharePointId.Value,
+	      ApplicationReference = Model.Project.ApplicationReferenceNumber,
+	      FilePrefixSection = FileUploadConstants.ResolutionConsentfilePrefixFieldName,
+          SectionName = "Resolution Consent",
+	      FileNames = Model.ResolutionConsentFileNames
+      }' />
+        </form>
+              <partial name="Shared/_FilesPartial" model='new FilesViewModel {
+	      Urn = Model.Project.SchoolURN,
+	      EntityId = Model.Project.SharePointId.Value,
+	      ApplicationReference = Model.Project.ApplicationReferenceNumber,
+	      FilePrefixSection = FileUploadConstants.DioceseFilePrefixFieldName,
+          SectionName = "Diocese",
+	      FileNames = Model.DioceseFileNames
+      }' />
+    </div>
+</div>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs
new file mode 100644
index 000000000..112eceed8
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs
@@ -0,0 +1,74 @@
+using AngleSharp.Io.Dom;
+using Dfe.PrepareConversions.Data.Services;
+using Dfe.PrepareConversions.Models;
+using Dfe.PrepareConversions.Services;
+using Dfe.PrepareConversions.Services.Helpers;
+using Dfe.PrepareConversions.ViewModels;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Primitives;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace Dfe.PrepareConversions.Pages.ProjectDocuments;
+
+public class IndexModel : BaseAcademyConversionProjectPageModel
+{
+   private readonly IFileService _fileService;
+
+   public string ReturnPage { get; set; }
+   public string ReturnId { get; set; }
+
+   public IndexModel(IAcademyConversionProjectRepository repository, IFileService fileService) : base(repository)
+   {
+      _fileService = fileService;
+   }
+
+   [BindProperty]
+   public List<string> DioceseFileNames { get; set; }
+   [BindProperty]
+   public List<string> ResolutionConsentFileNames { get; private set; }
+
+   public override async Task<IActionResult> OnGetAsync(int id)
+   {
+      await base.OnGetAsync(id);
+
+      DioceseFileNames = await _fileService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, Project.SharePointId.ToString(), Project.ApplicationReferenceNumber, FileUploadConstants.DioceseFilePrefixFieldName);
+      //TempDataHelper.StoreSerialisedValue($"{EntityId}-dioceseFiles", TempData, DioceseFileNames);
+      //FoundationConsentFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.FoundationConsentFilePrefixFieldName);
+
+      ResolutionConsentFileNames = await _fileService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, Project.SharePointId.ToString(), Project.ApplicationReferenceNumber, FileUploadConstants.ResolutionConsentfilePrefixFieldName);
+
+      return Page();
+   }
+
+   public async Task<HttpResponseMessage> GetFile(string entityName, string recordId, string recordName, string fieldName, string fileName)
+   {
+      //if (String.IsNullOrEmpty(id))
+      //   return Request.CreateResponse(HttpStatusCode.BadRequest);
+
+      var file  = await _fileService.DownloadFile(entityName, recordId, recordName, fieldName, fileName);
+
+      HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.OK);
+
+      response.Content = new StreamContent(GenerateStreamFromString(file));
+      response.Content.Headers.ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("attachment");
+      response.Content.Headers.ContentDisposition.FileName = fileName;
+      //response.Content.Headers.ContentType = new MediaTypeHeaderValue("application/pdf");
+
+      return response;
+   }
+
+   public static Stream GenerateStreamFromString(string s)
+   {
+      var stream = new MemoryStream();
+      var writer = new StreamWriter(stream);
+      writer.Write(s);
+      writer.Flush();
+      stream.Position = 0;
+      return stream;
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FilesPartial.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FilesPartial.cshtml
new file mode 100644
index 000000000..689cf49d9
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FilesPartial.cshtml
@@ -0,0 +1,24 @@
+@model Dfe.PrepareConversions.ViewModels.FilesViewModel
+
+<legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
+    @Model.SectionName files
+</legend>
+<hr />
+
+
+@foreach (var fileName in Model.FileNames)
+{
+    <table class="govuk-table">
+        <tbody class="govuk-table__body">
+            <tr class="govuk-table__row">
+                <td class="govuk-table__cell govuk-!-text-align-left">
+                    <p class="govuk-label">@fileName</p>
+                </td>
+                <td><button class="btn btn-default">Download</button></td>
+              
+
+            </tr>
+
+        </tbody>
+    </table>
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
index d75b360d0..d4b593b3e 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
@@ -60,5 +60,12 @@
                 Project notes
             </sub-menu-link>
         </li>
+        <li if="@Links.IsProjectDocumentsEnabled" class="moj-sub-navigation__item">
+            <sub-menu-link class="moj-sub-navigation__link"
+                           asp-page="@Links.ProjectDocuments.Index.Page"
+                           asp-route-id="@id">
+                Project documents
+            </sub-menu-link>
+        </li>
     </ul>
 </nav>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml.cs
index 985b10133..b73464602 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Index.cshtml.cs
@@ -4,6 +4,7 @@
 using Dfe.PrepareConversions.Services;
 using Dfe.PrepareConversions.ViewModels;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Primitives;
 using System.Linq;
 using System.Net;
@@ -14,14 +15,16 @@ namespace Dfe.PrepareConversions.Pages.TaskList;
 public class IndexModel : BaseAcademyConversionProjectPageModel
 {
    private readonly ErrorService _errorService;
+   private readonly IConfiguration _configuration;
    private readonly KeyStagePerformanceService _keyStagePerformanceService;
 
    public IndexModel(KeyStagePerformanceService keyStagePerformanceService,
                      IAcademyConversionProjectRepository repository,
-                     ErrorService errorService) : base(repository)
+                     ErrorService errorService, IConfiguration configuration) : base(repository)
    {
       _keyStagePerformanceService = keyStagePerformanceService;
       _errorService = errorService;
+      _configuration = configuration;
    }
 
    public bool ShowGenerateHtbTemplateError { get; set; }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/FileService.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/FileService.cs
new file mode 100644
index 000000000..b747b5310
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/FileService.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Dfe.PrepareConversions.Services.Helpers;
+using Microsoft.VisualBasic;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Dfe.PrepareConversions.Services;
+
+public interface IFileService
+{
+   Task<List<string>> GetFiles(string entityName, string recordId, string recordName, string fieldName);
+   Task<string> DownloadFile(string entityName, string recordId, string recordName, string fieldName, string fileName);
+}
+
+public class FileService : IFileService
+{
+   private readonly HttpClient _httpClient;
+   private readonly IAadAuthorisationHelper _aadAuthorisationHelper;
+
+   public FileService() { }
+
+   public FileService(HttpClient httpClient, IAadAuthorisationHelper aadAuthorisationHelper)
+   {
+      _httpClient = httpClient;
+      _aadAuthorisationHelper = aadAuthorisationHelper;
+   }
+
+   public async Task<List<string>> GetFiles(string entityName, string recordId, string recordName, string fieldName)
+   {
+      var url = $"?entityName={entityName}&recordName={recordName}&recordId={recordId}&fieldName={fieldName}";
+
+      using var request = new HttpRequestMessage(HttpMethod.Get, url);
+
+      var content = await DoHttpRequest(request);
+
+      return ParseJResponse(content);
+   }
+
+   public async Task<string> DownloadFile(string entityName, string recordId, string recordName, string fieldName, string fileName)
+   {
+      var url = $@"download?entityName={entityName}&recordName={recordName}&recordId={recordId}&fieldName={fieldName}&fileName={fileName}";
+
+      using var request = new HttpRequestMessage(HttpMethod.Get, url);
+      var content = await DoHttpRequest(request);
+
+      return content;
+
+   }
+
+   private async Task<string> DoHttpRequest(HttpRequestMessage request)
+   {
+      var accessToken = await _aadAuthorisationHelper.GetAccessToken();
+      _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
+
+      var response = await _httpClient.SendAsync(request);
+      var content = await response.Content.ReadAsStringAsync();
+
+      if (!response.IsSuccessStatusCode)
+         throw new Exception($"The file service failed with a status of {response.ReasonPhrase} {content}");
+
+      var receiveStream = await response.Content.ReadAsStreamAsync();
+      using var readStream = new StreamReader(receiveStream, Encoding.UTF8);
+      return await readStream.ReadToEndAsync();
+   }
+
+   private List<string> ParseJResponse(string content)
+   {
+      var jobject = JObject.Parse(content);
+      var jfiles = (JArray)jobject?.GetValue("Files", StringComparison.OrdinalIgnoreCase)!;
+      return jfiles.Select(x => (string)x).ToList();
+   }
+
+   internal static string GetJsonAsString(JObject jObject)
+   {
+      var sb = new StringBuilder();
+      sb.Append("\"");
+      using (var sw = new StringWriter(sb))
+      using (var writer = new JsonTextWriter(sw))
+      {
+         writer.QuoteChar = '\'';
+
+         var ser = new JsonSerializer();
+         ser.Serialize(writer, jObject);
+      }
+
+      sb.Append("\"");
+
+      return sb.ToString();
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/AadAuthorisationHelper.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/AadAuthorisationHelper.cs
new file mode 100644
index 000000000..2af505717
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/AadAuthorisationHelper.cs
@@ -0,0 +1,32 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Identity.Client;
+using System.Threading.Tasks;
+
+namespace Dfe.PrepareConversions.Services.Helpers;
+
+public interface IAadAuthorisationHelper
+{
+   Task<string> GetAccessToken();
+}
+
+public class AadAuthorisationHelper : IAadAuthorisationHelper
+{
+   private readonly IConfiguration _configuration;
+
+   public AadAuthorisationHelper(IConfiguration configuration)
+   {
+      _configuration = configuration;
+   }
+   public async Task<string> GetAccessToken()
+   {
+      var app = ConfidentialClientApplicationBuilder
+          .Create(_configuration["Sharepoint:ClientId"])
+          .WithClientSecret(_configuration["Sharepoint:Secret"])
+          .WithAuthority(AzureCloudInstance.AzurePublic, _configuration["Sharepoint:TenantId"])
+          .Build();
+
+      var result = app.AcquireTokenForClient(new string[] { $"{_configuration["Sharepoint:Authority"]}/.default" });
+
+      return (await result.ExecuteAsync()).AccessToken;
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/FileUploadConstants.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/FileUploadConstants.cs
new file mode 100644
index 000000000..95973733b
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/FileUploadConstants.cs
@@ -0,0 +1,18 @@
+namespace Dfe.PrepareConversions.Services.Helpers;
+
+public static class FileUploadConstants
+{
+   public const string TopLevelApplicationFolderName = "sip_application";
+   public const string TopLevelSchoolFolderName = "sip_applyingschools";
+   public const string DioceseFilePrefixFieldName = "sip_adschoolfaithschoolfile";
+   public const string FoundationConsentFilePrefixFieldName = "sip_adschoolsupportedfoundationfile";
+   public const string ResolutionConsentfilePrefixFieldName = "sip_adschoolgoverningbodyconsent";
+   public const string SchoolPFYRevenueStatusFile = "sip_pfyrevenuepreviousfinancialstatusfile";
+   public const string SchoolPFYCapitalForwardStatusFile = "sip_pfyrevenuecapitalcarriedforwardfile";
+   public const string SchoolCFYRevenueStatusFile = "sip_cfyrevenuecurrentfinancialstatusfile";
+   public const string SchoolCFYCapitalForwardFile = "sip_cfyforecastcapitalcarriedforwardfile";
+   public const string NFYForecastedRevenueFilePrefixFieldName = "sip_nfynextcurrentfinancialfile";
+   public const string NFYForecastedCapitalFilePrefixFieldName = "sip_nfyforecastcapitalcarriedforwardfile";
+   public const string JoinAMatTrustConsentFilePrefixFieldName = "sip_changestotrustconsent";
+   public const string JoinAMatTrustGovernanceFilePrefixFieldName = "sip_formtrustgovernancefile";
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
index faf5b32cd..c663b320b 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
@@ -10,6 +10,7 @@
 using Dfe.PrepareConversions.Routing;
 using Dfe.PrepareConversions.Security;
 using Dfe.PrepareConversions.Services;
+using Dfe.PrepareConversions.Services.Helpers;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -21,6 +22,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Microsoft.FeatureManagement;
 using Microsoft.Identity.Web;
 using Microsoft.Identity.Web.UI;
@@ -148,11 +150,20 @@ public void ConfigureServices(IServiceCollection services)
       services.AddScoped<IGraphUserService, GraphUserService>();
       services.AddScoped<IDfeHttpClientFactory, DfeHttpClientFactory>();
       services.AddScoped<ICorrelationContext, CorrelationContext>();
+      services.AddSingleton<IAadAuthorisationHelper, AadAuthorisationHelper>();
+
+      services.Configure<SharePointApiOptions>(Configuration.GetSection("Sharepoint"));
+      var sharepointOptions = Configuration.GetSection("Sharepoint").Get<SharePointApiOptions>();
+      services.AddHttpClient<IFileService, FileService>(client =>
+      {
+         client.BaseAddress = new Uri(sharepointOptions.ApiUrl);
+      });
+      Links.InializeProjectDocumentsEnabled(sharepointOptions.Enabled);
 
       // Initialize the TransfersUrl
       var serviceLinkOptions = Configuration.GetSection("ServiceLink").Get<ServiceLinkOptions>();
       Links.InitializeTransfersUrl(serviceLinkOptions.TransfersUrl);
-
+      
    }
 
    public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILogger<Startup> logger)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FilesViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FilesViewModel.cs
new file mode 100644
index 000000000..6877a43c8
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/FilesViewModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+namespace Dfe.PrepareConversions.ViewModels;
+
+public class FilesViewModel
+{
+   
+   public List<string> FileNames { get; set; }
+   public string FilePrefixSection { get; set; }
+   public string SectionName { get; set; }
+   public string Urn { get; set; }
+   public string DownloadUrl { get; set; }
+   public Guid EntityId { get; set; }
+   public string ApplicationReference { get; set; }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
index 6a14b791a..842d459dd 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
@@ -12,6 +12,7 @@ public ProjectViewModel(AcademyConversionProject project)
    {
       Id = project.Id.ToString();
       FormAMatProjectId = project.FormAMatProjectId;
+      SharePointId = project.SharePointId;
       IsFormAMat = project.IsFormAMat.HasValue && project.IsFormAMat.Value;
       ProjectStatus = ProjectListHelper.MapProjectStatus(project.ProjectStatus).Value;
       ProjectStatusColour = ProjectListHelper.MapProjectStatus(project.ProjectStatus).Colour;
@@ -130,6 +131,7 @@ public ProjectViewModel(AcademyConversionProject project)
 
    public string Id { get; }
    public int? FormAMatProjectId { get; }
+   public Guid? SharePointId { get; }
    public string ProjectStatus { get; }
    public string ProjectStatusColour { get; }
    public string ApplicationReferenceNumber { get; set; }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
index 075fa92a1..b68883d12 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
@@ -48,5 +48,12 @@
       "UseAcademisationApplication": true,
       "ShowDirectedAcademyOrders": true
    },
-   "MaintenanceMode": false
+   "MaintenanceMode": false,
+   "Sharepoint": {
+      "Enabled": false,
+      "ApiUrl": "",
+      "ClientId": "",
+      "Secret": "",
+      "Authority": ""
+   }
 }

From 1bdfbbb3371e48f78563f37e23c491b685a776a4 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Fri, 7 Jun 2024 17:46:17 +0100
Subject: [PATCH 02/23] School/application folder changes

---
 .../Models/AcademyConversionProject.cs        |  3 +-
 .../Configuration/SharePointApiOptions.cs     | 11 ---
 .../Configuration/SharePointOptions.cs        |  8 ++
 .../Pages/ProjectDocuments/Index.cshtml       | 25 +----
 .../Pages/ProjectDocuments/Index.cshtml.cs    | 48 +++------
 .../Pages/Shared/_FilesPartial.cshtml         | 24 -----
 .../Services/FileService.cs                   | 99 -------------------
 .../Helpers/AadAuthorisationHelper.cs         | 32 ------
 .../Services/Helpers/FileUploadConstants.cs   | 18 ----
 .../Dfe.PrepareConversions/Startup.cs         | 11 +--
 .../ViewModels/ProjectViewModel.cs            |  6 +-
 .../Dfe.PrepareConversions/appsettings.json   |  5 +-
 12 files changed, 33 insertions(+), 257 deletions(-)
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointApiOptions.cs
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointOptions.cs
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FilesPartial.cshtml
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Services/FileService.cs
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/AadAuthorisationHelper.cs
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/FileUploadConstants.cs

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
index 80005be2d..f485207fb 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
@@ -8,7 +8,8 @@ public class AcademyConversionProject
    public int Id { get; set; }
    public int? Urn { get; set; }
    public int? FormAMatProjectId { get; set; }
-   public Guid? SharePointId { get; set; }
+   public Guid? SchoolSharePointId { get; set; }
+   public Guid? ApplicationSharePointId { get; set; }
    public bool? IsFormAMat { get; set; }
    public DateTime CreatedOn { get; set; }
    public string SchoolName { get; set; }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointApiOptions.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointApiOptions.cs
deleted file mode 100644
index 42db3465b..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointApiOptions.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Dfe.PrepareConversions.Configuration
-{
-   public class SharePointApiOptions
-   {
-      public bool Enabled { get; set; }
-      public string ApiUrl { get; set; }
-      public string ClientId { get; set; }
-      public string Secret { get; set; }
-      public string Authority { get; set; }
-   }
-}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointOptions.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointOptions.cs
new file mode 100644
index 000000000..07641d3bd
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Configuration/SharePointOptions.cs
@@ -0,0 +1,8 @@
+namespace Dfe.PrepareConversions.Configuration
+{
+   public class SharePointOptions
+   {
+      public bool Enabled { get; set; }
+      public string Url { get; set; }
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml
index d9dfa2b70..c1fdf5b4c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml
@@ -1,6 +1,5 @@
 @page "/project-documents/{id:int}"
 @using Dfe.PrepareConversions.Data.Models
-@using Dfe.PrepareConversions.Services.Helpers
 @model Dfe.PrepareConversions.Pages.ProjectDocuments.IndexModel
 @{
     ViewData["Title"] = "Project documents";
@@ -15,25 +14,9 @@
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-        <form asp-page-handler="GetFile" method="get">
-     
-        
-        <partial name="Shared/_FilesPartial" model='new FilesViewModel {
-	      Urn = Model.Project.SchoolURN,
-	      EntityId = Model.Project.SharePointId.Value,
-	      ApplicationReference = Model.Project.ApplicationReferenceNumber,
-	      FilePrefixSection = FileUploadConstants.ResolutionConsentfilePrefixFieldName,
-          SectionName = "Resolution Consent",
-	      FileNames = Model.ResolutionConsentFileNames
-      }' />
-        </form>
-              <partial name="Shared/_FilesPartial" model='new FilesViewModel {
-	      Urn = Model.Project.SchoolURN,
-	      EntityId = Model.Project.SharePointId.Value,
-	      ApplicationReference = Model.Project.ApplicationReferenceNumber,
-	      FilePrefixSection = FileUploadConstants.DioceseFilePrefixFieldName,
-          SectionName = "Diocese",
-	      FileNames = Model.DioceseFileNames
-      }' />
+
+        Application level documents folder <a href="@Model.ApplicationLevelDocumentsFolder" target="_blank">here</a><br />
+        School level documents folder <a href="@Model.SchoolLevelDocumentsFolder" target="_blank">here</a>
     </div>
+
 </div>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs
index 112eceed8..efeefe54e 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs
@@ -2,7 +2,6 @@
 using Dfe.PrepareConversions.Data.Services;
 using Dfe.PrepareConversions.Models;
 using Dfe.PrepareConversions.Services;
-using Dfe.PrepareConversions.Services.Helpers;
 using Dfe.PrepareConversions.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
@@ -12,63 +11,38 @@
 using System.Net.Http;
 using System.Net;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
+using static System.Net.WebRequestMethods;
 
 namespace Dfe.PrepareConversions.Pages.ProjectDocuments;
 
 public class IndexModel : BaseAcademyConversionProjectPageModel
 {
-   private readonly IFileService _fileService;
+   private readonly IConfiguration _configuration;
 
    public string ReturnPage { get; set; }
    public string ReturnId { get; set; }
 
-   public IndexModel(IAcademyConversionProjectRepository repository, IFileService fileService) : base(repository)
+   public IndexModel(IAcademyConversionProjectRepository repository, IConfiguration configuration) : base(repository)
    {
-      _fileService = fileService;
+      _configuration = configuration;
    }
 
    [BindProperty]
-   public List<string> DioceseFileNames { get; set; }
+   public string ApplicationLevelDocumentsFolder { get; set; }
    [BindProperty]
-   public List<string> ResolutionConsentFileNames { get; private set; }
+   public string SchoolLevelDocumentsFolder { get; private set; }
 
    public override async Task<IActionResult> OnGetAsync(int id)
    {
       await base.OnGetAsync(id);
+      var rootSharePointFolder = _configuration["Sharepoint:Url"];
 
-      DioceseFileNames = await _fileService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, Project.SharePointId.ToString(), Project.ApplicationReferenceNumber, FileUploadConstants.DioceseFilePrefixFieldName);
-      //TempDataHelper.StoreSerialisedValue($"{EntityId}-dioceseFiles", TempData, DioceseFileNames);
-      //FoundationConsentFileNames = await _fileUploadService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, EntityId.ToString(), ApplicationReference, FileUploadConstants.FoundationConsentFilePrefixFieldName);
+      //https://educationgovuk.sharepoint.com/sites/sip-dev/sip_application/Forms/AllItems.aspx?id=%2Fsites%2Fsip%2Ddev%2Fsip%5Fapplication%2FA2B%5F0027%5F63B137B6D21DEB11A813000D3A38AA47
 
-      ResolutionConsentFileNames = await _fileService.GetFiles(FileUploadConstants.TopLevelSchoolFolderName, Project.SharePointId.ToString(), Project.ApplicationReferenceNumber, FileUploadConstants.ResolutionConsentfilePrefixFieldName);
+      ApplicationLevelDocumentsFolder = $"{rootSharePointFolder}sip_application/{Project.ApplicationReferenceNumber}_{Project.ApplicationSharePointId.Value.ToString("N").ToUpper()}";
+      SchoolLevelDocumentsFolder = $"{rootSharePointFolder}sip_applyingschools/{Project.ApplicationReferenceNumber}_{Project.SchoolSharePointId.Value.ToString("N").ToUpper()}";
 
       return Page();
    }
-
-   public async Task<HttpResponseMessage> GetFile(string entityName, string recordId, string recordName, string fieldName, string fileName)
-   {
-      //if (String.IsNullOrEmpty(id))
-      //   return Request.CreateResponse(HttpStatusCode.BadRequest);
-
-      var file  = await _fileService.DownloadFile(entityName, recordId, recordName, fieldName, fileName);
-
-      HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.OK);
-
-      response.Content = new StreamContent(GenerateStreamFromString(file));
-      response.Content.Headers.ContentDisposition = new System.Net.Http.Headers.ContentDispositionHeaderValue("attachment");
-      response.Content.Headers.ContentDisposition.FileName = fileName;
-      //response.Content.Headers.ContentType = new MediaTypeHeaderValue("application/pdf");
-
-      return response;
-   }
-
-   public static Stream GenerateStreamFromString(string s)
-   {
-      var stream = new MemoryStream();
-      var writer = new StreamWriter(stream);
-      writer.Write(s);
-      writer.Flush();
-      stream.Position = 0;
-      return stream;
-   }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FilesPartial.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FilesPartial.cshtml
deleted file mode 100644
index 689cf49d9..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_FilesPartial.cshtml
+++ /dev/null
@@ -1,24 +0,0 @@
-@model Dfe.PrepareConversions.ViewModels.FilesViewModel
-
-<legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
-    @Model.SectionName files
-</legend>
-<hr />
-
-
-@foreach (var fileName in Model.FileNames)
-{
-    <table class="govuk-table">
-        <tbody class="govuk-table__body">
-            <tr class="govuk-table__row">
-                <td class="govuk-table__cell govuk-!-text-align-left">
-                    <p class="govuk-label">@fileName</p>
-                </td>
-                <td><button class="btn btn-default">Download</button></td>
-              
-
-            </tr>
-
-        </tbody>
-    </table>
-}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/FileService.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/FileService.cs
deleted file mode 100644
index b747b5310..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/FileService.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Dfe.PrepareConversions.Services.Helpers;
-using Microsoft.VisualBasic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Dfe.PrepareConversions.Services;
-
-public interface IFileService
-{
-   Task<List<string>> GetFiles(string entityName, string recordId, string recordName, string fieldName);
-   Task<string> DownloadFile(string entityName, string recordId, string recordName, string fieldName, string fileName);
-}
-
-public class FileService : IFileService
-{
-   private readonly HttpClient _httpClient;
-   private readonly IAadAuthorisationHelper _aadAuthorisationHelper;
-
-   public FileService() { }
-
-   public FileService(HttpClient httpClient, IAadAuthorisationHelper aadAuthorisationHelper)
-   {
-      _httpClient = httpClient;
-      _aadAuthorisationHelper = aadAuthorisationHelper;
-   }
-
-   public async Task<List<string>> GetFiles(string entityName, string recordId, string recordName, string fieldName)
-   {
-      var url = $"?entityName={entityName}&recordName={recordName}&recordId={recordId}&fieldName={fieldName}";
-
-      using var request = new HttpRequestMessage(HttpMethod.Get, url);
-
-      var content = await DoHttpRequest(request);
-
-      return ParseJResponse(content);
-   }
-
-   public async Task<string> DownloadFile(string entityName, string recordId, string recordName, string fieldName, string fileName)
-   {
-      var url = $@"download?entityName={entityName}&recordName={recordName}&recordId={recordId}&fieldName={fieldName}&fileName={fileName}";
-
-      using var request = new HttpRequestMessage(HttpMethod.Get, url);
-      var content = await DoHttpRequest(request);
-
-      return content;
-
-   }
-
-   private async Task<string> DoHttpRequest(HttpRequestMessage request)
-   {
-      var accessToken = await _aadAuthorisationHelper.GetAccessToken();
-      _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
-
-      var response = await _httpClient.SendAsync(request);
-      var content = await response.Content.ReadAsStringAsync();
-
-      if (!response.IsSuccessStatusCode)
-         throw new Exception($"The file service failed with a status of {response.ReasonPhrase} {content}");
-
-      var receiveStream = await response.Content.ReadAsStreamAsync();
-      using var readStream = new StreamReader(receiveStream, Encoding.UTF8);
-      return await readStream.ReadToEndAsync();
-   }
-
-   private List<string> ParseJResponse(string content)
-   {
-      var jobject = JObject.Parse(content);
-      var jfiles = (JArray)jobject?.GetValue("Files", StringComparison.OrdinalIgnoreCase)!;
-      return jfiles.Select(x => (string)x).ToList();
-   }
-
-   internal static string GetJsonAsString(JObject jObject)
-   {
-      var sb = new StringBuilder();
-      sb.Append("\"");
-      using (var sw = new StringWriter(sb))
-      using (var writer = new JsonTextWriter(sw))
-      {
-         writer.QuoteChar = '\'';
-
-         var ser = new JsonSerializer();
-         ser.Serialize(writer, jObject);
-      }
-
-      sb.Append("\"");
-
-      return sb.ToString();
-   }
-}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/AadAuthorisationHelper.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/AadAuthorisationHelper.cs
deleted file mode 100644
index 2af505717..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/AadAuthorisationHelper.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Identity.Client;
-using System.Threading.Tasks;
-
-namespace Dfe.PrepareConversions.Services.Helpers;
-
-public interface IAadAuthorisationHelper
-{
-   Task<string> GetAccessToken();
-}
-
-public class AadAuthorisationHelper : IAadAuthorisationHelper
-{
-   private readonly IConfiguration _configuration;
-
-   public AadAuthorisationHelper(IConfiguration configuration)
-   {
-      _configuration = configuration;
-   }
-   public async Task<string> GetAccessToken()
-   {
-      var app = ConfidentialClientApplicationBuilder
-          .Create(_configuration["Sharepoint:ClientId"])
-          .WithClientSecret(_configuration["Sharepoint:Secret"])
-          .WithAuthority(AzureCloudInstance.AzurePublic, _configuration["Sharepoint:TenantId"])
-          .Build();
-
-      var result = app.AcquireTokenForClient(new string[] { $"{_configuration["Sharepoint:Authority"]}/.default" });
-
-      return (await result.ExecuteAsync()).AccessToken;
-   }
-}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/FileUploadConstants.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/FileUploadConstants.cs
deleted file mode 100644
index 95973733b..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Services/Helpers/FileUploadConstants.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Dfe.PrepareConversions.Services.Helpers;
-
-public static class FileUploadConstants
-{
-   public const string TopLevelApplicationFolderName = "sip_application";
-   public const string TopLevelSchoolFolderName = "sip_applyingschools";
-   public const string DioceseFilePrefixFieldName = "sip_adschoolfaithschoolfile";
-   public const string FoundationConsentFilePrefixFieldName = "sip_adschoolsupportedfoundationfile";
-   public const string ResolutionConsentfilePrefixFieldName = "sip_adschoolgoverningbodyconsent";
-   public const string SchoolPFYRevenueStatusFile = "sip_pfyrevenuepreviousfinancialstatusfile";
-   public const string SchoolPFYCapitalForwardStatusFile = "sip_pfyrevenuecapitalcarriedforwardfile";
-   public const string SchoolCFYRevenueStatusFile = "sip_cfyrevenuecurrentfinancialstatusfile";
-   public const string SchoolCFYCapitalForwardFile = "sip_cfyforecastcapitalcarriedforwardfile";
-   public const string NFYForecastedRevenueFilePrefixFieldName = "sip_nfynextcurrentfinancialfile";
-   public const string NFYForecastedCapitalFilePrefixFieldName = "sip_nfyforecastcapitalcarriedforwardfile";
-   public const string JoinAMatTrustConsentFilePrefixFieldName = "sip_changestotrustconsent";
-   public const string JoinAMatTrustGovernanceFilePrefixFieldName = "sip_formtrustgovernancefile";
-}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
index c663b320b..92ca63991 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
@@ -10,7 +10,6 @@
 using Dfe.PrepareConversions.Routing;
 using Dfe.PrepareConversions.Security;
 using Dfe.PrepareConversions.Services;
-using Dfe.PrepareConversions.Services.Helpers;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -150,14 +149,10 @@ public void ConfigureServices(IServiceCollection services)
       services.AddScoped<IGraphUserService, GraphUserService>();
       services.AddScoped<IDfeHttpClientFactory, DfeHttpClientFactory>();
       services.AddScoped<ICorrelationContext, CorrelationContext>();
-      services.AddSingleton<IAadAuthorisationHelper, AadAuthorisationHelper>();
 
-      services.Configure<SharePointApiOptions>(Configuration.GetSection("Sharepoint"));
-      var sharepointOptions = Configuration.GetSection("Sharepoint").Get<SharePointApiOptions>();
-      services.AddHttpClient<IFileService, FileService>(client =>
-      {
-         client.BaseAddress = new Uri(sharepointOptions.ApiUrl);
-      });
+      services.Configure<SharePointOptions>(Configuration.GetSection("Sharepoint"));
+      var sharepointOptions = Configuration.GetSection("Sharepoint").Get<SharePointOptions>();
+
       Links.InializeProjectDocumentsEnabled(sharepointOptions.Enabled);
 
       // Initialize the TransfersUrl
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
index 842d459dd..e585ac59b 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
@@ -12,7 +12,8 @@ public ProjectViewModel(AcademyConversionProject project)
    {
       Id = project.Id.ToString();
       FormAMatProjectId = project.FormAMatProjectId;
-      SharePointId = project.SharePointId;
+      ApplicationSharePointId = project.ApplicationSharePointId;
+      SchoolSharePointId = project.SchoolSharePointId;
       IsFormAMat = project.IsFormAMat.HasValue && project.IsFormAMat.Value;
       ProjectStatus = ProjectListHelper.MapProjectStatus(project.ProjectStatus).Value;
       ProjectStatusColour = ProjectListHelper.MapProjectStatus(project.ProjectStatus).Colour;
@@ -131,7 +132,8 @@ public ProjectViewModel(AcademyConversionProject project)
 
    public string Id { get; }
    public int? FormAMatProjectId { get; }
-   public Guid? SharePointId { get; }
+   public Guid? SchoolSharePointId { get; }
+   public Guid? ApplicationSharePointId { get; }
    public string ProjectStatus { get; }
    public string ProjectStatusColour { get; }
    public string ApplicationReferenceNumber { get; set; }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
index b68883d12..719d7122d 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
@@ -51,9 +51,6 @@
    "MaintenanceMode": false,
    "Sharepoint": {
       "Enabled": false,
-      "ApiUrl": "",
-      "ClientId": "",
-      "Secret": "",
-      "Authority": ""
+      "Url": ""
    }
 }

From 44b8546edbfd54d9de130a68f7953f8739b4d9c6 Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Mon, 10 Jun 2024 11:03:49 +0100
Subject: [PATCH 03/23] School name now showing on record a decision page

---
 .../Pages/TaskList/Decision/RecordDecision.cshtml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
index d4399c7e5..87f32dda1 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
@@ -11,7 +11,7 @@
     <partial name="_ErrorSummary" />
 }
 
-<span id="selection-span" class="govuk-caption-l">Record the decision</span>
+<span id="selection-span" class="govuk-caption-l">@Model.SchoolName</span>
 <h1 class="govuk-heading-l">Record the decision</h1>
 
 <form method="post">

From 42708703b786889c412ac9e53c7480a51aa2b6e3 Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Mon, 10 Jun 2024 11:22:25 +0100
Subject: [PATCH 04/23] Updated ordering for decisions

---
 .../TaskList/Decision/RecordDecision.cshtml   | 54 ++++++++++++-------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
index 87f32dda1..19988de7e 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
@@ -21,26 +21,42 @@
             </legend>
             <div class="govuk-radios @ModelState.GetErrorStyleClass()" data-module="govuk-radios" id="AdvisoryBoardDecision">
 
-                @foreach (var decisionOption in Enum.GetValues(typeof(AdvisoryBoardDecisions)))
-                {
-                    var decision = (AdvisoryBoardDecisions)decisionOption;
-
-                    if (decision == AdvisoryBoardDecisions.DAORevoked && Model.AcademyTypeAndRoute.ToLower() != "sponsored")
+                @* Define the custom order using a dictionary *@
+                @{ var customOrder = new Dictionary<AdvisoryBoardDecisions, int>
                     {
-                        continue;
-                    }
-
-                    var id = $"{decision.ToString().ToLower()}-radio";
-                    var title = decision == AdvisoryBoardDecisions.DAORevoked ? "DAO (Directive Academy Order) revoked" : decision.ToString();
-
-                    <div class="govuk-radios__item">
-                        <input class="govuk-radios__input" type="radio" asp-for="@Model.AdvisoryBoardDecision"
-                               title="@title.ToLower()" value="@decision" id="@id" />
-                        <label class="govuk-label govuk-radios__label" for="@id">
-                            @title
-                        </label>
-                    </div>
-                }
+                    { AdvisoryBoardDecisions.Approved, 1 },
+                    { AdvisoryBoardDecisions.Declined, 2 },
+                    { AdvisoryBoardDecisions.Deferred, 3 },
+                    { AdvisoryBoardDecisions.DAORevoked, 4 },
+                    { AdvisoryBoardDecisions.Withdrawn, 5 }
+                    };
+
+                    @* Get the enum values and sort them based on the custom order *@
+                    var sortedDecisions = Enum.GetValues(typeof(AdvisoryBoardDecisions))
+                    .Cast<AdvisoryBoardDecisions>
+                        ()
+                        .OrderBy(decision => customOrder[decision]);
+                        }
+
+                        @* Iterate through the sorted list *@
+                        @foreach (var decision in sortedDecisions)
+                        {
+                            if (decision == AdvisoryBoardDecisions.DAORevoked && Model.AcademyTypeAndRoute.ToLower() != "sponsored")
+                            {
+                                continue;
+                            }
+
+                            var id = $"{decision.ToString().ToLower()}-radio";
+                            var title = decision == AdvisoryBoardDecisions.DAORevoked ? "DAO (Directive Academy Order) revoked" : decision.ToString();
+
+                            <div class="govuk-radios__item">
+                                <input class="govuk-radios__input" type="radio" asp-for="@Model.AdvisoryBoardDecision"
+                                       title="@title.ToLower()" value="@decision" id="@id" />
+                                <label class="govuk-label govuk-radios__label" for="@id">
+                                    @title
+                                </label>
+                            </div>
+                        }
             </div>
         </fieldset>
     </div>

From a41511905b0cdd5ebba21c757197704e5a0deef4 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Mon, 10 Jun 2024 12:54:10 +0100
Subject: [PATCH 05/23] Application form documents tab and links

---
 .../Dfe.PrepareConversions/Models/Links.cs    | 12 +++++-----
 .../Pages/ApplicationDocuments/Index.cshtml   | 24 +++++++++++++++++++
 .../Index.cshtml.cs                           |  9 +------
 .../Pages/ProjectDocuments/Index.cshtml       | 22 -----------------
 .../Pages/Shared/_SubMenu.cshtml              | 16 ++++++-------
 5 files changed, 39 insertions(+), 44 deletions(-)
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
 rename Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/{ProjectDocuments => ApplicationDocuments}/Index.cshtml.cs (79%)
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
index d66b7f2b8..9d0a826bb 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
@@ -10,8 +10,8 @@ public static class Links
    private static string _transfersUrl;
    public static string TransfersUrl => _transfersUrl;
 
-   private static bool _isProjectDocumentsEnabled;
-   public static bool IsProjectDocumentsEnabled => _isProjectDocumentsEnabled;
+   private static bool _isApplicationDocumentsEnabled;
+   public static bool IsApplicationDocumentsEnabled => _isApplicationDocumentsEnabled;
 
    private static LinkItem AddLinkItem(string page, string backText = "Back")
    {
@@ -24,8 +24,8 @@ public static void InitializeTransfersUrl(string transfersUrl)
       _transfersUrl = transfersUrl;
    }
 
-   public static void InializeProjectDocumentsEnabled(bool isProjectDocumentsEnabled) {
-      _isProjectDocumentsEnabled = isProjectDocumentsEnabled;
+   public static void InializeProjectDocumentsEnabled(bool isApplicationDocumentsEnabled) {
+      _isApplicationDocumentsEnabled = isApplicationDocumentsEnabled;
    }
    public static LinkItem ByPage(string page)
    {
@@ -72,9 +72,9 @@ public static class ProjectNotes
       public static readonly LinkItem NewNote = AddLinkItem(page: "/ProjectNotes/NewNote");
    }
 
-   public static class ProjectDocuments
+   public static class ApplicationDocuments
    {
-      public static readonly LinkItem Index = AddLinkItem(page: "/ProjectDocuments/Index");
+      public static readonly LinkItem Index = AddLinkItem(page: "/ApplicationDocuments/Index");
    }
 
    public static class TaskList
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
new file mode 100644
index 000000000..bd93de677
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
@@ -0,0 +1,24 @@
+@page "/application-documents/{id:int}"
+@using Dfe.PrepareConversions.Data.Models
+@model Dfe.PrepareConversions.Pages.ApplicationDocuments.IndexModel
+@{
+    ViewData["Title"] = "Application documents";
+}
+
+@section BeforeMain
+{
+    <a asp-page="@Model.ReturnPage" asp-route-id="@Model.ReturnId" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
+}
+
+<partial name="Shared/_ProjectHeader" model="Model.Project" />
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <p class="govuk-body">
+            Application level documents folder <a href="@Model.ApplicationLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">here</a>
+        </p><p class="govuk-body">
+            School level documents folder <a href="@Model.SchoolLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">here</a>
+        </p>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
similarity index 79%
rename from Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs
rename to Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
index efeefe54e..d8d87d477 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
@@ -6,15 +6,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Net;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
-using static System.Net.WebRequestMethods;
 
-namespace Dfe.PrepareConversions.Pages.ProjectDocuments;
+namespace Dfe.PrepareConversions.Pages.ApplicationDocuments;
 
 public class IndexModel : BaseAcademyConversionProjectPageModel
 {
@@ -38,8 +33,6 @@ public override async Task<IActionResult> OnGetAsync(int id)
       await base.OnGetAsync(id);
       var rootSharePointFolder = _configuration["Sharepoint:Url"];
 
-      //https://educationgovuk.sharepoint.com/sites/sip-dev/sip_application/Forms/AllItems.aspx?id=%2Fsites%2Fsip%2Ddev%2Fsip%5Fapplication%2FA2B%5F0027%5F63B137B6D21DEB11A813000D3A38AA47
-
       ApplicationLevelDocumentsFolder = $"{rootSharePointFolder}sip_application/{Project.ApplicationReferenceNumber}_{Project.ApplicationSharePointId.Value.ToString("N").ToUpper()}";
       SchoolLevelDocumentsFolder = $"{rootSharePointFolder}sip_applyingschools/{Project.ApplicationReferenceNumber}_{Project.SchoolSharePointId.Value.ToString("N").ToUpper()}";
 
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml
deleted file mode 100644
index c1fdf5b4c..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectDocuments/Index.cshtml
+++ /dev/null
@@ -1,22 +0,0 @@
-@page "/project-documents/{id:int}"
-@using Dfe.PrepareConversions.Data.Models
-@model Dfe.PrepareConversions.Pages.ProjectDocuments.IndexModel
-@{
-    ViewData["Title"] = "Project documents";
-}
-
-@section BeforeMain
-{
-    <a asp-page="@Model.ReturnPage" asp-route-id="@Model.ReturnId" class="govuk-back-link">@Links.ProjectList.Index.BackText</a>
-}
-
-<partial name="Shared/_ProjectHeader" model="Model.Project" />
-
-<div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
-
-        Application level documents folder <a href="@Model.ApplicationLevelDocumentsFolder" target="_blank">here</a><br />
-        School level documents folder <a href="@Model.SchoolLevelDocumentsFolder" target="_blank">here</a>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
index d4b593b3e..d79369750 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
@@ -36,7 +36,13 @@
                 School application form
             </sub-menu-link>
         </li>
-
+        <li if="@Links.IsApplicationDocumentsEnabled && !Model.IsExternalSchoolApplication" class="moj-sub-navigation__item">
+            <sub-menu-link class="moj-sub-navigation__link"
+                           asp-page="@Links.ApplicationDocuments.Index.Page"
+                           asp-route-id="@id">
+                Application documents
+            </sub-menu-link>
+        </li>
         <li if="@Model.IsSponsored" class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
                            asp-page="@Links.AnnexB.Index.Page"
@@ -60,12 +66,6 @@
                 Project notes
             </sub-menu-link>
         </li>
-        <li if="@Links.IsProjectDocumentsEnabled" class="moj-sub-navigation__item">
-            <sub-menu-link class="moj-sub-navigation__link"
-                           asp-page="@Links.ProjectDocuments.Index.Page"
-                           asp-route-id="@id">
-                Project documents
-            </sub-menu-link>
-        </li>
+
     </ul>
 </nav>
\ No newline at end of file

From 3b0a427d197951e26607c6af2d1435ba3197518f Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Mon, 10 Jun 2024 12:59:39 +0100
Subject: [PATCH 06/23] appsettings fix

---
 Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
index 1ebaa7d6a..06c67f4bf 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
@@ -49,7 +49,6 @@
       "ShowDirectedAcademyOrders": true
    },
    "notificationBannerMessage": "",
-   "MaintenanceMode": false
    "MaintenanceMode": false,
    "Sharepoint": {
       "Enabled": false,

From 1d5d013813b85f7aabac2f2a05d9df76d2959e28 Mon Sep 17 00:00:00 2001
From: dneed <113213942+dneed-nimble@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:35:29 +0100
Subject: [PATCH 07/23] Update IndexIntegrationTests.cs

---
 .../Pages/TaskList/IndexIntegrationTests.cs                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
index a36f2d1f2..4f71ca202 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
@@ -27,7 +27,7 @@ public async Task Should_redirect_to_record_decision()
    {
       await OpenAndConfirmPathAsync($"/task-list/{_project.Id}/record-a-decision");
 
-      await NavigateAsync("Record a decision", 1);
+      await NavigateAsync("Record a decision", 0);
 
       Document.Url.Should().Contain($"/task-list/{_project.Id}/decision/record-decision");
    }

From eb47705607ba78f50f54ee48d432e08bc825609d Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Mon, 10 Jun 2024 15:36:41 +0100
Subject: [PATCH 08/23] test fix

---
 .../Pages/TaskList/IndexIntegrationTests.cs                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
index a36f2d1f2..4f71ca202 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
@@ -27,7 +27,7 @@ public async Task Should_redirect_to_record_decision()
    {
       await OpenAndConfirmPathAsync($"/task-list/{_project.Id}/record-a-decision");
 
-      await NavigateAsync("Record a decision", 1);
+      await NavigateAsync("Record a decision", 0);
 
       Document.Url.Should().Contain($"/task-list/{_project.Id}/decision/record-decision");
    }

From c5b681aa9b8d2d6a93e756e0440b668b2d47313d Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Mon, 10 Jun 2024 16:36:57 +0100
Subject: [PATCH 09/23] New DAO Journey up to check boxes

---
 .../Pages/TaskList/IndexIntegrationTests.cs   |   2 +-
 .../Models/CheckBoxItem.cs                    |   8 ++
 .../Dfe.PrepareConversions/Models/Links.cs    |   2 +
 .../Decision/DAOBeforeYouStart.cshtml         | 107 ++++++++++++++++++
 .../Decision/DAOBeforeYouStart.cshtml.cs      |  93 +++++++++++++++
 .../TaskList/Decision/DAOPrecursor.cshtml     |  33 ++++++
 .../TaskList/Decision/DAOPrecursor.cshtml.cs  |  56 +++++++++
 .../Decision/RecordDecision.cshtml.cs         |   1 +
 8 files changed, 301 insertions(+), 1 deletion(-)
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Models/CheckBoxItem.cs
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOPrecursor.cshtml
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOPrecursor.cshtml.cs

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
index a36f2d1f2..4f71ca202 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/IndexIntegrationTests.cs
@@ -27,7 +27,7 @@ public async Task Should_redirect_to_record_decision()
    {
       await OpenAndConfirmPathAsync($"/task-list/{_project.Id}/record-a-decision");
 
-      await NavigateAsync("Record a decision", 1);
+      await NavigateAsync("Record a decision", 0);
 
       Document.Url.Should().Contain($"/task-list/{_project.Id}/decision/record-decision");
    }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/CheckBoxItem.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/CheckBoxItem.cs
new file mode 100644
index 000000000..e917d3670
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/CheckBoxItem.cs
@@ -0,0 +1,8 @@
+namespace Dfe.PrepareConversions.Models;
+
+public class CheckBoxItem
+{
+   public string Title { get; set; }
+   public string HintText { get; set; }
+   public string CheckBoxId { get; set; }
+}
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
index 12b6524a3..7c46266c0 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Models/Links.cs
@@ -204,6 +204,8 @@ public static class Decision
    {
       public static readonly LinkItem RecordDecision = AddLinkItem(backText: "Back", page: "/TaskList/Decision/RecordDecision");
       public static readonly LinkItem WhoDecided = AddLinkItem(backText: "Back", page: "/TaskList/Decision/WhoDecided");
+      public static readonly LinkItem DAOPrecursor = AddLinkItem(backText: "Back", page: "/TaskList/Decision/DAOPrecursor");
+      public static readonly LinkItem DAOBeforeYouStart = AddLinkItem(backText: "Back", page: "/TaskList/Decision/DAOBeforeYouStart");
       public static readonly LinkItem DeclineReason = AddLinkItem(backText: "Back", page: "/TaskList/Decision/DeclineReason");
       public static readonly LinkItem AnyConditions = AddLinkItem(backText: "Back", page: "/TaskList/Decision/AnyConditions");
       public static readonly LinkItem DecisionDate = AddLinkItem(backText: "Back", page: "/TaskList/Decision/DecisionDate");
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml
new file mode 100644
index 000000000..0ba18bd72
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml
@@ -0,0 +1,107 @@
+@page "/task-list/{id:int}/decision/dao-before-you-start"
+@using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision
+@using Dfe.Academisation.ExtensionMethods
+@model Dfe.PrepareConversions.Pages.TaskList.Decision.DAOBeforeYouStartModel
+@{
+    ViewData["Title"] = $"DAO before you start";
+}
+
+@section BeforeMain
+{
+    <partial name="_BackLink" model="@Model.BackLinkModel" />
+    <partial name="_ErrorSummary" />
+}
+@if (Model.ShowBanner)
+{
+    <div class="govuk-notification-banner govuk-notification-banner--important" role="alert" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
+        <div class="govuk-notification-banner__header">
+            <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
+                Important
+            </h2>
+        </div>
+        <div class="govuk-notification-banner__content">
+            <h3 class="govuk-notification-banner__heading">
+                You cannot record this decision yet
+            </h3>
+            <p class="govuk-body">
+                Before you can record the decision to revoke an Academy Order:
+            </p>
+            <ul class="govuk-list govuk-list--bullet">
+                <li>a minister must approve the decision</li>
+                <li>you must have sent the letter confirming the decision to the school</li>
+                <li>you must have saved a copy of the letter in SharePoint</li>
+            </ul>
+            <p class="govuk-body">
+                You can <a href="link-to-task-list" class="govuk-link">go back to the task list</a> and continue working on this project, or <a href="link-to-project-list" class="govuk-link">choose another project from your project list</a>.
+            </p>
+        </div>
+    </div>
+}
+<span id="selection-span" class="govuk-caption-l">Revoke Directive Academy Order</span>
+<h1 class="govuk-heading-l">Before you start</h1>
+
+<form method="post">
+    <div class="govuk-form-group">
+        <div class="govuk-grid-column-two-thirds govuk-!-padding-left-0">
+            <div class="govuk-form-group">
+
+                <fieldset class="govuk-fieldset">
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+                        <h2 class="govuk-heading-m">Confirm a minister has approved this decision</h2>
+                    </legend>
+                    <div class="govuk-hint">
+                        The revocation of a DAO (Directive Academy Order) must be signed off by a minister. It cannot proceed without ministerial approval.
+                    </div>
+                    <div class="govuk-checkboxes">
+                        <div class="govuk-checkboxes__item">
+                            <input class="govuk-checkboxes__input" id="MinisterApproval" name="MinisterApproval" type="checkbox" value="true" />
+                            <label class="govuk-label govuk-checkboxes__label" for="MinisterApproval">I confirm a minister has approved this decision</label>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+
+            <div class="govuk-form-group">
+                <fieldset class="govuk-fieldset">
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+                        <h2 class="govuk-heading-m">Confirm you have sent the letter confirming the revocation decision</h2>
+                    </legend>
+                    <div class="govuk-hint">
+                        You must write and send the letter to the school’s governing body to confirm the minister’s decision.
+                    </div>
+                    <p class="govuk-body">
+                        Use the <a href="link-to-letter-templates" target="_blank" class="govuk-link">letter templates in the revocation guidance</a> to help you.
+                    </p>
+                    <div class="govuk-checkboxes">
+                        <div class="govuk-checkboxes__item">
+                            <input class="govuk-checkboxes__input" id="LetterSent" name="LetterSent" type="checkbox" value="true" />
+                            <label class="govuk-label govuk-checkboxes__label" for="LetterSent">I confirm I have sent the letter confirming the revocation decision</label>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+
+            <div class="govuk-form-group">
+                <fieldset class="govuk-fieldset">
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+                        <h2 class="govuk-heading-m">Confirm you have saved a copy of the letter</h2>
+                    </legend>
+                    <div class="govuk-hint">
+                        You must save a copy of the letter in the school’s SharePoint folder.
+                    </div>
+                    <div class="govuk-checkboxes">
+                        <div class="govuk-checkboxes__item">
+                            <input class="govuk-checkboxes__input" id="LetterSaved" name="LetterSaved" type="checkbox" value="true" />
+                            <label class="govuk-label govuk-checkboxes__label" for="LetterSaved">I confirm I have saved a copy of the letter to the school’s SharePoint folder</label>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+        </div>
+    </div>
+
+
+    <button class="govuk-button" data-module="govuk-button" id="submit-btn">
+        Continue
+    </button>
+</form>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
new file mode 100644
index 000000000..385152e0a
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
@@ -0,0 +1,93 @@
+using Dfe.Academisation.ExtensionMethods;
+using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision;
+using Dfe.PrepareConversions.Data.Services;
+using Dfe.PrepareConversions.Models;
+using Dfe.PrepareConversions.Pages.TaskList.Decision.Models;
+using Dfe.PrepareConversions.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Dfe.PrepareConversions.Pages.TaskList.Decision;
+
+public class DAOBeforeYouStartModel : DecisionBaseModel
+{
+   private readonly ErrorService _errorService;
+
+   public DAOBeforeYouStartModel(IAcademyConversionProjectRepository repository,
+                          ISession session,
+                          ErrorService errorService)
+      : base(repository, session)
+   {
+      _errorService = errorService;
+   }
+
+   public DecisionMadeBy? DecisionMadeBy { get; set; }
+
+   public string DecisionText { get; set; }
+
+   public IEnumerable<DecisionMadeBy> DecisionMadeByOptions => Enum.GetValues(typeof(DecisionMadeBy)).Cast<DecisionMadeBy>();
+
+   [BindProperty]
+   public bool MinisterApproval { get; set; }
+
+   [BindProperty]
+   public bool LetterSent { get; set; }
+
+   [BindProperty]
+   public bool LetterSaved { get; set; }
+   public bool ShowBanner { get; set; } = false;
+
+   public IActionResult OnGet(int id)
+   {
+      SetBackLinkModel(Links.Decision.RecordDecision, id);
+      AdvisoryBoardDecision decision = GetDecisionFromSession(id);
+
+      DecisionText = decision == null ? string.Empty : decision.Decision.ToDescription().ToLowerInvariant();
+      return Page();
+   }
+
+   public IActionResult OnPost(int id)
+   {
+      if (!ModelState.IsValid)
+      {
+         _errorService.AddErrors(new[] { "DecisionMadeBy" }, ModelState);
+         return OnGet(id);
+      }
+
+      AdvisoryBoardDecision decision = GetDecisionFromSession(id) ?? new AdvisoryBoardDecision();
+      decision.DecisionMadeBy = Data.Models.AdvisoryBoardDecision.DecisionMadeBy.Minister;
+      decision.DecisionMakerName = decision.DecisionMadeBy == Data.Models.AdvisoryBoardDecision.DecisionMadeBy.None ? null : decision.DecisionMakerName;
+
+      // Use the bound properties to check the checkbox values
+      if (MinisterApproval && LetterSent && LetterSaved)
+      {
+         // All checkboxes are checked, proceed with the decision
+         SetDecisionInSession(id, decision);
+         return DetermineRedirectPage(decision);
+      }
+      else
+      {
+         // Handle the case where not all checkboxes are checked
+         ShowBanner = true;
+         return OnGet(id);
+      }
+   }
+
+   private IActionResult DetermineRedirectPage(AdvisoryBoardDecision decision)
+   {
+      var pageToReturnTo = decision.Decision switch
+      {
+         AdvisoryBoardDecisions.Approved => RedirectToPage(Links.Decision.AnyConditions.Page, LinkParameters),
+         AdvisoryBoardDecisions.Declined => RedirectToPage(Links.Decision.DeclineReason.Page, LinkParameters),
+         AdvisoryBoardDecisions.Deferred => RedirectToPage(Links.Decision.WhyDeferred.Page, LinkParameters),
+         AdvisoryBoardDecisions.Withdrawn => RedirectToPage(Links.Decision.WhyWithdrawn.Page, LinkParameters),
+         AdvisoryBoardDecisions.DAORevoked => RedirectToPage(Links.Decision.WhyDAORevoked.Page, LinkParameters),
+         _ => RedirectToPage(Links.Decision.AnyConditions.Page, LinkParameters)
+      };
+
+      return decision.DecisionMadeBy == Data.Models.AdvisoryBoardDecision.DecisionMadeBy.None ? pageToReturnTo : RedirectToPage(Links.Decision.DecisionMaker.Page, LinkParameters);
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOPrecursor.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOPrecursor.cshtml
new file mode 100644
index 000000000..e0ea656be
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOPrecursor.cshtml
@@ -0,0 +1,33 @@
+@page "/task-list/{id:int}/decision/dao-precursor"
+@using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision
+@using Dfe.Academisation.ExtensionMethods
+@model Dfe.PrepareConversions.Pages.TaskList.Decision.DAOPrecursorModel
+@{
+    ViewData["Title"] = $"Record DAO Revocation";
+}
+
+@section BeforeMain
+{
+    <partial name="_BackLink" model="@Model.BackLinkModel" />
+    <partial name="_ErrorSummary" />
+}
+
+<span id="selection-span" class="govuk-caption-l">@Model.SchoolName</span>
+<h1 class="govuk-heading-l">Record Directive Academy Order revocation</h1>
+
+<form method="post">
+
+    <p>Revoking a DAO (Directive Academy Order) will end this conversion project.</p>
+    <p>This decision must be approved by a minister.</p>
+    <p>You must also send a letter confirming the decision to the school’s governing body, and save this in the school’s SharePoint folder.</p>
+    <p>If you choose to record the revocation of this project's Academy Order, you will need to enter information about:</p>
+    <ul class="govuk-list govuk-list--bullet">
+        <li>who made the decision</li>
+        <li>why they made the decision</li>
+        <li>when the decision was made</li>
+    </ul>
+
+    <button class="govuk-button" data-module="govuk-button" id="submit-btn">
+        Continue
+    </button>
+</form>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOPrecursor.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOPrecursor.cshtml.cs
new file mode 100644
index 000000000..bc2a8beb4
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOPrecursor.cshtml.cs
@@ -0,0 +1,56 @@
+using Dfe.Academisation.ExtensionMethods;
+using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision;
+using Dfe.PrepareConversions.Data.Services;
+using Dfe.PrepareConversions.Models;
+using Dfe.PrepareConversions.Pages.TaskList.Decision.Models;
+using Dfe.PrepareConversions.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dfe.PrepareConversions.Pages.TaskList.Decision;
+
+public class DAOPrecursorModel : DecisionBaseModel
+{
+   private readonly ErrorService _errorService;
+
+   public DAOPrecursorModel(IAcademyConversionProjectRepository repository,
+                          ISession session,
+                          ErrorService errorService)
+      : base(repository, session)
+   {
+      _errorService = errorService;
+   }
+
+   public string DecisionText { get; set; }
+
+   public IActionResult OnGet(int id)
+   {
+      SetBackLinkModel(Links.Decision.RecordDecision, id);
+      AdvisoryBoardDecision decision = GetDecisionFromSession(id);
+
+      DecisionText = decision == null ? string.Empty : decision.Decision.ToDescription().ToLowerInvariant();
+      return Page();
+   }
+
+   public IActionResult OnPost(int id)
+   {
+      if (!ModelState.IsValid)
+      {
+         _errorService.AddErrors(new[] { "DecisionMadeBy" }, ModelState);
+         return OnGet(id);
+      }
+
+      AdvisoryBoardDecision decision = GetDecisionFromSession(id) ?? new AdvisoryBoardDecision();
+      decision.DecisionMakerName = decision.DecisionMadeBy == Data.Models.AdvisoryBoardDecision.DecisionMadeBy.None ? null : decision.DecisionMakerName;
+
+      SetDecisionInSession(id, decision);
+
+      return DetermineRedirectPage(decision);
+   }
+
+
+   private IActionResult DetermineRedirectPage(AdvisoryBoardDecision decision)
+   {
+      return RedirectToPage(Links.Decision.DAOBeforeYouStart.Page, LinkParameters);
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml.cs
index 3703039f7..e3a06f17f 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml.cs
@@ -61,6 +61,7 @@ public async Task<IActionResult> OnPost(int id)
       decision.Decision = AdvisoryBoardDecision.Value;
       SetDecisionInSession(id, decision);
 
+      if (decision.Decision.Equals(AdvisoryBoardDecisions.DAORevoked)) { return RedirectToPage(Links.Decision.DAOPrecursor.Page, LinkParameters); }
       return RedirectToPage(Links.Decision.WhoDecided.Page, LinkParameters);
    }
 }

From 38bc5713c57a6b8922428d21a5746760a6fb76f4 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Tue, 11 Jun 2024 16:30:08 +0100
Subject: [PATCH 10/23] fix to show message when documents are unavailable

---
 .../Pages/ApplicationDocuments/Index.cshtml          | 12 ++++++++++--
 .../Pages/ApplicationDocuments/Index.cshtml.cs       | 12 +++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
index bd93de677..37b2ad1dd 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
@@ -1,5 +1,6 @@
 @page "/application-documents/{id:int}"
 @using Dfe.PrepareConversions.Data.Models
+@using Dfe.PrepareConversions.TagHelpers
 @model Dfe.PrepareConversions.Pages.ApplicationDocuments.IndexModel
 @{
     ViewData["Title"] = "Application documents";
@@ -14,11 +15,18 @@
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-        <p class="govuk-body">
+        <p class="govuk-body" if="@Model.Project.ApplicationSharePointId.HasValue">
             Application level documents folder <a href="@Model.ApplicationLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">here</a>
-        </p><p class="govuk-body">
+        </p>
+        <p class="govuk-body" if="!@Model.Project.ApplicationSharePointId.HasValue">
+            Application level documents are unavailable
+        </p>
+        <p class="govuk-body" if="@Model.Project.SchoolSharePointId.HasValue">
             School level documents folder <a href="@Model.SchoolLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">here</a>
         </p>
+        <p class="govuk-body" if="!@Model.Project.SchoolSharePointId.HasValue">
+            School level documents are unavailable
+        </p>
     </div>
 
 </div>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
index d8d87d477..1b2782d77 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
@@ -26,16 +26,22 @@ public IndexModel(IAcademyConversionProjectRepository repository, IConfiguration
    [BindProperty]
    public string ApplicationLevelDocumentsFolder { get; set; }
    [BindProperty]
-   public string SchoolLevelDocumentsFolder { get; private set; }
+   public string SchoolLevelDocumentsFolder { get; set; }
 
    public override async Task<IActionResult> OnGetAsync(int id)
    {
       await base.OnGetAsync(id);
       var rootSharePointFolder = _configuration["Sharepoint:Url"];
 
-      ApplicationLevelDocumentsFolder = $"{rootSharePointFolder}sip_application/{Project.ApplicationReferenceNumber}_{Project.ApplicationSharePointId.Value.ToString("N").ToUpper()}";
-      SchoolLevelDocumentsFolder = $"{rootSharePointFolder}sip_applyingschools/{Project.ApplicationReferenceNumber}_{Project.SchoolSharePointId.Value.ToString("N").ToUpper()}";
+      if (Project.ApplicationSharePointId.HasValue)
+      {
+         ApplicationLevelDocumentsFolder = $"{rootSharePointFolder}sip_application/{Project.ApplicationReferenceNumber}_{Project.ApplicationSharePointId.Value.ToString("N").ToUpper()}";
+      }
 
+      if (Project.SchoolSharePointId.HasValue)
+      {
+         SchoolLevelDocumentsFolder = $"{rootSharePointFolder}sip_applyingschools/{Project.ApplicationReferenceNumber}_{Project.SchoolSharePointId.Value.ToString("N").ToUpper()}";
+      }
       return Page();
    }
 }

From 640f30a425761785971c13ac461ee121adbf4142 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Tue, 11 Jun 2024 16:48:55 +0100
Subject: [PATCH 11/23] model fix

---
 .../Pages/ApplicationDocuments/Index.cshtml               | 8 ++++----
 .../Pages/ApplicationDocuments/Index.cshtml.cs            | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
index 37b2ad1dd..7c43f1d6a 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
@@ -15,16 +15,16 @@
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-        <p class="govuk-body" if="@Model.Project.ApplicationSharePointId.HasValue">
+        <p class="govuk-body" if="Model.Project.ApplicationSharePointId.HasValue">
             Application level documents folder <a href="@Model.ApplicationLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">here</a>
         </p>
-        <p class="govuk-body" if="!@Model.Project.ApplicationSharePointId.HasValue">
+        <p class="govuk-body" if="!Model.Project.ApplicationSharePointId.HasValue">
             Application level documents are unavailable
         </p>
-        <p class="govuk-body" if="@Model.Project.SchoolSharePointId.HasValue">
+        <p class="govuk-body" if="Model.Project.SchoolSharePointId.HasValue">
             School level documents folder <a href="@Model.SchoolLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">here</a>
         </p>
-        <p class="govuk-body" if="!@Model.Project.SchoolSharePointId.HasValue">
+        <p class="govuk-body" if="!Model.Project.SchoolSharePointId.HasValue">
             School level documents are unavailable
         </p>
     </div>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
index 1b2782d77..64968b93c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml.cs
@@ -42,6 +42,7 @@ public override async Task<IActionResult> OnGetAsync(int id)
       {
          SchoolLevelDocumentsFolder = $"{rootSharePointFolder}sip_applyingschools/{Project.ApplicationReferenceNumber}_{Project.SchoolSharePointId.Value.ToString("N").ToUpper()}";
       }
+
       return Page();
    }
 }

From bdbece4df14382de9de3eac6f42a40906e2f7add Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Tue, 11 Jun 2024 18:21:30 +0100
Subject: [PATCH 12/23] documents page style fixes

---
 .../Pages/ApplicationDocuments/Index.cshtml                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
index 7c43f1d6a..b176df80a 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationDocuments/Index.cshtml
@@ -12,17 +12,17 @@
 }
 
 <partial name="Shared/_ProjectHeader" model="Model.Project" />
-
+<h2 class="govuk-heading-l govuk-!-margin-bottom govuk-!-font-size-36">Application documents</h2>
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
         <p class="govuk-body" if="Model.Project.ApplicationSharePointId.HasValue">
-            Application level documents folder <a href="@Model.ApplicationLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">here</a>
+            <a href="@Model.ApplicationLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">Application level documents folder (opens in new tab)</a>
         </p>
         <p class="govuk-body" if="!Model.Project.ApplicationSharePointId.HasValue">
             Application level documents are unavailable
         </p>
         <p class="govuk-body" if="Model.Project.SchoolSharePointId.HasValue">
-            School level documents folder <a href="@Model.SchoolLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">here</a>
+            <a href="@Model.SchoolLevelDocumentsFolder" class="govuk-link" rel="noreferrer noopener" target="_blank">School level documents folder (opens in new tab)</a>
         </p>
         <p class="govuk-body" if="!Model.Project.SchoolSharePointId.HasValue">
             School level documents are unavailable

From ee3603bca27a282fe94adf9f09e0cf3e3620c73a Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Wed, 12 Jun 2024 11:00:05 +0100
Subject: [PATCH 13/23] Finished content for DAO Revoked journey

---
 .../TaskList/Decision/AnyConditions.cshtml.cs |   2 +-
 .../Decision/DAOBeforeYouStart.cshtml         |  16 +-
 .../Decision/DAOBeforeYouStart.cshtml.cs      |  23 +-
 .../TaskList/Decision/DecisionMaker.cshtml    |  32 +-
 .../TaskList/Decision/DecisionMaker.cshtml.cs |  71 ++--
 .../TaskList/Decision/DeclineReason.cshtml.cs |   3 +-
 .../Pages/TaskList/Decision/Summary.cshtml    | 368 +++++++++---------
 .../TaskList/Decision/WhoDecided.cshtml.cs    |   4 +-
 .../TaskList/Decision/WhyDAORevoked.cshtml    |   2 +-
 .../TaskList/Decision/WhyDAORevoked.cshtml.cs |   2 +-
 .../TaskList/Decision/WhyDeferred.cshtml.cs   |   2 +-
 .../TaskList/Decision/WhyWithdrawn.cshtml.cs  |   2 +-
 .../Dfe.PrepareConversions/appsettings.json   |   3 +-
 13 files changed, 249 insertions(+), 281 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/AnyConditions.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/AnyConditions.cshtml.cs
index f11da3ce7..a9df8d93c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/AnyConditions.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/AnyConditions.cshtml.cs
@@ -55,7 +55,7 @@ public IActionResult OnPost(int id)
 
          SetDecisionInSession(id, decision);
 
-         return RedirectToPage(Links.Decision.DecisionDate.Page, LinkParameters);
+         return RedirectToPage(Links.Decision.DecisionMaker.Page, LinkParameters);
       }
 
       _errorService.AddErrors(ModelState.Keys, ModelState);
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml
index 0ba18bd72..de471e369 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml
@@ -1,7 +1,9 @@
 @page "/task-list/{id:int}/decision/dao-before-you-start"
 @using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision
 @using Dfe.Academisation.ExtensionMethods
+@using Microsoft.Extensions.Configuration
 @model Dfe.PrepareConversions.Pages.TaskList.Decision.DAOBeforeYouStartModel
+@inject IConfiguration Configuration
 @{
     ViewData["Title"] = $"DAO before you start";
 }
@@ -32,7 +34,7 @@
                 <li>you must have saved a copy of the letter in SharePoint</li>
             </ul>
             <p class="govuk-body">
-                You can <a href="link-to-task-list" class="govuk-link">go back to the task list</a> and continue working on this project, or <a href="link-to-project-list" class="govuk-link">choose another project from your project list</a>.
+                You can <a href="/task-list/@Model.Id" class="govuk-link">go back to the task list</a> and continue working on this project, or <a href="/project-list" class="govuk-link">choose another project from your project list</a>.
             </p>
         </div>
     </div>
@@ -47,7 +49,7 @@
 
                 <fieldset class="govuk-fieldset">
                     <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-                        <h2 class="govuk-heading-m">Confirm a minister has approved this decision</h2>
+                        <h2 class="govuk-heading-m">A minister has approved this decision</h2>
                     </legend>
                     <div class="govuk-hint">
                         The revocation of a DAO (Directive Academy Order) must be signed off by a minister. It cannot proceed without ministerial approval.
@@ -64,14 +66,11 @@
             <div class="govuk-form-group">
                 <fieldset class="govuk-fieldset">
                     <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-                        <h2 class="govuk-heading-m">Confirm you have sent the letter confirming the revocation decision</h2>
+                        <h2 class="govuk-heading-m">You have sent a letter confirming the revocation decision</h2>
                     </legend>
                     <div class="govuk-hint">
-                        You must write and send the letter to the school’s governing body to confirm the minister’s decision.
+                        You must write and send a letter to the school’s governing body to confirm the minister’s decision.
                     </div>
-                    <p class="govuk-body">
-                        Use the <a href="link-to-letter-templates" target="_blank" class="govuk-link">letter templates in the revocation guidance</a> to help you.
-                    </p>
                     <div class="govuk-checkboxes">
                         <div class="govuk-checkboxes__item">
                             <input class="govuk-checkboxes__input" id="LetterSent" name="LetterSent" type="checkbox" value="true" />
@@ -84,7 +83,7 @@
             <div class="govuk-form-group">
                 <fieldset class="govuk-fieldset">
                     <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-                        <h2 class="govuk-heading-m">Confirm you have saved a copy of the letter</h2>
+                        <h2 class="govuk-heading-m">You have saved a copy of the letter</h2>
                     </legend>
                     <div class="govuk-hint">
                         You must save a copy of the letter in the school’s SharePoint folder.
@@ -100,7 +99,6 @@
         </div>
     </div>
 
-
     <button class="govuk-button" data-module="govuk-button" id="submit-btn">
         Continue
     </button>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
index 385152e0a..be59a1b66 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
@@ -6,9 +6,6 @@
 using Dfe.PrepareConversions.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Dfe.PrepareConversions.Pages.TaskList.Decision;
 
@@ -28,8 +25,6 @@ public DAOBeforeYouStartModel(IAcademyConversionProjectRepository repository,
 
    public string DecisionText { get; set; }
 
-   public IEnumerable<DecisionMadeBy> DecisionMadeByOptions => Enum.GetValues(typeof(DecisionMadeBy)).Cast<DecisionMadeBy>();
-
    [BindProperty]
    public bool MinisterApproval { get; set; }
 
@@ -61,12 +56,11 @@ public IActionResult OnPost(int id)
       decision.DecisionMadeBy = Data.Models.AdvisoryBoardDecision.DecisionMadeBy.Minister;
       decision.DecisionMakerName = decision.DecisionMadeBy == Data.Models.AdvisoryBoardDecision.DecisionMadeBy.None ? null : decision.DecisionMakerName;
 
-      // Use the bound properties to check the checkbox values
       if (MinisterApproval && LetterSent && LetterSaved)
       {
          // All checkboxes are checked, proceed with the decision
          SetDecisionInSession(id, decision);
-         return DetermineRedirectPage(decision);
+         return RedirectToPage(Links.Decision.WhyDAORevoked.Page, LinkParameters);
       }
       else
       {
@@ -75,19 +69,4 @@ public IActionResult OnPost(int id)
          return OnGet(id);
       }
    }
-
-   private IActionResult DetermineRedirectPage(AdvisoryBoardDecision decision)
-   {
-      var pageToReturnTo = decision.Decision switch
-      {
-         AdvisoryBoardDecisions.Approved => RedirectToPage(Links.Decision.AnyConditions.Page, LinkParameters),
-         AdvisoryBoardDecisions.Declined => RedirectToPage(Links.Decision.DeclineReason.Page, LinkParameters),
-         AdvisoryBoardDecisions.Deferred => RedirectToPage(Links.Decision.WhyDeferred.Page, LinkParameters),
-         AdvisoryBoardDecisions.Withdrawn => RedirectToPage(Links.Decision.WhyWithdrawn.Page, LinkParameters),
-         AdvisoryBoardDecisions.DAORevoked => RedirectToPage(Links.Decision.WhyDAORevoked.Page, LinkParameters),
-         _ => RedirectToPage(Links.Decision.AnyConditions.Page, LinkParameters)
-      };
-
-      return decision.DecisionMadeBy == Data.Models.AdvisoryBoardDecision.DecisionMadeBy.None ? pageToReturnTo : RedirectToPage(Links.Decision.DecisionMaker.Page, LinkParameters);
-   }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml
index e1c396d8c..94bb79558 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml
@@ -3,29 +3,35 @@
 @using Dfe.PrepareConversions.TagHelpers
 @model Dfe.PrepareConversions.Pages.TaskList.Decision.DecisionMaker
 @{
-   ViewData["Title"] = $"Decision maker's name";
-   Layout = "_Layout";
+    ViewData["Title"] = Model.IsDAORevoked ? "Minister's name" : "Decision maker's name";
+    Layout = "_Layout";
 }
 
 @section BeforeMain
 {
-   <partial name="_BackLink" model="@Model.BackLinkModel"/> 
-   <partial name="_ErrorSummary"/>
+    <partial name="_BackLink" model="@Model.BackLinkModel" />
+    <partial name="_ErrorSummary" />
 }
 
 <span id="selection-span" class="govuk-caption-l">Record the decision</span>
-<h1 class="govuk-heading-l">Decision maker's name</h1>
+<h1 class="govuk-heading-l">@ViewData["Title"]</h1>
 
 <form method="post">
-   <div class="govuk-form-group @ModelState.GetErrorStyleClass()">
+    <div class="govuk-form-group @ModelState.GetErrorStyleClass()">
         <label class="govuk-hint" for="decision-maker-name">
-            Enter the name of the person who made the decision
+            @if (Model.IsDAORevoked)
+            {
+                <text>Enter the name of the minister who made the decision</text>
+            }
+            else
+            {
+                <text>Enter the name of the person who made the decision</text>
+            }
         </label>
         <input class="govuk-input govuk-!-width-two-thirds" id="decision-maker-name" name="decision-maker-name" type="text" value="@Model.DecisionMakerName">
-   </div>
+    </div>
 
-
-   <button class="govuk-button" data-module="govuk-button" id="submit-btn">
-      Continue
-   </button>
-</form>
\ No newline at end of file
+    <button class="govuk-button" data-module="govuk-button" id="submit-btn">
+        Continue
+    </button>
+</form>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml.cs
index 0e65ec68f..9619fbf76 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml.cs
@@ -7,57 +7,50 @@
 using Microsoft.AspNetCore.Mvc;
 using System.ComponentModel.DataAnnotations;
 
-namespace Dfe.PrepareConversions.Pages.TaskList.Decision;
-
-public class DecisionMaker : DecisionBaseModel
+namespace Dfe.PrepareConversions.Pages.TaskList.Decision
 {
-   private readonly ErrorService _errorService;
-
-   public DecisionMaker(ErrorService errorService, IAcademyConversionProjectRepository repository, ISession session)
-     : base(repository, session)
+   public class DecisionMaker : DecisionBaseModel
    {
-      _errorService = errorService;
-   }
+      private readonly ErrorService _errorService;
 
-   [BindProperty(Name = "decision-maker-name")]
-   [Required]
-   public string DecisionMakerName { get; set; }
+      public DecisionMaker(ErrorService errorService, IAcademyConversionProjectRepository repository, ISession session)
+        : base(repository, session)
+      {
+         _errorService = errorService;
+      }
 
+      [BindProperty(Name = "decision-maker-name")]
+      [Required]
+      public string DecisionMakerName { get; set; }
 
-   public AdvisoryBoardDecision Decision { get; set; }
+      public AdvisoryBoardDecision Decision { get; set; }
 
-   public IActionResult OnGet(int id)
-   {
+      public bool IsDAORevoked => Decision?.Decision == AdvisoryBoardDecisions.DAORevoked;
 
-      Decision = GetDecisionFromSession(id);
-      DecisionMakerName = Decision.DecisionMakerName;
+      public IActionResult OnGet(int id)
+      {
+         Decision = GetDecisionFromSession(id);
+         DecisionMakerName = Decision.DecisionMakerName;
 
-      SetBackLinkModel(Links.Decision.WhoDecided, id);
+         SetBackLinkModel(Links.Decision.WhoDecided, id);
 
-      return Page();
-   }
+         return Page();
+      }
 
-   public IActionResult OnPost(int id)
-   {
-      if (!ModelState.IsValid)
+      public IActionResult OnPost(int id)
       {
-         _errorService.AddError("decision-maker-name", "Enter the decision maker's name");
-         return OnGet(id);
-      }
+         if (!ModelState.IsValid)
+         {
+            _errorService.AddError("decision-maker-name", "Enter the decision maker's name");
+            return OnGet(id);
+         }
 
-      AdvisoryBoardDecision decision = GetDecisionFromSession(id);
-      decision.DecisionMakerName = DecisionMakerName;
+         AdvisoryBoardDecision decision = GetDecisionFromSession(id);
+         decision.DecisionMakerName = DecisionMakerName;
 
-      SetDecisionInSession(id, decision);
+         SetDecisionInSession(id, decision);
 
-      return decision.Decision switch
-      {
-         AdvisoryBoardDecisions.Approved => RedirectToPage(Links.Decision.AnyConditions.Page, LinkParameters),
-         AdvisoryBoardDecisions.Declined => RedirectToPage(Links.Decision.DeclineReason.Page, LinkParameters),
-         AdvisoryBoardDecisions.Deferred => RedirectToPage(Links.Decision.WhyDeferred.Page, LinkParameters),
-         AdvisoryBoardDecisions.Withdrawn => RedirectToPage(Links.Decision.WhyWithdrawn.Page, LinkParameters),
-         AdvisoryBoardDecisions.DAORevoked => RedirectToPage(Links.Decision.WhyDAORevoked.Page, LinkParameters),
-         _ => RedirectToPage(Links.Decision.AnyConditions.Page, LinkParameters)
-      };
+         return RedirectToPage(Links.Decision.DecisionDate.Page, LinkParameters);
+      }
    }
-}
+}
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DeclineReason.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DeclineReason.cshtml.cs
index fcb8b1702..ed30ae682 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DeclineReason.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DeclineReason.cshtml.cs
@@ -1,7 +1,6 @@
 using Dfe.Academisation.ExtensionMethods;
 using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision;
 using Dfe.PrepareConversions.Data.Services;
-using Dfe.PrepareConversions.Extensions;
 using Dfe.PrepareConversions.Models;
 using Dfe.PrepareConversions.Pages.TaskList.Decision.Models;
 using Dfe.PrepareConversions.Services;
@@ -77,7 +76,7 @@ public IActionResult OnPost(int id)
 
       SetDecisionInSession(id, decision);
 
-      if (ModelState.IsValid) return RedirectToPage(Links.Decision.DecisionDate.Page, LinkParameters);
+      if (ModelState.IsValid) return RedirectToPage(Links.Decision.DecisionMaker.Page, LinkParameters);
 
       _errorService.AddErrors(ModelState.Keys, ModelState);
       return OnGet(id);
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
index f6d283d5a..f2cae635e 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
@@ -4,12 +4,12 @@
 @using Dfe.Academisation.ExtensionMethods
 @model Dfe.PrepareConversions.Pages.TaskList.Decision.SummaryModel
 @{
-   ViewData["Title"] = $"Check your {Model.DecisionText} answers";
+    ViewData["Title"] = $"Check your {Model.DecisionText} answers";
 }
 
 @section BeforeMain
 {
-   <a asp-page="@Links.Decision.DecisionDate.Page" asp-route-id="@Model.Id" class="govuk-back-link">Back</a>
+    <a asp-page="@Links.Decision.DecisionDate.Page" asp-route-id="@Model.Id" class="govuk-back-link">Back</a>
 }
 
 <span id="selection-span" class="govuk-caption-l">Record the decision</span>
@@ -17,70 +17,124 @@
 
 <dl class="govuk-summary-list">
 
-   <div class="govuk-summary-list__row">
-      <dt class="govuk-summary-list__key">
-         Decision
-      </dt>
-      <dd class="govuk-summary-list__value">
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">
+            Decision
+        </dt>
+        <dd class="govuk-summary-list__value">
 
-         @{
-            var decisionName = Model.Decision.GetDecisionAsFriendlyName();
+            @{
+                var decisionName = Model.Decision.GetDecisionAsFriendlyName();
 
-            var decisionClass = Model.Decision.Decision switch
+                var decisionClass = Model.Decision.Decision switch
+                {
+                    AdvisoryBoardDecisions.Approved => "govuk-tag--green",
+                    AdvisoryBoardDecisions.Deferred => "govuk-tag--orange",
+                    AdvisoryBoardDecisions.Withdrawn => "govuk-tag--purple",
+                    AdvisoryBoardDecisions.DAORevoked => "govuk-tag--red",
+                    _ => "govuk-tag--red"
+                };
+            }
+            @if (string.IsNullOrEmpty(decisionName))
+            {
+                <span class="empty">Empty</span>
+            }
+            else
             {
-               AdvisoryBoardDecisions.Approved => "govuk-tag--green",
-               AdvisoryBoardDecisions.Deferred => "govuk-tag--orange",
-               AdvisoryBoardDecisions.Withdrawn => "govuk-tag--purple",
-               AdvisoryBoardDecisions.DAORevoked => "govuk-tag--red",
-               _ => "govuk-tag--red"
-               };
-         }
-         @if (string.IsNullOrEmpty(decisionName))
-         {
-            <span class="empty">Empty</span>
-         }
-         else
-         {
-            <strong class="govuk-tag @decisionClass" id="decision">@decisionName</strong>
-         }
+                <strong class="govuk-tag @decisionClass" id="decision">@decisionName</strong>
+            }
+
+        </dd>
+        <dd class="govuk-summary-list__actions">
+            <a class="govuk-link" asp-page="@Links.Decision.RecordDecision.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-decision-btn">
+                Change<span class="govuk-visually-hidden">decision</span>
+            </a>
+        </dd>
+    </div>
+
+    @if (Model.Decision.Decision == AdvisoryBoardDecisions.Declined ||
+    Model.Decision.Decision == AdvisoryBoardDecisions.Deferred ||
+    Model.Decision.Decision == AdvisoryBoardDecisions.Withdrawn ||
+    Model.Decision.Decision == AdvisoryBoardDecisions.DAORevoked)
+    {
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">
+                Reasons
+            </dt>
+
+            <dd class="govuk-summary-list__value" id="reasons">
+                @if (Model.Decision.Decision == AdvisoryBoardDecisions.Declined)
+                {
+                    @foreach (AdvisoryBoardDeclinedReasonDetails reason in Model.Decision.DeclinedReasons)
+                    {
+                        <div>@reason.Reason.ToDescription():</div>
+                        <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                    }
+                }
+                else if (Model.Decision.Decision == AdvisoryBoardDecisions.Deferred)
+                {
+                    @foreach (AdvisoryBoardDeferredReasonDetails reason in Model.Decision.DeferredReasons)
+                    {
+                        <div>@reason.Reason.ToDescription():</div>
+                        <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                    }
+                }
+                else if (Model.Decision.Decision == AdvisoryBoardDecisions.Withdrawn)
+                {
+                    @foreach (AdvisoryBoardWithdrawnReasonDetails reason in Model.Decision.WithdrawnReasons)
+                    {
+                        <div>@reason.Reason.ToDescription():</div>
+                        <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                    }
+                }
+                else if (Model.Decision.Decision == AdvisoryBoardDecisions.DAORevoked)
+                {
+                    @foreach (AdvisoryBoardDAORevokedReasonDetails reason in Model.Decision.DAORevokedReasons)
+                    {
+                        <div>@reason.Reason.ToDescription():</div>
+                        <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                    }
+                }
+            </dd>
 
-      </dd>
-      <dd class="govuk-summary-list__actions">
-         <a class="govuk-link" asp-page="@Links.Decision.RecordDecision.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-decision-btn">
-            Change<span class="govuk-visually-hidden">decision</span>
-         </a>
-      </dd>
-   </div>
-   <div class="govuk-summary-list__row">
-      <dt class="govuk-summary-list__key">
-         Who made this decision
-      </dt>
-      <dd class="govuk-summary-list__value">
+            <dd class="govuk-summary-list__actions">
+                @if (Model.Decision.Decision == AdvisoryBoardDecisions.Declined)
+                {
+                    <a class="govuk-link" asp-page="@Links.Decision.DeclineReason.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-declined-btn">
+                        Change<span class="govuk-visually-hidden">rejected-reason</span>
+                    </a>
+                }
+                else if (Model.Decision.Decision == AdvisoryBoardDecisions.Deferred)
+                {
+                    <a class="govuk-link" asp-page="@Links.Decision.WhyDeferred.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-deferred-btn">
+                        Change<span class="govuk-visually-hidden">rejected-reason</span>
+                    </a>
+                }
+                else if (Model.Decision.Decision == AdvisoryBoardDecisions.Withdrawn)
+                {
+                    <a class="govuk-link" asp-page="@Links.Decision.WhyWithdrawn.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-withdrawn-btn">
+                        Change<span class="govuk-visually-hidden">withdrawn-reason</span>
+                    </a>
+                }
+                else if (Model.Decision.Decision == AdvisoryBoardDecisions.DAORevoked)
+                {
+                    <a class="govuk-link" asp-page="@Links.Decision.WhyDAORevoked.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-daorevoked-btn">
+                        Change<span class="govuk-visually-hidden">daorevoked-reason</span>
+                    </a>
+                }
+            </dd>
+        </div>
+    }
 
-         @if (Model.Decision.DecisionMadeBy != null)
-         {
-            <div id="decision-made-by">@Model.Decision.DecisionMadeBy.ToDescription()</div>
-         }
-         else
-         {
-            <span class="empty">Empty</span>
-         }
-      </dd>
-      <dd class="govuk-summary-list__actions">
-         <a class="govuk-link" asp-page="@Links.Decision.WhoDecided.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-who-btn">
-            Change<span class="govuk-visually-hidden">who made this decision</span>
-         </a>
-      </dd>
-   </div>
     <div class="govuk-summary-list__row">
         <dt class="govuk-summary-list__key">
-            Decision maker's name
+            Decision maker's role
         </dt>
         <dd class="govuk-summary-list__value">
 
-            @if (Model.Decision.DecisionMakerName != null)
+            @if (Model.Decision.DecisionMadeBy != null)
             {
-				<div id="decision-maker-name">@Model.Decision.DecisionMakerName</div>
+                <div id="decision-made-by">@Model.Decision.DecisionMadeBy.ToDescription()</div>
             }
             else
             {
@@ -88,163 +142,77 @@
             }
         </dd>
         <dd class="govuk-summary-list__actions">
-            <a class="govuk-link" asp-page="@Links.Decision.DecisionMaker.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="decision-maker-btn">
-                Change<span class="govuk-visually-hidden">decision maker's name</span>
+            <a class="govuk-link" asp-page="@Links.Decision.WhoDecided.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-who-btn">
+                Change<span class="govuk-visually-hidden">who made this decision</span>
             </a>
         </dd>
     </div>
 
-   @if (Model.Decision.Decision == AdvisoryBoardDecisions.Declined)
-   {
-      <div class="govuk-summary-list__row">
-         <dt class="govuk-summary-list__key">
-            Reasons
-         </dt>
-
-         <dd class="govuk-summary-list__value" id="decline-reasons">
-            @foreach (AdvisoryBoardDeclinedReasonDetails reason in Model.Decision.DeclinedReasons)
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key">
+            @if (Model.Decision.Decision == AdvisoryBoardDecisions.DAORevoked)
             {
-               <div>@reason.Reason.ToDescription():</div>
-               <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                @:Minister's name
             }
-         </dd>
-
-         <dd class="govuk-summary-list__actions">
-            <a class="govuk-link" asp-page="@Links.Decision.DeclineReason.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-declined-btn">
-               Change<span class="govuk-visually-hidden">rejected-reason</span>
-            </a>
-         </dd>
-      </div>
-   }
-
-   @if (Model.Decision.Decision == AdvisoryBoardDecisions.Deferred)
-   {
-      <div class="govuk-summary-list__row">
-         <dt class="govuk-summary-list__key">
-            Why was this project deferred
-         </dt>
-         <dd class="govuk-summary-list__value" id="deferred-reasons">
-
-            @foreach (AdvisoryBoardDeferredReasonDetails reason in Model.Decision.DeferredReasons)
+            else
             {
-               <div>@reason.Reason.ToDescription():</div>
-               <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                @:Decision maker's name
             }
+        </dt>
+        <dd class="govuk-summary-list__value">
 
-         </dd>
-         <dd class="govuk-summary-list__actions">
-            <a class="govuk-link" asp-page="@Links.Decision.WhyDeferred.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-deferred-btn">
-               Change<span class="govuk-visually-hidden">rejected-reason</span>
+            @if (Model.Decision.DecisionMakerName != null)
+            {
+                <div id="decision-maker-name">@Model.Decision.DecisionMakerName</div>
+            }
+            else
+            {
+                <span class="empty">Empty</span>
+            }
+        </dd>
+        <dd class="govuk-summary-list__actions">
+            <a class="govuk-link" asp-page="@Links.Decision.DecisionMaker.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="decision-maker-btn">
+                Change<span class="govuk-visually-hidden">decision maker's name</span>
             </a>
-         </dd>
-      </div>
-   }
+        </dd>
+    </div>
 
-    @if (Model.Decision.Decision == AdvisoryBoardDecisions.Withdrawn)
+    @if (Model.Decision.Decision == AdvisoryBoardDecisions.Approved)
     {
+        var conditionsSet = Model.Decision.ApprovedConditionsSet.GetValueOrDefault();
+
         <div class="govuk-summary-list__row">
             <dt class="govuk-summary-list__key">
-                Why was this project withdrawn
+                Were any conditions set
             </dt>
-            <dd class="govuk-summary-list__value" id="withdrawn-reasons">
-
-                @foreach (AdvisoryBoardWithdrawnReasonDetails reason in Model.Decision.WithdrawnReasons)
+            <dd class="govuk-summary-list__value" id="condition-set">
+                @if (conditionsSet)
                 {
-                    <div>@reason.Reason.ToDescription():</div>
-                    <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                    <div class="govuk-!-margin-bottom-2">Yes:</div>
+                    <div class="govuk-!-margin-bottom-2">@Model.Decision.ApprovedConditionsDetails</div>
                 }
-
-            </dd>
-            <dd class="govuk-summary-list__actions">
-                <a class="govuk-link" asp-page="@Links.Decision.WhyWithdrawn.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-withdrawn-btn">
-                    Change<span class="govuk-visually-hidden">withdrawn-reason</span>
-                </a>
-            </dd>
-        </div>
-    }
-    @if (Model.Decision.Decision == AdvisoryBoardDecisions.DAORevoked)
-    {
-        <div class="govuk-summary-list__row">
-            <dt class="govuk-summary-list__key">
-                Why was the DAO Revoked?
-            </dt>
-            <dd class="govuk-summary-list__value" id="daorevoked-reasons">
-
-                @foreach (AdvisoryBoardDAORevokedReasonDetails reason in Model.Decision.DAORevokedReasons)
+                else
                 {
-                    <div>@reason.Reason.ToDescription():</div>
-                    <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                    <span>No</span>
                 }
-
             </dd>
             <dd class="govuk-summary-list__actions">
-                <a class="govuk-link" asp-page="@Links.Decision.WhyDAORevoked.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-daorevoked-btn">
-                    Change<span class="govuk-visually-hidden">daorevoked-reason</span>
+                <a class="govuk-link" asp-page="@Links.Decision.AnyConditions.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-conditions-set-btn">
+                    Change<span class="govuk-visually-hidden">condition answer</span>
                 </a>
             </dd>
         </div>
     }
-   @if (Model.Decision.Decision == AdvisoryBoardDecisions.Approved)
-   {
-      var conditionsSet = Model.Decision.ApprovedConditionsSet.GetValueOrDefault();
-
-      <div class="govuk-summary-list__row">
-         <dt class="govuk-summary-list__key">
-            Were any conditions set
-         </dt>
-         <dd class="govuk-summary-list__value" id="condition-set">
-            @if (conditionsSet)
-            {
-               <div class="govuk-!-margin-bottom-2">Yes:</div>
-               <div class="govuk-!-margin-bottom-2">@Model.Decision.ApprovedConditionsDetails</div>
-            }
-            else
-            {
-               <span>No</span>
-            }
-         </dd>
-         <dd class="govuk-summary-list__actions">
-            <a class="govuk-link" asp-page="@Links.Decision.AnyConditions.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-conditions-set-btn">
-               Change<span class="govuk-visually-hidden">condition answer</span>
-            </a>
-         </dd>
-      </div>
-   }
-
-   <div class="govuk-summary-list__row">
-      <dt class="govuk-summary-list__key">
-         Date of decision
-      </dt>
-      <dd class="govuk-summary-list__value" id="decision-date">
 
-         @if (Model.Decision.AdvisoryBoardDecisionDate.HasValue)
-         {
-            <span>@Model.Decision.AdvisoryBoardDecisionDate.Value.ToString(Constants.DateTimeFormat)</span>
-         }
-         else
-         {
-            <span class="empty">Empty</span>
-         }
-
-      </dd>
-      <dd class="govuk-summary-list__actions">
-         <a class="govuk-link" asp-page="@Links.Decision.DecisionDate.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-date-btn">
-            Change<span class="govuk-visually-hidden">date of decision</span>
-         </a>
-      </dd>
-   </div>
-   @* AO Date *@
-    @if (Model.IsVoluntaryAcademyType(Model.AcademyTypeAndRoute))
-   {
     <div class="govuk-summary-list__row">
         <dt class="govuk-summary-list__key">
-            Date academy order (AO) sent
+            Date of decision
         </dt>
-        <dd class="govuk-summary-list__value" id="date-ao-sent">
+        <dd class="govuk-summary-list__value" id="decision-date">
 
-            @if (Model.Decision.AcademyOrderDate.HasValue)
+            @if (Model.Decision.AdvisoryBoardDecisionDate.HasValue)
             {
-                <span>@Model.Decision.AcademyOrderDate.Value.ToString(Constants.DateTimeFormat)</span>
+                <span>@Model.Decision.AdvisoryBoardDecisionDate.Value.ToString(Constants.DateTimeFormat)</span>
             }
             else
             {
@@ -253,17 +221,41 @@
 
         </dd>
         <dd class="govuk-summary-list__actions">
-            <a class="govuk-link" asp-page="@Links.Decision.AcademyOrderDate.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-ao-date-btn">
-                Change<span class="govuk-visually-hidden"> Date academy order (AO) sent</span>
+            <a class="govuk-link" asp-page="@Links.Decision.DecisionDate.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-date-btn">
+                Change<span class="govuk-visually-hidden">date of decision</span>
             </a>
         </dd>
     </div>
+    @* AO Date *@
+    @if (Model.IsVoluntaryAcademyType(Model.AcademyTypeAndRoute))
+    {
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">
+                Date academy order (AO) sent
+            </dt>
+            <dd class="govuk-summary-list__value" id="date-ao-sent">
+
+                @if (Model.Decision.AcademyOrderDate.HasValue)
+                {
+                    <span>@Model.Decision.AcademyOrderDate.Value.ToString(Constants.DateTimeFormat)</span>
+                }
+                else
+                {
+                    <span class="empty">Empty</span>
+                }
+
+            </dd>
+            <dd class="govuk-summary-list__actions">
+                <a class="govuk-link" asp-page="@Links.Decision.AcademyOrderDate.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-ao-date-btn">
+                    Change<span class="govuk-visually-hidden"> Date academy order (AO) sent</span>
+                </a>
+            </dd>
+        </div>
     }
 </dl>
 
-
 <form method="post">
-   <button class="govuk-button" data-module="govuk-button" id="submit-btn">
-      Record this decision
-   </button>
-</form>
\ No newline at end of file
+    <button class="govuk-button" data-module="govuk-button" id="submit-btn">
+        Record this decision
+    </button>
+</form>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhoDecided.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhoDecided.cshtml.cs
index 802452f0f..bf47b18e3 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhoDecided.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhoDecided.cshtml.cs
@@ -63,7 +63,7 @@ public IActionResult OnPost(int id)
 
    private IActionResult DetermineRedirectPage(AdvisoryBoardDecision decision)
    {
-      var pageToReturnTo = decision.Decision switch
+      var page = decision.Decision switch
       {
          AdvisoryBoardDecisions.Approved => RedirectToPage(Links.Decision.AnyConditions.Page, LinkParameters),
          AdvisoryBoardDecisions.Declined => RedirectToPage(Links.Decision.DeclineReason.Page, LinkParameters),
@@ -73,6 +73,6 @@ private IActionResult DetermineRedirectPage(AdvisoryBoardDecision decision)
          _ => RedirectToPage(Links.Decision.AnyConditions.Page, LinkParameters)
       };
 
-      return decision.DecisionMadeBy == Data.Models.AdvisoryBoardDecision.DecisionMadeBy.None ? pageToReturnTo : RedirectToPage(Links.Decision.DecisionMaker.Page, LinkParameters);
+      return page;
    }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml
index ad896437b..97b58218e 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml
@@ -27,9 +27,9 @@
             <input type="hidden" asp-for="@Model.WasReasonGiven"/>
 
             @{
-                    CheckBoxAndLabel(AdvisoryBoardDAORevokedReason.SchoolClosedOrClosing, Model.SchoolClosedOrClosingIsChecked, Model.SchoolClosedOrClosingDetails);
                     CheckBoxAndLabel(AdvisoryBoardDAORevokedReason.SchoolRatedGoodOrOutstanding, Model.SchoolRatedGoodOrOutstandingIsChecked, Model.SchoolRatedGoodOrOutstandingDetails);
                     CheckBoxAndLabel(AdvisoryBoardDAORevokedReason.SafeguardingConcernsAddressed, Model.SafeguardingConcernsAddressedIsChecked, Model.SafeguardingConcernsAddressedDetails);              
+                    CheckBoxAndLabel(AdvisoryBoardDAORevokedReason.SchoolClosedOrClosing, Model.SchoolClosedOrClosingIsChecked, Model.SchoolClosedOrClosingDetails);
             }
          </div>
       </fieldset>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
index b5ba95606..c2002a6d5 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
@@ -78,7 +78,7 @@ public IActionResult OnPost(int id)
       _errorService.AddErrors(ModelState.Keys, ModelState);
       if (_errorService.HasErrors()) return OnGet(id);
 
-      return RedirectToPage(Links.Decision.DecisionDate.Page, LinkParameters);
+      return RedirectToPage(Links.Decision.DecisionMaker.Page, LinkParameters);
    }
 
    private void SetReasonsModel(List<AdvisoryBoardDAORevokedReasonDetails> reasons)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDeferred.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDeferred.cshtml.cs
index d3fcd9cf9..6b5c36cc9 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDeferred.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDeferred.cshtml.cs
@@ -83,7 +83,7 @@ public IActionResult OnPost(int id)
       _errorService.AddErrors(ModelState.Keys, ModelState);
       if (_errorService.HasErrors()) return OnGet(id);
 
-      return RedirectToPage(Links.Decision.DecisionDate.Page, LinkParameters);
+      return RedirectToPage(Links.Decision.DecisionMaker.Page, LinkParameters);
    }
 
    private void SetReasonsModel(List<AdvisoryBoardDeferredReasonDetails> reasons)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyWithdrawn.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyWithdrawn.cshtml.cs
index 81c34064f..009242def 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyWithdrawn.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyWithdrawn.cshtml.cs
@@ -84,7 +84,7 @@ public IActionResult OnPost(int id)
       _errorService.AddErrors(ModelState.Keys, ModelState);
       if (_errorService.HasErrors()) return OnGet(id);
 
-      return RedirectToPage(Links.Decision.DecisionDate.Page, LinkParameters);
+      return RedirectToPage(Links.Decision.DecisionMaker.Page, LinkParameters);
    }
 
    private void SetReasonsModel(List<AdvisoryBoardWithdrawnReasonDetails> reasons)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
index e04e67a56..5e763760a 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
@@ -37,7 +37,8 @@
       "TransfersUrl": "https://dev.prepare-transfers.education.gov.uk"
    },
    "ApplicationLinks": {
-      "SharePointTemplateUrl": "https://educationgovuk.sharepoint.com/sites/lvedfe00116/SitePages/Headteacher-Board-Operational-Processes.aspx?xsdata=..."
+      "SharePointTemplateUrl": "https://educationgovuk.sharepoint.com/sites/lvedfe00116/SitePages/Headteacher-Board-Operational-Processes.aspx?xsdata=...",
+      "RevocationGuidanceLink": "https://educationgovuk.sharepoint.com/:w:/r/sites/lvedfe00116/_layouts/15/Doc.aspx?action=default&file=Revocation_Guidance_Mar24.docx&mobileredirect=true&sourcedoc=%7B563CD875-E0A4-46F0-AEC2-8C19453E24D5%7D"
    },
    "ApplicationInsights": {
       "ConnectionString": "",

From 78d35a6f431783564be26d69a7ea2378db81032f Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Wed, 12 Jun 2024 13:28:43 +0100
Subject: [PATCH 14/23] show user for all project types

---
 .../Pages/Shared/_ProjectListRows.cshtml            | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
index a3e008b22..427df5aa2 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
@@ -50,14 +50,11 @@
                     <span if="projectRow.Item.TypeAndRoute.IsEmpty()" class="empty">Unconfirmed</span>
                     <span if="projectRow.Item.TypeAndRoute.IsPresent()">@projectRow.Item.TypeAndRoute.RouteDescription(project.IsFormAMat)</span>
                 </div>
-               @if (!isFormAMat)
-               {
-                    <div id="@("assigned-to-" + projectRow.Index)" class="do govuk-!-margin-top-1">
-                     <strong>Assigned to:</strong>
-                     <span if="projectRow.Item.AssignedUserFullName.IsEmpty()" class="empty">Unassigned</span>
-                     <span if="projectRow.Item.AssignedUserFullName.IsPresent()">@projectRow.Item.AssignedUserFullName</span>
-                  </div>
-               }
+                <div id="@("assigned-to-" + projectRow.Index)" class="do govuk-!-margin-top-1">
+                    <strong>Assigned to:</strong>
+                    <span if="projectRow.Item.AssignedUserFullName.IsEmpty()" class="empty">Unassigned</span>
+                    <span if="projectRow.Item.AssignedUserFullName.IsPresent()">@projectRow.Item.AssignedUserFullName</span>
+                </div>
                 <div class="govuk-!-margin-top-2 govuk-!-margin-bottom-3">
                   <strong class="govuk-tag govuk-tag--@projectRow.Item.Status.Colour" id="project-status-@projectRow.Item.Id">@projectRow.Item.Status.Value</strong>
                </div>

From 3918eed05e28478048d2ca3a20649ef430e46c47 Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Wed, 12 Jun 2024 14:31:33 +0100
Subject: [PATCH 15/23] Fix back links

---
 .../Decision/DAOBeforeYouStart.cshtml.cs         |  2 +-
 .../TaskList/Decision/DecisionDate.cshtml.cs     | 14 +-------------
 .../TaskList/Decision/DecisionMaker.cshtml.cs    | 16 ++++++++++++++--
 .../Pages/TaskList/Decision/Summary.cshtml       |  2 +-
 .../Pages/TaskList/Decision/Summary.cshtml.cs    |  9 ++++++++-
 .../TaskList/Decision/WhyDAORevoked.cshtml.cs    |  2 +-
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
index be59a1b66..aafc303a6 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DAOBeforeYouStart.cshtml.cs
@@ -37,7 +37,7 @@ public DAOBeforeYouStartModel(IAcademyConversionProjectRepository repository,
 
    public IActionResult OnGet(int id)
    {
-      SetBackLinkModel(Links.Decision.RecordDecision, id);
+      SetBackLinkModel(Links.Decision.DAOPrecursor, id);
       AdvisoryBoardDecision decision = GetDecisionFromSession(id);
 
       DecisionText = decision == null ? string.Empty : decision.Decision.ToDescription().ToLowerInvariant();
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionDate.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionDate.cshtml.cs
index 3f511bced..9488cd209 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionDate.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionDate.cshtml.cs
@@ -47,18 +47,6 @@ string IDateValidationMessageProvider.AllMissing(string displayName)
       return $"Enter the date when the conversion was {decision.Decision.ToDescription().ToLowerInvariant()}";
    }
 
-   public LinkItem GetPageForBackLink(int id)
-   {
-      return Decision switch
-      {
-         { Decision: AdvisoryBoardDecisions.Approved } => Links.Decision.AnyConditions,
-         { Decision: AdvisoryBoardDecisions.Declined } => Links.Decision.DeclineReason,
-         { Decision: AdvisoryBoardDecisions.Deferred } => Links.Decision.WhyDeferred,
-         { Decision: AdvisoryBoardDecisions.Withdrawn } => Links.Decision.WhyWithdrawn,
-         { Decision: AdvisoryBoardDecisions.DAORevoked } => Links.Decision.WhyDAORevoked,
-         _ => throw new Exception("Unexpected decision state")
-      };
-   }
 
    public IActionResult OnGet(int id)
    {
@@ -69,7 +57,7 @@ public IActionResult OnGet(int id)
       DecisionText = decision.Decision.ToString()?.ToLowerInvariant();
       DateOfDecision = Decision.AdvisoryBoardDecisionDate;
 
-      SetBackLinkModel(GetPageForBackLink(id), id);
+      SetBackLinkModel(Links.Decision.DecisionMaker, id);
 
       return Page();
    }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml.cs
index 9619fbf76..c99f3d631 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/DecisionMaker.cshtml.cs
@@ -5,6 +5,7 @@
 using Dfe.PrepareConversions.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace Dfe.PrepareConversions.Pages.TaskList.Decision
@@ -32,11 +33,22 @@ public IActionResult OnGet(int id)
          Decision = GetDecisionFromSession(id);
          DecisionMakerName = Decision.DecisionMakerName;
 
-         SetBackLinkModel(Links.Decision.WhoDecided, id);
+         SetBackLinkModel(GetPageForBackLink(id), id);
 
          return Page();
       }
-
+      public LinkItem GetPageForBackLink(int id)
+      {
+         return Decision switch
+         {
+            { Decision: AdvisoryBoardDecisions.Approved } => Links.Decision.AnyConditions,
+            { Decision: AdvisoryBoardDecisions.Declined } => Links.Decision.DeclineReason,
+            { Decision: AdvisoryBoardDecisions.Deferred } => Links.Decision.WhyDeferred,
+            { Decision: AdvisoryBoardDecisions.Withdrawn } => Links.Decision.WhyWithdrawn,
+            { Decision: AdvisoryBoardDecisions.DAORevoked } => Links.Decision.WhyDAORevoked,
+            _ => throw new Exception("Unexpected decision state")
+         };
+      }
       public IActionResult OnPost(int id)
       {
          if (!ModelState.IsValid)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
index f2cae635e..150ddb00f 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
@@ -9,7 +9,7 @@
 
 @section BeforeMain
 {
-    <a asp-page="@Links.Decision.DecisionDate.Page" asp-route-id="@Model.Id" class="govuk-back-link">Back</a>
+    <partial name="_BackLink" model="@Model.BackLinkModel" />
 }
 
 <span id="selection-span" class="govuk-caption-l">Record the decision</span>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml.cs
index ce1160f75..1ce503739 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml.cs
@@ -35,7 +35,14 @@ public SummaryModel(IAcademyConversionProjectRepository repository,
    public IActionResult OnGet(int id)
    {
       Decision = GetDecisionFromSession(id);
-
+      if (AcademyTypeAndRoute == AcademyTypeAndRoutes.Voluntary)
+      {
+         SetBackLinkModel(Links.Decision.AcademyOrderDate, id);
+      }
+      else
+      {
+         SetBackLinkModel(Links.Decision.DecisionDate, id);
+      }
       if (Decision.Decision == null) return RedirectToPage(Links.TaskList.Index.Page, LinkParameters);
 
       return Page();
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
index c2002a6d5..0295ad695 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
@@ -50,7 +50,7 @@ ErrorService errorService
 
    public IActionResult OnGet(int id)
    {
-      SetBackLinkModel(Links.Decision.WhoDecided, id);
+      SetBackLinkModel(Links.Decision.DAOBeforeYouStart, id);
 
       AdvisoryBoardDecision decision = GetDecisionFromSession(id);
       DecisionText = decision.Decision.ToDescription().ToLowerInvariant();

From 884966ca709686c49ef8f7e6d74dea78868b672f Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Wed, 12 Jun 2024 16:56:27 +0100
Subject: [PATCH 16/23] In DAO Revoked flow you can't change role from minister

---
 .../Pages/TaskList/Decision/Summary.cshtml             | 10 +++++++---
 .../Pages/TaskList/Decision/Summary.cshtml.cs          |  6 +++++-
 .../Pages/TaskList/Decision/WhyDAORevoked.cshtml       |  2 +-
 .../Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs    |  5 -----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
index 150ddb00f..99565d149 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
@@ -142,12 +142,16 @@
             }
         </dd>
         <dd class="govuk-summary-list__actions">
-            <a class="govuk-link" asp-page="@Links.Decision.WhoDecided.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-who-btn">
-                Change<span class="govuk-visually-hidden">who made this decision</span>
-            </a>
+            @if (Model.Decision.Decision != AdvisoryBoardDecisions.DAORevoked)
+            {
+                <a class="govuk-link" asp-page="@Links.Decision.WhoDecided.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-who-btn">
+                    Change<span class="govuk-visually-hidden">who made this decision</span>
+                </a>
+            }
         </dd>
     </div>
 
+
     <div class="govuk-summary-list__row">
         <dt class="govuk-summary-list__key">
             @if (Model.Decision.Decision == AdvisoryBoardDecisions.DAORevoked)
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml.cs
index 1ce503739..53241e274 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml.cs
@@ -30,7 +30,11 @@ public SummaryModel(IAcademyConversionProjectRepository repository,
    }
 
    public AdvisoryBoardDecision Decision { get; set; }
-   public string DecisionText => Decision.Decision.ToDescription().ToLowerInvariant();
+   public string DecisionText =>
+      Decision.Decision == AdvisoryBoardDecisions.DAORevoked
+      ? "DAO revoked"
+      : Decision.Decision.ToDescription().ToLowerInvariant();
+
 
    public IActionResult OnGet(int id)
    {
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml
index 97b58218e..173503d51 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml
@@ -4,7 +4,7 @@
 @using Dfe.PrepareConversions.Extensions
 @model Dfe.PrepareConversions.Pages.TaskList.Decision.WhyDAORevokedModel
 @{
-   ViewData["Title"] = $"Why project was {Model.DecisionText}";
+    ViewData["Title"] = $"Why was the DAO revoked?";
    Layout = "_Layout";
 }
 
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
index 0295ad695..05c2e528c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/WhyDAORevoked.cshtml.cs
@@ -1,4 +1,3 @@
-using Dfe.Academisation.ExtensionMethods;
 using Dfe.PrepareConversions.Data.Models.AdvisoryBoardDecision;
 using Dfe.PrepareConversions.Data.Services;
 using Dfe.PrepareConversions.Extensions;
@@ -46,15 +45,11 @@ ErrorService errorService
    [BindProperty]
    public bool WasReasonGiven => SchoolClosedOrClosingIsChecked || SchoolRatedGoodOrOutstandingIsChecked || SafeguardingConcernsAddressedIsChecked;
 
-   public string DecisionText { get; set; }
-
    public IActionResult OnGet(int id)
    {
       SetBackLinkModel(Links.Decision.DAOBeforeYouStart, id);
 
       AdvisoryBoardDecision decision = GetDecisionFromSession(id);
-      DecisionText = decision.Decision.ToDescription().ToLowerInvariant();
-
       List<AdvisoryBoardDAORevokedReasonDetails> reasons = decision.DAORevokedReasons;
       SetReasonsModel(reasons);
 

From 172373e0f0afc63a827d26751b20cbb89e9409c2 Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Thu, 13 Jun 2024 09:42:12 +0100
Subject: [PATCH 17/23] Updated tests to reflect new decision flow

---
 .../PageObjects/RecordDecisionWizard.cs       |  2 +-
 .../Decision/AnyConditionsIntegrationTests.cs |  5 ++---
 .../ChangeDecisionOptionsIntegrationTests.cs  |  8 +++----
 .../Decision/DecisionDateIntegrationTests.cs  | 10 ++++-----
 .../Decision/DeclineReasonIntegrationTests.cs |  3 +--
 .../Decision/SummaryIntegrationTests.cs       | 22 +++++++++----------
 .../Decision/WhoDecidedIntegrationTests.cs    |  1 -
 .../Decision/WhyDeferredIntegrationTests.cs   |  3 +--
 .../Pages/TaskList/Decision/Summary.cshtml    |  4 ++--
 9 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/PageObjects/RecordDecisionWizard.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/PageObjects/RecordDecisionWizard.cs
index c29c174ab..4c56b7f86 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/PageObjects/RecordDecisionWizard.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/PageObjects/RecordDecisionWizard.cs
@@ -29,8 +29,8 @@ public async Task SubmitThroughTheWizard(AdvisoryBoardDecision request)
    {
       await SetDecisionToAndContinue(request.Decision.GetValueOrDefault());
       await SetDecisionByAndContinue(request.DecisionMadeBy.GetValueOrDefault());
-      await SetDecisionMakerName("Tester");
       await SetIsConditionalAndContinue(request.ApprovedConditionsSet.GetValueOrDefault(), request.ApprovedConditionsDetails);
+      await SetDecisionMakerName("Tester");
       await SetDecisionDateAndContinue(request.AdvisoryBoardDecisionDate.GetValueOrDefault(DateTime.MinValue));
    }
 
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/AnyConditionsIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/AnyConditionsIntegrationTests.cs
index 08e57dbb7..434dc88d3 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/AnyConditionsIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/AnyConditionsIntegrationTests.cs
@@ -29,7 +29,6 @@ public async Task InitializeAsync()
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Approved);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.Minister);
-      await _wizard.SetDecisionMakerName("Tester");
 
       Document.Url.Should().EndWith("any-conditions");
    }
@@ -60,7 +59,7 @@ public async Task Submit_yes_should_redirect_to_decision_date()
    {
       await _wizard.SetIsConditionalAndContinue(true, "Reasons");
 
-      Document.Url.Should().EndWith("/decision/decision-date");
+      Document.Url.Should().EndWith("/decision/decision-maker");
    }
 
    [Fact]
@@ -68,7 +67,7 @@ public async Task Submit_no_should_redirect_to_decision_date()
    {
       await _wizard.SetIsConditionalAndContinue(false, default);
 
-      Document.Url.Should().EndWith("/decision/decision-date");
+      Document.Url.Should().EndWith("/decision/decision-maker");
    }
 
    [Fact]
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/ChangeDecisionOptionsIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/ChangeDecisionOptionsIntegrationTests.cs
index d45b4f5dd..c81aaca9c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/ChangeDecisionOptionsIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/ChangeDecisionOptionsIntegrationTests.cs
@@ -113,10 +113,10 @@ public async Task Should_pass_on_the_obl_parameter_when_changing_declined_reason
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.Minister);
-      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Other, "other"));
+      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDecisionDateAndContinue(DateTime.Today);
-      await NavigateAsync("Change", 3);
+      await NavigateAsync("Change", 1);
 
       PageHeading.Should().Be("Why was this project declined?");
       Document.Url.Should().Contain("obl=");
@@ -132,10 +132,10 @@ public async Task Should_pass_on_the_obl_parameter_when_changing_deferred_reason
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Deferred);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.DirectorGeneral);
-      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDeferredReasonsAndContinue(Tuple.Create(AdvisoryBoardDeferredReason.Other, "other"));
+      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDecisionDateAndContinue(DateTime.Today);
-      await NavigateAsync("Change", 3);
+      await NavigateAsync("Change", 1);
 
       PageHeading.Should().Be("Why was this project deferred?");
       Document.Url.Should().Contain("obl=");
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DecisionDateIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DecisionDateIntegrationTests.cs
index 7c07174dd..e404b65a6 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DecisionDateIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DecisionDateIntegrationTests.cs
@@ -114,7 +114,7 @@ public async Task Should_go_back_to_any_conditions_for_the_accepted_journey()
 
       await NavigateAsync("Back");
 
-      PageHeading.Should().Be("Were any conditions set?");
+      PageHeading.Should().Be("Decision maker's name");
    }
 
    [Fact]
@@ -127,14 +127,14 @@ public async Task Should_go_back_to_declined_reasons_for_the_declined_journey()
       await wizard.StartFor(project.Id);
       await wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await wizard.SetDecisionByAndContinue(DecisionMadeBy.Minister);
-      await wizard.SetDecisionMakerName("Tester");
       await wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Finance, "Finance reasons"));
+      await wizard.SetDecisionMakerName("Tester");
 
       PageHeading.Should().Be("Date of decision");
 
       await NavigateAsync("Back");
 
-      PageHeading.Should().Be("Why was this project declined?");
+      PageHeading.Should().Be("Decision maker's name");
    }
 
    [Fact]
@@ -151,8 +151,8 @@ public async Task Should_display_the_correct_journey_in_the_required_message_whe
       await wizard.StartFor(project.Id);
       await wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await wizard.SetDecisionByAndContinue(DecisionMadeBy.Minister);
-      await wizard.SetDecisionMakerName("Tester");
       await wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Performance, "performance reasons"));
+      await wizard.SetDecisionMakerName("Tester");
 
       PageHeading.Should().Be("Date of decision");
 
@@ -175,7 +175,7 @@ private async Task ProgressToDecisionDateStep(AcademyConversionProject project)
       await wizard.StartFor(project.Id);
       await wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Approved);
       await wizard.SetDecisionByAndContinue(DecisionMadeBy.OtherRegionalDirector);
-      await wizard.SetDecisionMakerName("Tester");
       await wizard.SetIsConditionalAndContinue(false, "Something");
+      await wizard.SetDecisionMakerName("Tester");
    }
 }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DeclineReasonIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DeclineReasonIntegrationTests.cs
index ffc5e09b8..e5bbb998e 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DeclineReasonIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/DeclineReasonIntegrationTests.cs
@@ -31,7 +31,6 @@ public async Task InitializeAsync()
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.RegionalDirectorForRegion);
-      await _wizard.SetDecisionMakerName("Tester");
 
       Document.Url.Should().EndWith("/decision/declined-reason");
    }
@@ -70,7 +69,7 @@ public async Task Should_continue_to_the_decline_date_page_on_submit()
    {
       await _wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Other, "other reasons"));
 
-      PageHeading.Should().Be("Date of decision");
+      PageHeading.Should().Be("Decision maker's name");
    }
 
    [Fact]
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
index d28aa76a5..a17f3a68d 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
@@ -139,8 +139,8 @@ public async Task Should_display_declined_for_declined_projects()
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.DirectorGeneral);
-      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Finance, "Finance reason"));
+      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDecisionDateAndContinue(DateTime.Today);
 
       Document.QuerySelector("#decision")!.TextContent.Trim().Should().Be("Declined");
@@ -152,12 +152,12 @@ public async Task Should_show_the_selected_decline_reasons_and_details()
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.Minister);
-      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Finance, "Finance detail"),
-         Tuple.Create(AdvisoryBoardDeclinedReasons.ChoiceOfTrust, "Choice of trust detail"));
+      Tuple.Create(AdvisoryBoardDeclinedReasons.ChoiceOfTrust, "Choice of trust detail"));
+      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDecisionDateAndContinue(DateTime.Today);
 
-      string declineReasonSummary = Document.QuerySelector("#decline-reasons")!.TextContent;
+      string declineReasonSummary = Document.QuerySelector("#reasons")!.TextContent;
 
       declineReasonSummary.Should().Contain("Finance:", "finance reason was selected");
       declineReasonSummary.Should().Contain("Finance detail", "Finance reason detail was provided");
@@ -175,15 +175,15 @@ public async Task Should_show_the_selected_deferred_reasons_and_details()
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Deferred);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.Minister);
-      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDeferredReasonsAndContinue(
          Tuple.Create(AdvisoryBoardDeferredReason.PerformanceConcerns, "Performance detail"),
          Tuple.Create(AdvisoryBoardDeferredReason.Other, "Other detail"),
          Tuple.Create(AdvisoryBoardDeferredReason.AdditionalInformationNeeded, "additional info"),
          Tuple.Create(AdvisoryBoardDeferredReason.AwaitingNextOfstedReport, "Ofsted"));
+      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDecisionDateAndContinue(DateTime.Today);
 
-      string declineReasonSummary = Document.QuerySelector("#deferred-reasons")!.TextContent;
+      string declineReasonSummary = Document.QuerySelector("#reasons")!.TextContent;
 
       declineReasonSummary.Should().Contain("Additional information needed:");
       declineReasonSummary.Should().Contain("additional info");
@@ -201,8 +201,8 @@ public async Task Should_not_display_conditions_details_for_declined_projects()
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.OtherRegionalDirector);
-      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDeclinedReasonsAndContinue(Tuple.Create(AdvisoryBoardDeclinedReasons.Finance, "finance reasons"));
+      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDecisionDateAndContinue(DateTime.Today);
 
       string summaryContent = Document.QuerySelector(".govuk-summary-list")!.TextContent;
@@ -242,8 +242,8 @@ public async Task Should_go_back_to_choose_and_back_link_to_summary(int changeLi
 
    [Theory]
    [InlineData(0, "Record the decision", "Who made this decision?")]
-   [InlineData(1, "Who made this decision?", "Decision maker's name")]
-   [InlineData(3, "Were any conditions set?", "Date of decision")]
+   [InlineData(2, "Who made this decision?", "Decision maker's name")]
+   [InlineData(1, "Were any conditions set?", "Date of decision")]
    [InlineData(4, "Date of decision", "Check your answers before recording this decision")]
    public async Task Should_go_back_to_choose_and_submit_back_to_summary(int changeLinkIndex, string changePageTitle, string nextPageTitle)
    {
@@ -276,7 +276,6 @@ public async Task Should_store_the_reasons_in_the_expected_order()
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.Minister);
-      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDeclinedReasonsAndContinue(
          Tuple.Create(AdvisoryBoardDeclinedReasons.ChoiceOfTrust, "trust"),
          Tuple.Create(AdvisoryBoardDeclinedReasons.Other, "other"),
@@ -284,11 +283,12 @@ await _wizard.SetDeclinedReasonsAndContinue(
          Tuple.Create(AdvisoryBoardDeclinedReasons.Governance, "governance"),
          Tuple.Create(AdvisoryBoardDeclinedReasons.Performance, "performance")
       );
+      await _wizard.SetDecisionMakerName("Tester");
       await _wizard.SetDecisionDateAndContinue(DateTime.Today);
 
       PageHeading.Should().Be("Check your answers before recording this decision");
 
-      string reasonSummary = Document.QuerySelector<IHtmlElement>("#decline-reasons")!.TextContent;
+      string reasonSummary = Document.QuerySelector<IHtmlElement>("#reasons")!.TextContent;
 
       int financePosition = reasonSummary.IndexOf("Finance:", StringComparison.InvariantCultureIgnoreCase);
       int performancePosition = reasonSummary.IndexOf("Performance:", StringComparison.InvariantCultureIgnoreCase);
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhoDecidedIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhoDecidedIntegrationTests.cs
index e89d631f4..6c9eba9d5 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhoDecidedIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhoDecidedIntegrationTests.cs
@@ -68,7 +68,6 @@ public async Task Should_redirect_to_decline_reasons_if_project_declined()
       await wizard.StartFor(project.Id);
       await wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Declined);
       await wizard.SetDecisionByAndContinue(DecisionMadeBy.RegionalDirectorForRegion);
-      await wizard.SetDecisionMakerName("Tester");
 
       Document.Url.Should().EndWith("/decision/declined-reason", "reason should be the second question in the declined journey");
       Document.QuerySelector<IHtmlHeadingElement>(".govuk-fieldset__heading")!.TextContent.Trim()
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhyDeferredIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhyDeferredIntegrationTests.cs
index b03ab3194..0588bb1e1 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhyDeferredIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/WhyDeferredIntegrationTests.cs
@@ -35,7 +35,6 @@ public async Task InitializeAsync()
       await _wizard.StartFor(_project.Id);
       await _wizard.SetDecisionToAndContinue(AdvisoryBoardDecisions.Deferred);
       await _wizard.SetDecisionByAndContinue(DecisionMadeBy.RegionalDirectorForRegion);
-      await _wizard.SetDecisionMakerName("Tester");
 
       Document.Url.Should().EndWith("/decision/why-deferred");
    }
@@ -70,7 +69,7 @@ public async Task Should_continue_to_the_deferred_date_page_on_submit()
       await _wizard.SetDeferredReasonsAndContinue(Tuple.Create(AdvisoryBoardDeferredReason.Other, "other reasons"));
 
       Document.QuerySelector<IHtmlElement>("h1")!.Text().Should()
-         .Be("Date of decision");
+         .Be("Decision maker's name");
    }
 
    [Fact]
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
index 99565d149..e8dd3a773 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
@@ -101,13 +101,13 @@
                 @if (Model.Decision.Decision == AdvisoryBoardDecisions.Declined)
                 {
                     <a class="govuk-link" asp-page="@Links.Decision.DeclineReason.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-declined-btn">
-                        Change<span class="govuk-visually-hidden">rejected-reason</span>
+                        Change<span class="govuk-visually-hidden">declined-reason</span>
                     </a>
                 }
                 else if (Model.Decision.Decision == AdvisoryBoardDecisions.Deferred)
                 {
                     <a class="govuk-link" asp-page="@Links.Decision.WhyDeferred.Page" asp-route-id="@Model.Id" asp-route-obl="true" id="change-deferred-btn">
-                        Change<span class="govuk-visually-hidden">rejected-reason</span>
+                        Change<span class="govuk-visually-hidden">deferred-reason</span>
                     </a>
                 }
                 else if (Model.Decision.Decision == AdvisoryBoardDecisions.Withdrawn)

From 8114ecd383a2b23cc23b47403aaa1ef04e61f911 Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Thu, 13 Jun 2024 09:44:09 +0100
Subject: [PATCH 18/23] Updated comments

---
 .../Pages/TaskList/Decision/RecordDecision.cshtml         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
index 19988de7e..3fc889658 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/RecordDecision.cshtml
@@ -20,8 +20,7 @@
             <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
             </legend>
             <div class="govuk-radios @ModelState.GetErrorStyleClass()" data-module="govuk-radios" id="AdvisoryBoardDecision">
-
-                @* Define the custom order using a dictionary *@
+                
                 @{ var customOrder = new Dictionary<AdvisoryBoardDecisions, int>
                     {
                     { AdvisoryBoardDecisions.Approved, 1 },
@@ -31,14 +30,13 @@
                     { AdvisoryBoardDecisions.Withdrawn, 5 }
                     };
 
-                    @* Get the enum values and sort them based on the custom order *@
+                    @* Get the enum values and sort them based on the defined order based on Completes order*@
                     var sortedDecisions = Enum.GetValues(typeof(AdvisoryBoardDecisions))
                     .Cast<AdvisoryBoardDecisions>
                         ()
                         .OrderBy(decision => customOrder[decision]);
                         }
-
-                        @* Iterate through the sorted list *@
+                        
                         @foreach (var decision in sortedDecisions)
                         {
                             if (decision == AdvisoryBoardDecisions.DAORevoked && Model.AcademyTypeAndRoute.ToLower() != "sponsored")

From 5d61e0435b5018331d7e67fdd1cfa8caf68326c1 Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Thu, 13 Jun 2024 11:32:16 +0100
Subject: [PATCH 19/23] Updated ordering in summary and recording of a decision

---
 .../Decision/SummaryIntegrationTests.cs       |   5 +-
 .../RecordDecisionPreview/default.cshtml      | 190 +++++++++---------
 .../Pages/TaskList/Decision/Summary.cshtml    |   2 +-
 3 files changed, 100 insertions(+), 97 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
index a17f3a68d..ddf86f2b7 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Tests/Pages/TaskList/Decision/SummaryIntegrationTests.cs
@@ -242,8 +242,9 @@ public async Task Should_go_back_to_choose_and_back_link_to_summary(int changeLi
 
    [Theory]
    [InlineData(0, "Record the decision", "Who made this decision?")]
-   [InlineData(2, "Who made this decision?", "Decision maker's name")]
-   [InlineData(1, "Were any conditions set?", "Date of decision")]
+   [InlineData(1, "Who made this decision?", "Were any conditions set?")]
+   [InlineData(2, "Decision maker's name", "Date of decision")]
+   [InlineData(3, "Were any conditions set?", "Decision maker's name")]
    [InlineData(4, "Date of decision", "Check your answers before recording this decision")]
    public async Task Should_go_back_to_choose_and_submit_back_to_summary(int changeLinkIndex, string changePageTitle, string nextPageTitle)
    {
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Components/RecordDecisionPreview/default.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Components/RecordDecisionPreview/default.cshtml
index 9372eb5dc..7bc26926c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Components/RecordDecisionPreview/default.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Components/RecordDecisionPreview/default.cshtml
@@ -34,127 +34,90 @@
                 </dd>
             <dd class="govuk-summary-list__actions"></dd>
         </div>
+
+        @if (Model.Decision.Decision == AdvisoryBoardDecisions.Declined)
+        {
             <div class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
-                    Who made this decision
+                    Reasons
                 </dt>
-                <dd class="govuk-summary-list__value">
+                <dd class="govuk-summary-list__value" id="decline-reasons">
 
-                    @if (Model.Decision != null && Model.Decision.DecisionMadeBy != null)
+                    @foreach (AdvisoryBoardDeclinedReasonDetails reason in Model.Decision.DeclinedReasons)
                     {
-                        <div id="decision-made-by">@Model.Decision.DecisionMadeBy.ToDescription()</div>
-                    }
-                    else
-                    {
-                        <span class="empty">Empty</span>
+                        <div>@reason.Reason.ToDescription():</div>
+                        <div class="govuk-!-margin-bottom-2">@reason.Details</div>
                     }
-
                 </dd>
-            <dd class="govuk-summary-list__actions"></dd>
-        </div>
-
-        <div class="govuk-summary-list__row">
-            <dt class="govuk-summary-list__key">
-                Decision maker's name
-            </dt>
-            <dd class="govuk-summary-list__value">
-
-                @if (Model.Decision != null && Model.Decision.DecisionMakerName != null)
-                {
-                    <div id="decision-maker-name">@Model.Decision.DecisionMakerName</div>
-                }
-                else
-                {
-                    <span class="empty">Empty</span>
-                }
-
-            </dd>
-            <dd class="govuk-summary-list__actions"></dd>
-        </div>
-
-            @if (Model.Decision.Decision == AdvisoryBoardDecisions.Declined)
-            {
-                <div class="govuk-summary-list__row">
-                    <dt class="govuk-summary-list__key">
-                        Why was this project declined
-                    </dt>
-                    <dd class="govuk-summary-list__value" id="decline-reasons">
-
-                        @foreach (AdvisoryBoardDeclinedReasonDetails reason in Model.Decision.DeclinedReasons)
-                        {
-                            <div>@reason.Reason.ToDescription():</div>
-                            <div class="govuk-!-margin-bottom-2">@reason.Details</div>
-                        }
-                    </dd>
                 <dd class="govuk-summary-list__actions"></dd>
             </div>
-            }
+        }
 
 
-            @if (Model.Decision.Decision == AdvisoryBoardDecisions.Deferred)
-            {
-                <div class="govuk-summary-list__row">
-                    <dt class="govuk-summary-list__key">
-                        Why was this project deferred
-                    </dt>
-                    <dd class="govuk-summary-list__value" id="deferred-reasons">
+        @if (Model.Decision.Decision == AdvisoryBoardDecisions.Deferred)
+        {
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    Reasons
+                </dt>
+                <dd class="govuk-summary-list__value" id="deferred-reasons">
 
-                        @foreach (AdvisoryBoardDeferredReasonDetails reason in Model.Decision.DeferredReasons)
-                        {
-                            <div>@reason.Reason.ToDescription():</div>
-                            <div class="govuk-!-margin-bottom-2">@reason.Details</div>
-                        }
-                    </dd>
+                    @foreach (AdvisoryBoardDeferredReasonDetails reason in Model.Decision.DeferredReasons)
+                    {
+                        <div>@reason.Reason.ToDescription():</div>
+                        <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                    }
+                </dd>
                 <dd class="govuk-summary-list__actions"></dd>
             </div>
-            }
+        }
 
-            @if (Model.Decision.Decision == AdvisoryBoardDecisions.Withdrawn)
-            {
-                <div class="govuk-summary-list__row">
-                    <dt class="govuk-summary-list__key">
-                        Why was this project withdrawn
-                    </dt>
-                    <dd class="govuk-summary-list__value" id="withdrawn-reasons">
+        @if (Model.Decision.Decision == AdvisoryBoardDecisions.Withdrawn)
+        {
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    Reasons
+                </dt>
+                <dd class="govuk-summary-list__value" id="withdrawn-reasons">
 
-                        @foreach (AdvisoryBoardWithdrawnReasonDetails reason in Model.Decision.WithdrawnReasons)
-                        {
-                            <div>@reason.Reason.ToDescription():</div>
-                            <div class="govuk-!-margin-bottom-2">@reason.Details</div>
-                        }
-                    </dd>
+                    @foreach (AdvisoryBoardWithdrawnReasonDetails reason in Model.Decision.WithdrawnReasons)
+                    {
+                        <div>@reason.Reason.ToDescription():</div>
+                        <div class="govuk-!-margin-bottom-2">@reason.Details</div>
+                    }
+                </dd>
                 <dd class="govuk-summary-list__actions"></dd>
             </div>
-            }
+        }
 
-            @if (Model.Decision.Decision == AdvisoryBoardDecisions.Approved)
-            {
-                var conditionsSet = Model.Decision.ApprovedConditionsSet.HasValue && Model.Decision.ApprovedConditionsSet.Value;
+        @if (Model.Decision.Decision == AdvisoryBoardDecisions.Approved)
+        {
+            var conditionsSet = Model.Decision.ApprovedConditionsSet.HasValue && Model.Decision.ApprovedConditionsSet.Value;
 
-                <div class="govuk-summary-list__row">
-                    <dt class="govuk-summary-list__key">
-                        Were any conditions set
-                    </dt>
-                    <dd class="govuk-summary-list__value" id="condition-set">
-                        @if (conditionsSet)
-                        {
-                            <div>Yes:</div>
-                            <div>@Model.Decision.ApprovedConditionsDetails</div>
-                        }
-                        else
-                        {
-                            <span>No</span>
-                        }
-                    </dd>
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    Conditions
+                </dt>
+                <dd class="govuk-summary-list__value" id="condition-set">
+                    @if (conditionsSet)
+                    {
+                        <div>Yes:</div>
+                        <div>@Model.Decision.ApprovedConditionsDetails</div>
+                    }
+                    else
+                    {
+                        <span>No</span>
+                    }
+                </dd>
                 <dd class="govuk-summary-list__actions"></dd>
             </div>
-            }
+        }
         @if (Model.Decision.Decision == AdvisoryBoardDecisions.DAORevoked)
         {
 
             <div class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
-                    Why was the DAO revoked?
+                    Reasons
                 </dt>
                 <dd class="govuk-summary-list__value" id="dao-revoked-reasons">
 
@@ -167,6 +130,45 @@
                 <dd class="govuk-summary-list__actions"></dd>
             </div>
         }
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    Decision maker's role
+                </dt>
+                <dd class="govuk-summary-list__value">
+
+                    @if (Model.Decision != null && Model.Decision.DecisionMadeBy != null)
+                    {
+                        <div id="decision-made-by">@Model.Decision.DecisionMadeBy.ToDescription()</div>
+                    }
+                    else
+                    {
+                        <span class="empty">Empty</span>
+                    }
+
+                </dd>
+            <dd class="govuk-summary-list__actions"></dd>
+        </div>
+
+        <div class="govuk-summary-list__row">
+            <dt class="govuk-summary-list__key">
+                Decision maker's name
+            </dt>
+            <dd class="govuk-summary-list__value">
+
+                @if (Model.Decision != null && Model.Decision.DecisionMakerName != null)
+                {
+                    <div id="decision-maker-name">@Model.Decision.DecisionMakerName</div>
+                }
+                else
+                {
+                    <span class="empty">Empty</span>
+                }
+
+            </dd>
+            <dd class="govuk-summary-list__actions"></dd>
+        </div>
+
+
             <div class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
                     Date of decision
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
index e8dd3a773..db8d9e64f 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/TaskList/Decision/Summary.cshtml
@@ -187,7 +187,7 @@
 
         <div class="govuk-summary-list__row">
             <dt class="govuk-summary-list__key">
-                Were any conditions set
+                Conditions
             </dt>
             <dd class="govuk-summary-list__value" id="condition-set">
                 @if (conditionsSet)

From 397b48eec9e6700d95f19605724d1b668ab0c148 Mon Sep 17 00:00:00 2001
From: Dominic NEED <Dominic.NEED@EDUCATION.GOV.UK>
Date: Thu, 13 Jun 2024 12:15:27 +0100
Subject: [PATCH 20/23] Add release notes

---
 release-notes.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/release-notes.md b/release-notes.md
index 099c6139f..733f8726d 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -2,6 +2,12 @@
 
 * Added ability to filter filters (Example being; to refine delivery officer list)
 * Added ability to have 'DAO Revoked' decision recorded against a Sponsored conversion project
+* Decision flow changed to ensure consistency with Complete
+* Content updated on decision flow to be more concise.
+* Introduction of New Decision for DAO Revoked:
+    * Introduces precursor to explain the process
+    * Adds a 'Before You Start' page to ensure user readiness and confirmation of prerequisites
+    * Enforces decision was made by Minister 
 
 
 ## 1.5.0

From b59420a0802c2f62aec207667a74dd5e2c3eba87 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 11:56:27 +0100
Subject: [PATCH 21/23] Update DFE-Digital/deploy-azure-container-apps-action
 action to v2.2.0 (#1081)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/build-and-push-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index aaaa97a18..d330ffd9c 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -39,7 +39,7 @@ jobs:
   deploy-image:
     name: Deploy
     needs: [ set-env ]
-    uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/build-push-deploy.yml@v2.1.0
+    uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/build-push-deploy.yml@v2.2.0
     with:
       docker-image-name: 'a2bint-app'
       docker-build-file-name: './Dockerfile'

From 3ad6163ef4dbebd3bc73377673563331b24a7dcf Mon Sep 17 00:00:00 2001
From: Ash Davies <3853061+DrizzlyOwl@users.noreply.github.com>
Date: Mon, 17 Jun 2024 15:51:04 +0100
Subject: [PATCH 22/23] Application Insights front-end telemetry (#1085)

* Variable name change to be more explicit

* Fixed broken src tag

* Define the users identifier

* Set app config value for toggling browser analytics

* Moved iframe into body tag

* Added App Insights Browser JS

* Use identity name as email claim is not set

* Corrected EoL feed

* Added App Insights to CSP

* Updated GA script to match shared Layout.cshtml

* Remove unused injection

* Add App Insights SDK to layout variant

* Updated Cookie Policy statement

* Corrected line ending

* Expire App Insights cookies on rejection choice

* Build pipeline for minifying App Insights JS
---
 .../Pages/Public/CookiePreferences.cshtml     |  58 +++-
 .../Pages/Public/CookiePreferences.cshtml.cs  | 217 ++++++-------
 .../Pages/Shared/_Layout.cshtml               |  38 ++-
 .../Shared/_LayoutNoHeaderAndFooter.cshtml    |  54 +++-
 .../Security/SecureHeadersDefinitions.cs      | 144 ++++-----
 .../Dfe.PrepareConversions/appsettings.json   |   1 +
 .../wwwroot/package-lock.json                 | 289 ++++++++++++++++++
 .../wwwroot/package.json                      |   4 +-
 .../wwwroot/src/application-insights.js       |  16 +
 .../wwwroot/webpack.appinsights.config.js     |   9 +
 10 files changed, 624 insertions(+), 206 deletions(-)
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/src/application-insights.js
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/webpack.appinsights.config.js

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Public/CookiePreferences.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Public/CookiePreferences.cshtml
index 4346b8982..0d650e8c6 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Public/CookiePreferences.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Public/CookiePreferences.cshtml
@@ -37,6 +37,10 @@
          There is a separate <a href="@Model.TransfersCookiesUrl">cookies page for the transfers part of this service.</a>
       </p>
 
+      <h2 class="govuk-heading-m">Analytics cookies (optional)</h2>
+
+      <h3 class="govuk-heading-s">Google Analytics</h3>
+
       <p class="govuk-body">
          With your permission, we use Google Analytics to collect data about how you use the service. This information helps us improve our service.
          These cookies do not collect your name or address, they do collect a unique user identifier
@@ -50,19 +54,32 @@
          <li>what you click on while you’re visiting the site</li>
       </ul>
       <p class="govuk-body">Google is not allowed to share our analytics data with anyone.</p>
+
+      <h3 class="govuk-heading-s">Azure Application Insights</h3>
+
+      <p class="govuk-body">We use Azure Application Insights software to collect information about how you use this website. We do this to help make sure the site is meeting the needs of its users and to help us make improvements.</p>
+      <p class="govuk-body">Azure Application Insights stores information about:</p>
+      <ul class="govuk-list govuk-list--bullet">
+         <li>the pages you visit on this website</li>
+         <li>how long you spend on each page</li>
+         <li>how you got to the site</li>
+         <li>what you click on while you're visiting the site</li>
+      </ul>
+      <p class="govuk-body">We don't allow Microsoft to use or share our analytics data.</p>
+
       <form method="post">
          <div class="govuk-form-group">
             <fieldset class="govuk-fieldset">
                <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
                   <h3 class="govuk-fieldset__heading">
-                     Do you accept Google Analytics cookies?
+                     Do you accept analytical cookies?
                   </h3>
                </legend>
                <div class="govuk-radios">
                   <div class="govuk-radios__item">
                      <input class="govuk-radios__input" id="cookie-consent-accept" name="consent" type="radio" value="true" checked="@Model.Consent">
                      <label class="govuk-label govuk-radios__label" for="cookie-consent-accept">
-                        Yes, opt in to Google Analytics cookies
+                        Yes, opt in to analytical cookies
                      </label>
                   </div>
                   <div class="govuk-radios__item">
@@ -76,6 +93,7 @@
          </div>
          <input type="submit" name="commit" value="Save changes" class="govuk-button" data-qa="submit" data-module="govuk-button" data-disable-with="Save changes">
       </form>
+
       <h2 class="govuk-heading-l">How we use cookies</h2>
       <h3 class="govuk-heading-m">Essential cookies</h3>
       <p class="govuk-body">
@@ -119,7 +137,10 @@
          </tr>
          </tbody>
       </table>
-      <h3 class="govuk-heading-m">Measuring website usage (Google Analytics)</h3>
+
+      <h2 class="govuk-heading-m">Analytical cookies</h2>
+
+      <h3 class="govuk-heading-s">Google Analytics</h3>
       <p class="govuk-body">Google Analytics sets the following cookies:</p>
       <table class="govuk-table" aria-label="Google analytics cookies">
          <thead class="govuk-table__header">
@@ -152,5 +173,34 @@
          </tr>
          </tbody>
       </table>
+
+      <h3 class="govuk-heading-s">Application Insights</h3>
+      <p class="govuk-body">Azure Application Insights sets the following cookies:</p>
+      <table class="govuk-table" aria-label="App Insights cookies">
+         <thead class="govuk-table__head">
+            <tr class="govuk-table__row">
+               <th scope="col" class="govuk-table__header">Name</th>
+               <th scope="col" class="govuk-table__header">Purpose</th>
+               <th scope="col" class="govuk-table__header">Expires</th>
+            </tr>
+         </thead>
+         <tbody class="govuk-table__body">
+            <tr class="govuk-table__row">
+               <td class="govuk-table__cell">ai_session</td>
+               <td class="govuk-table__cell">This helps us track activity happening over a single browser session</td>
+               <td class="govuk-table__cell">1 hour</td>
+            </tr>
+            <tr class="govuk-table__row">
+               <td class="govuk-table__cell">ai_user</td>
+               <td class="govuk-table__cell">This helps us to identify the number of distinct users accessing the site over time by tracking if you've visited before</td>
+               <td class="govuk-table__cell">1 year</td>
+            </tr>
+            <tr class="govuk-table__row">
+               <td class="govuk-table__cell">ai_authuser</td>
+               <td class="govuk-table__cell">This helps us to identify authenticated users and how they interact with the site</td>
+               <td class="govuk-table__cell">When you close your browser</td>
+            </tr>
+         </tbody>
+      </table>
    </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Public/CookiePreferences.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Public/CookiePreferences.cshtml.cs
index 5ae661ec5..e66ff6ea5 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Public/CookiePreferences.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Public/CookiePreferences.cshtml.cs
@@ -1,105 +1,112 @@
-using Dfe.PrepareConversions.Configuration;
-using Dfe.PrepareConversions.Models;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System;
-
-namespace Dfe.PrepareConversions.Pages.Public;
-
-public class CookiePreferences : PageModel
-{
-   private const string CONSENT_COOKIE_NAME = ".ManageAnAcademyConversion.Consent";
-   private readonly ILogger<CookiePreferences> _logger;
-   private readonly IOptions<ServiceLinkOptions> _options;
-
-   public CookiePreferences(ILogger<CookiePreferences> logger, IOptions<ServiceLinkOptions> options)
-   {
-      _logger = logger;
-      _options = options;
-   }
-
-   public bool? Consent { get; set; }
-   public bool PreferencesSet { get; set; }
-   public string ReturnPath { get; set; }
-
-   public string TransfersCookiesUrl { get; set; }
-
-   public ActionResult OnGet(bool? consent, string returnUrl)
-   {
-      ReturnPath = returnUrl;
-      TransfersCookiesUrl = $"{_options.Value.TransfersUrl}/cookie-preferences?returnUrl=%2Fhome";
-
-      if (Request.Cookies.ContainsKey(CONSENT_COOKIE_NAME))
-      {
-         Consent = bool.Parse(Request.Cookies[CONSENT_COOKIE_NAME] ?? string.Empty);
-      }
-
-      if (consent.HasValue)
-      {
-         PreferencesSet = true;
-
-         ApplyCookieConsent(consent);
-
-         if (!string.IsNullOrEmpty(returnUrl))
-         {
-            return Redirect(returnUrl);
-         }
-
-         return RedirectToPage(Links.Public.CookiePreferences);
-      }
-
-      return Page();
-   }
-
-   public IActionResult OnPost(bool? consent, string returnUrl)
-   {
-      ReturnPath = returnUrl;
-
-      if (Request.Cookies.ContainsKey(CONSENT_COOKIE_NAME))
-      {
-         Consent = bool.Parse(Request.Cookies[CONSENT_COOKIE_NAME] ?? string.Empty);
-      }
-
-      if (consent.HasValue)
-      {
-         Consent = consent;
-         PreferencesSet = true;
-
-         CookieOptions cookieOptions = new() { Expires = DateTime.Today.AddMonths(6), Secure = true, HttpOnly = true };
-         Response.Cookies.Append(CONSENT_COOKIE_NAME, consent.Value.ToString(), cookieOptions);
-
-         if (consent.Value is false)
-         {
-            ApplyCookieConsent(false);
-         }
-
-         return Page();
-      }
-
-      return Page();
-   }
-
-   private void ApplyCookieConsent(bool? consent)
-   {
-      if (consent.HasValue)
-      {
-         CookieOptions cookieOptions = new() { Expires = DateTime.Today.AddMonths(6), Secure = true, HttpOnly = true };
-         Response.Cookies.Append(CONSENT_COOKIE_NAME, consent.Value.ToString(), cookieOptions);
-      }
-
-      if (consent is false)
-      {
-         foreach (string cookie in Request.Cookies.Keys)
-         {
-            if (cookie.StartsWith("_ga") || cookie.Equals("_gid"))
-            {
-               _logger.LogInformation("Expiring Google analytics cookie: {cookie}", cookie);
-               Response.Cookies.Append(cookie, string.Empty, new CookieOptions { Expires = DateTime.Now.AddDays(-1), Secure = true, SameSite = SameSiteMode.Lax, HttpOnly = true });
-            }
-         }
-      }
-   }
-}
+using Dfe.PrepareConversions.Configuration;
+using Dfe.PrepareConversions.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using System;
+
+namespace Dfe.PrepareConversions.Pages.Public;
+
+public class CookiePreferences : PageModel
+{
+   private const string CONSENT_COOKIE_NAME = ".ManageAnAcademyConversion.Consent";
+   private readonly ILogger<CookiePreferences> _logger;
+   private readonly IOptions<ServiceLinkOptions> _options;
+
+   public CookiePreferences(ILogger<CookiePreferences> logger, IOptions<ServiceLinkOptions> options)
+   {
+      _logger = logger;
+      _options = options;
+   }
+
+   public bool? Consent { get; set; }
+   public bool PreferencesSet { get; set; }
+   public string ReturnPath { get; set; }
+
+   public string TransfersCookiesUrl { get; set; }
+
+   public ActionResult OnGet(bool? consent, string returnUrl)
+   {
+      ReturnPath = returnUrl;
+      TransfersCookiesUrl = $"{_options.Value.TransfersUrl}/cookie-preferences?returnUrl=%2Fhome";
+
+      if (Request.Cookies.ContainsKey(CONSENT_COOKIE_NAME))
+      {
+         Consent = bool.Parse(Request.Cookies[CONSENT_COOKIE_NAME] ?? string.Empty);
+      }
+
+      if (consent.HasValue)
+      {
+         PreferencesSet = true;
+
+         ApplyCookieConsent(consent);
+
+         if (!string.IsNullOrEmpty(returnUrl))
+         {
+            return Redirect(returnUrl);
+         }
+
+         return RedirectToPage(Links.Public.CookiePreferences);
+      }
+
+      return Page();
+   }
+
+   public IActionResult OnPost(bool? consent, string returnUrl)
+   {
+      ReturnPath = returnUrl;
+
+      if (Request.Cookies.ContainsKey(CONSENT_COOKIE_NAME))
+      {
+         Consent = bool.Parse(Request.Cookies[CONSENT_COOKIE_NAME] ?? string.Empty);
+      }
+
+      if (consent.HasValue)
+      {
+         Consent = consent;
+         PreferencesSet = true;
+
+         CookieOptions cookieOptions = new() { Expires = DateTime.Today.AddMonths(6), Secure = true, HttpOnly = true };
+         Response.Cookies.Append(CONSENT_COOKIE_NAME, consent.Value.ToString(), cookieOptions);
+
+         if (consent.Value is false)
+         {
+            ApplyCookieConsent(false);
+         }
+
+         return Page();
+      }
+
+      return Page();
+   }
+
+   private void ApplyCookieConsent(bool? consent)
+   {
+      if (consent.HasValue)
+      {
+         CookieOptions cookieOptions = new() { Expires = DateTime.Today.AddMonths(6), Secure = true, HttpOnly = true };
+         Response.Cookies.Append(CONSENT_COOKIE_NAME, consent.Value.ToString(), cookieOptions);
+      }
+
+      if (consent is false)
+      {
+         foreach (string cookie in Request.Cookies.Keys)
+         {
+            // Google Analytics
+            if (cookie.StartsWith("_ga") || cookie.Equals("_gid"))
+            {
+               _logger.LogInformation("Expiring Google analytics cookie: {cookie}", cookie);
+               Response.Cookies.Append(cookie, string.Empty, new CookieOptions { Expires = DateTime.Now.AddDays(-1), Secure = true, SameSite = SameSiteMode.Lax, HttpOnly = true });
+            }
+            // App Insights
+            if (cookie.StartsWith("ai_"))
+            {
+               _logger.LogInformation("Expiring App insights cookie: {cookie}", cookie);
+               Response.Cookies.Append(cookie, string.Empty, new CookieOptions { Expires = DateTime.Now.AddYears(-1), Secure = true, SameSite = SameSiteMode.Lax, HttpOnly = true });
+            }
+         }
+      }
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
index fbfbeb8f7..1d70cc2a9 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_Layout.cshtml
@@ -6,7 +6,8 @@
     var analyticsConsent = Context.Request.Cookies.ContainsKey(".ManageAnAcademyConversion.Consent")
                            && bool.Parse(Context.Request.Cookies[".ManageAnAcademyConversion.Consent"] ?? string.Empty);
 
-    var showAnalytics = Configuration["GoogleAnalytics:Enable"] == "Yes" && analyticsConsent;
+    var enableGoogleAnalytics = Configuration["GoogleAnalytics:Enable"] == "Yes" && analyticsConsent;
+    var enableAppInsightsAnalytics = Configuration["ApplicationInsights:EnableBrowserAnalytics"] == "Yes" && analyticsConsent;
 
     var titleDescription = Context.Request.Path == "/project-type"
        ? string.Empty
@@ -15,6 +16,8 @@
     var isFormAMatPage = Context.Request.Path.Value.Contains("/form-a-mat/project-list") || Context.Request.Path.Value.Contains("/schools-in-this-mat/");
 
     var notificationBannerMessage = Configuration["notificationBannerMessage"] ?? string.Empty;
+
+    var authenticatedUserId = User.Identity is not null && User.Identity.IsAuthenticated ? User.Identity.Name ?? "Unknown" : "Anonymous";
 }
 
 <!DOCTYPE html>
@@ -38,7 +41,7 @@
     <link rel="stylesheet" href="~/dist/site.css" />
     <link rel="stylesheet" href="~/dist/accessible-autocomplete.min.css" asp-add-nonce />
     <link rel="stylesheet" href="~/dist/dfefrontend-1.0.1.min.css" asp-add-nonce />
-    @if (showAnalytics)
+    @if (enableGoogleAnalytics)
     {
         <!-- Google Tag Manager -->
         <script asp-add-nonce>
@@ -49,17 +52,23 @@
                 }); var f = d.getElementsByTagName(s)[0],
                     j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
                         'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
-            })(window, document, 'script', 'dataLayer', 'GTM-5H6G773');</script>
-        <!-- End Google Tag Manager -->
+            })(window, document, 'script', 'dataLayer', 'GTM-5H6G773');
+         </script>
+         <!-- End Google Tag Manager -->
     }
 
-    @if (analyticsConsent)
+    @if (enableAppInsightsAnalytics)
     {
-        <!-- Google Tag Manager (noscript) -->
-        <noscript asp-add-nonce>
-            <iframe title="GATagManager" src=https://www.googletagmanager.com/ns.html?id =GTM-5H6G773 height="0" width="0" style="display: none; visibility: hidden"></iframe>
-        </noscript>
-        <!-- End Google Tag Manager (noscript) -->
+      <!-- Application insights -->
+      <script type="text/javascript" integrity="sha384-g/ZkzetdQypWdY0NBZT5r2L3BR9/hURD8OBcd1rEaBpgX6QC7EaTL+o+mzWrBcXW" crossorigin="anonymous" src="https://js.monitor.azure.com/scripts/b/ext/ai.clck.2.8.18.min.js"></script>
+      <script type="text/javascript" asp-add-nonce>
+         window.appInsights = {
+            connectionString: '@Configuration["ApplicationInsights:ConnectionString"]',
+            authenticatedUserId: '@authenticatedUserId'
+         }
+      </script>
+      <script type="text/javascript" src="~/dist/application-insights.min.js" asp-add-nonce></script>
+      <!-- End Application insights -->
     }
 
     <script type="text/javascript" src="~/dist/accessible-autocomplete.min.js" asp-add-nonce></script>
@@ -67,6 +76,15 @@
 </head>
 <body class="govuk-template__body">
 
+   @if (enableGoogleAnalytics)
+   {
+      <!-- Google Tag Manager (noscript) -->
+      <noscript asp-add-nonce>
+         <iframe title="GATagManager" src="https://www.googletagmanager.com/ns.html?id=GTM-5H6G773" height="0" width="0" style="display: none; visibility: hidden"></iframe>
+      </noscript>
+      <!-- End Google Tag Manager (noscript) -->
+   }
+
     <script asp-add-nonce>
         document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
     </script>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_LayoutNoHeaderAndFooter.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_LayoutNoHeaderAndFooter.cshtml
index d9152915a..a171fd3e5 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_LayoutNoHeaderAndFooter.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_LayoutNoHeaderAndFooter.cshtml
@@ -6,7 +6,10 @@
    var analyticsConsent = Context.Request.Cookies.ContainsKey(".ManageAnAcademyConversion.Consent")
                           && bool.Parse(Context.Request.Cookies[".ManageAnAcademyConversion.Consent"] ?? string.Empty);
 
-   var showAnalytics = Configuration["GoogleAnalytics:Enable"] == "Yes" && analyticsConsent;
+   var enableGoogleAnalytics = Configuration["GoogleAnalytics:Enable"] == "Yes" && analyticsConsent;
+   var enableAppInsightsAnalytics = Configuration["ApplicationInsights:EnableBrowserAnalytics"] == "Yes" && analyticsConsent;
+
+   var authenticatedUserId = User.Identity is not null && User.Identity.IsAuthenticated ? User.Identity.Name ?? "Unknown" : "Anonymous";
 }
 
 <!DOCTYPE html>
@@ -28,31 +31,52 @@
 
    <title>@ViewData["Title"] - Manage an academy conversion</title>
    <link rel="stylesheet" href="~/dist/site.css"/>
-   @if (showAnalytics)
-   {
-      <!-- Google Tag Manager -->
-      <script asp-add-nonce>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-		new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-		j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-		'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-		})(window,document,'script','dataLayer','GTM-5H6G773');</script>
-      <!-- End Google Tag Manager -->
-   }
+
+   @if (enableGoogleAnalytics)
+    {
+        <!-- Google Tag Manager -->
+        <script asp-add-nonce>
+            (function (w, d, s, l, i) {
+                w[l] = w[l] || []; w[l].push({
+                    'gtm.start':
+                        new Date().getTime(), event: 'gtm.js'
+                }); var f = d.getElementsByTagName(s)[0],
+                    j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
+                        'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+            })(window, document, 'script', 'dataLayer', 'GTM-5H6G773');
+         </script>
+         <!-- End Google Tag Manager -->
+    }
+
+    @if (enableAppInsightsAnalytics)
+    {
+      <!-- Application insights -->
+      <script type="text/javascript" integrity="sha384-g/ZkzetdQypWdY0NBZT5r2L3BR9/hURD8OBcd1rEaBpgX6QC7EaTL+o+mzWrBcXW" crossorigin="anonymous" src="https://js.monitor.azure.com/scripts/b/ext/ai.clck.2.8.18.min.js"></script>
+      <script type="text/javascript" asp-add-nonce>
+         window.appInsights = {
+            connectionString: '@Configuration["ApplicationInsights:ConnectionString"]',
+            authenticatedUserId: '@authenticatedUserId'
+         }
+      </script>
+      <script type="text/javascript" src="~/dist/application-insights.min.js" asp-add-nonce></script>
+      <!-- End Application insights -->
+    }
 </head>
 <body class="govuk-template__body ">
-@if (analyticsConsent)
+
+@if (enableGoogleAnalytics)
 {
    <!-- Google Tag Manager (noscript) -->
    <noscript asp-add-nonce>
-      <iframe title="GATagManager" src=https://www.googletagmanager.com/ns.html?id=GTM-5H6G773 height="0" width="0" style="display: none; visibility: hidden"></iframe>
+      <iframe title="GATagManager" src="https://www.googletagmanager.com/ns.html?id=GTM-5H6G773" height="0" width="0" style="display: none; visibility: hidden"></iframe>
    </noscript>
    <!-- End Google Tag Manager (noscript) -->
 }
+
 <script asp-add-nonce>
     document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');
 </script>
 
-
 <div class="govuk-width-container">
    @await RenderSectionAsync("BeforeMain", false)
    <main class="govuk-main-wrapper gov-main-wrapper--auto-spacing" id="main-content" role="main">
@@ -61,4 +85,4 @@
 </div>
 <script src="~/dist/site.js" asp-add-nonce></script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Security/SecureHeadersDefinitions.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Security/SecureHeadersDefinitions.cs
index 4b5a8e2c6..1bd9fa8f9 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Security/SecureHeadersDefinitions.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Security/SecureHeadersDefinitions.cs
@@ -1,71 +1,73 @@
-using Microsoft.AspNetCore.Builder;
-
-namespace Dfe.PrepareConversions.Security;
-
-public static class SecurityHeadersDefinitions
-{
-   private static string GoogleTagManagerUri => "https://www.googletagmanager.com";
-   private static string GoogleAnalyticsUri => "https://www.google-analytics.com/";
-
-   public static HeaderPolicyCollection GetHeaderPolicyCollection(bool isDev)
-   {
-      HeaderPolicyCollection policy = new HeaderPolicyCollection()
-         .AddFrameOptionsDeny()
-         .AddXssProtectionBlock()
-         .AddContentTypeOptionsNoSniff()
-         .AddReferrerPolicyStrictOriginWhenCrossOrigin()
-         .RemoveServerHeader()
-         .AddCrossOriginOpenerPolicy(builder =>
-         {
-            builder.SameOrigin();
-         })
-         .AddCrossOriginEmbedderPolicy(builder =>
-         {
-            builder.RequireCorp();
-         })
-         .AddCrossOriginResourcePolicy(builder =>
-         {
-            builder.SameOrigin();
-         })
-         .AddContentSecurityPolicy(builder =>
-         {
-            builder.AddObjectSrc().None();
-            builder.AddBlockAllMixedContent();
-            builder.AddImgSrc().Self().From("data:").From(GoogleAnalyticsUri)
-               .From(GoogleTagManagerUri);
-            builder.AddFormAction().Self();
-            builder.AddFormAction().OverHttps();
-            builder.AddFontSrc().Self();
-            builder.AddStyleSrc().Self();
-            builder.AddBaseUri().Self();
-            builder.AddScriptSrc().From(GoogleTagManagerUri).UnsafeInline().WithNonce();
-            builder.AddFrameAncestors().None();
-         })
-         .RemoveServerHeader()
-         .AddPermissionsPolicy(builder =>
-         {
-            builder.AddAccelerometer().None();
-            builder.AddAutoplay().None();
-            builder.AddCamera().None();
-            builder.AddEncryptedMedia().None();
-            builder.AddFullscreen().All();
-            builder.AddGeolocation().None();
-            builder.AddGyroscope().None();
-            builder.AddMagnetometer().None();
-            builder.AddMicrophone().None();
-            builder.AddMidi().None();
-            builder.AddPayment().None();
-            builder.AddPictureInPicture().None();
-            builder.AddSyncXHR().None();
-            builder.AddUsb().None();
-         });
-
-      if (!isDev)
-      {
-         // max age = one year in seconds
-         policy.AddStrictTransportSecurityMaxAgeIncludeSubDomains(maxAgeInSeconds: 60 * 60 * 24 * 365);
-      }
-
-      return policy;
-   }
-}
+using Microsoft.AspNetCore.Builder;
+
+namespace Dfe.PrepareConversions.Security;
+
+public static class SecurityHeadersDefinitions
+{
+   private static string GoogleTagManagerUri => "https://www.googletagmanager.com";
+   private static string GoogleAnalyticsUri => "https://www.google-analytics.com/";
+   private static string ApplicationInsightsUri => "https://js.monitor.azure.com/";
+
+   public static HeaderPolicyCollection GetHeaderPolicyCollection(bool isDev)
+   {
+      HeaderPolicyCollection policy = new HeaderPolicyCollection()
+         .AddFrameOptionsDeny()
+         .AddXssProtectionBlock()
+         .AddContentTypeOptionsNoSniff()
+         .AddReferrerPolicyStrictOriginWhenCrossOrigin()
+         .RemoveServerHeader()
+         .AddCrossOriginOpenerPolicy(builder =>
+         {
+            builder.SameOrigin();
+         })
+         .AddCrossOriginEmbedderPolicy(builder =>
+         {
+            builder.RequireCorp();
+         })
+         .AddCrossOriginResourcePolicy(builder =>
+         {
+            builder.SameOrigin();
+         })
+         .AddContentSecurityPolicy(builder =>
+         {
+            builder.AddObjectSrc().None();
+            builder.AddBlockAllMixedContent();
+            builder.AddImgSrc().Self().From("data:").From(GoogleAnalyticsUri)
+               .From(GoogleTagManagerUri);
+            builder.AddFormAction().Self();
+            builder.AddFormAction().OverHttps();
+            builder.AddFontSrc().Self();
+            builder.AddStyleSrc().Self();
+            builder.AddBaseUri().Self();
+            builder.AddScriptSrc().From(GoogleTagManagerUri).UnsafeInline().WithNonce();
+            builder.AddScriptSrc().From(ApplicationInsightsUri).UnsafeInline().WithNonce();
+            builder.AddFrameAncestors().None();
+         })
+         .RemoveServerHeader()
+         .AddPermissionsPolicy(builder =>
+         {
+            builder.AddAccelerometer().None();
+            builder.AddAutoplay().None();
+            builder.AddCamera().None();
+            builder.AddEncryptedMedia().None();
+            builder.AddFullscreen().All();
+            builder.AddGeolocation().None();
+            builder.AddGyroscope().None();
+            builder.AddMagnetometer().None();
+            builder.AddMicrophone().None();
+            builder.AddMidi().None();
+            builder.AddPayment().None();
+            builder.AddPictureInPicture().None();
+            builder.AddSyncXHR().None();
+            builder.AddUsb().None();
+         });
+
+      if (!isDev)
+      {
+         // max age = one year in seconds
+         policy.AddStrictTransportSecurityMaxAgeIncludeSubDomains(maxAgeInSeconds: 60 * 60 * 24 * 365);
+      }
+
+      return policy;
+   }
+}
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
index 2a7fe3cc0..1578ff1f8 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/appsettings.json
@@ -41,6 +41,7 @@
       "RevocationGuidanceLink": "https://educationgovuk.sharepoint.com/:w:/r/sites/lvedfe00116/_layouts/15/Doc.aspx?action=default&file=Revocation_Guidance_Mar24.docx&mobileredirect=true&sourcedoc=%7B563CD875-E0A4-46F0-AEC2-8C19453E24D5%7D"
    },
    "ApplicationInsights": {
+      "EnableBrowserAnalytics": "No",
       "ConnectionString": "",
       "InstrumentationKey": ""
    },
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/package-lock.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/package-lock.json
index a34dd1f54..d8c372b06 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/package-lock.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/package-lock.json
@@ -5,6 +5,7 @@
 	"packages": {
 		"": {
 			"dependencies": {
+				"@microsoft/applicationinsights-web": "^3.2.2",
 				"@ministryofjustice/frontend": "^1.8.1",
 				"accessible-autocomplete": "^2.0.4",
 				"dfe-frontend-alpha": "^1.0.1",
@@ -2355,6 +2356,149 @@
 				"@jridgewell/sourcemap-codec": "1.4.14"
 			}
 		},
+		"node_modules/@microsoft/applicationinsights-analytics-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-analytics-js/-/applicationinsights-analytics-js-3.2.2.tgz",
+			"integrity": "sha512-i6/7hYO7lFPE1rMARG6c4bGTuUJUiPb9GRfwMhzArpG39fqduCWpH6y2PdlwZzjyDQAxIOgBiSfLddgsAVoYOA==",
+			"dependencies": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-cfgsync-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-cfgsync-js/-/applicationinsights-cfgsync-js-3.2.2.tgz",
+			"integrity": "sha512-W4sQmQC9ZXN8ETYHcXQZl7kMACDkiC/a26OYx9IW8CzgZUI0U3hfDRonaj/1AMkM6zZbC2Zuto4vqpex7abJEg==",
+			"dependencies": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-channel-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.2.2.tgz",
+			"integrity": "sha512-4ruoKxgZYYa+K8JJu8RMY0egKazS8xClbx70NQHa/rJ7JYFgN3OIEIBZtFoMcHR8Vg7MEsNE5/wV6o7WWJkVIA==",
+			"dependencies": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-common": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.2.2.tgz",
+			"integrity": "sha512-e1C35gdkFSzWyUUR1S8FvisXW3nT3p6wWsLNs+vUKLOTQzsvW3XpNMVtNCq4MfHWiYDuz1lPSzo2eENaij1fVA==",
+			"dependencies": {
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-core-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.2.tgz",
+			"integrity": "sha512-dF6LZ4ahdhoHufw+N7OXRDzWT8QN193Dvpd8GLqEZdR/KtCTofPSI63yumu+ZkzKYadf1S3w2xg0OmbdyXexoQ==",
+			"dependencies": {
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-dependencies-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-dependencies-js/-/applicationinsights-dependencies-js-3.2.2.tgz",
+			"integrity": "sha512-15EUVU6Kh0B400i/2YNy+V9xMhOwnpzAMTAiyFo90Q1SC5rJIsmzqjAWQnFmxAeq5YQoZ2FuQQpD2qsUajVEQQ==",
+			"dependencies": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-properties-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-properties-js/-/applicationinsights-properties-js-3.2.2.tgz",
+			"integrity": "sha512-ovT123foF4WquHdk6f51YpRacx7ZgST7iwqRA/jshy/7NVqlu05JbrVB8IlrxNausdaRwX5CvSCca+SQbOW0ZA==",
+			"dependencies": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-shims": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+			}
+		},
+		"node_modules/@microsoft/applicationinsights-web": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web/-/applicationinsights-web-3.2.2.tgz",
+			"integrity": "sha512-DBJ83Fe7nHzH7QgMKFQrBN/Gbhoo5JgMQkBzJeTb5hMfNZUFOBEHWjytBdU9MEZVpa+Vk+RPQ72IOc0txbnJYw==",
+			"dependencies": {
+				"@microsoft/applicationinsights-analytics-js": "3.2.2",
+				"@microsoft/applicationinsights-cfgsync-js": "3.2.2",
+				"@microsoft/applicationinsights-channel-js": "3.2.2",
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-dependencies-js": "3.2.2",
+				"@microsoft/applicationinsights-properties-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			},
+			"peerDependencies": {
+				"tslib": "*"
+			}
+		},
+		"node_modules/@microsoft/dynamicproto-js": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+			}
+		},
 		"node_modules/@ministryofjustice/frontend": {
 			"version": "1.8.1",
 			"resolved": "https://registry.npmjs.org/@ministryofjustice/frontend/-/frontend-1.8.1.tgz",
@@ -2370,6 +2514,19 @@
 				"jquery": "^3.6.0"
 			}
 		},
+		"node_modules/@nevware21/ts-async": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.1.tgz",
+			"integrity": "sha512-O2kN8n2HpDWJ7Oji+oTMnhITrCndmrNvrHbGDwAIBydx+FWvLE/vrw4QwnRRMvSCa2AJrcP59Ryklxv30KfkWQ==",
+			"dependencies": {
+				"@nevware21/ts-utils": ">= 0.11.2 < 2.x"
+			}
+		},
+		"node_modules/@nevware21/ts-utils": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.2.tgz",
+			"integrity": "sha512-80W8BkS09kkGuUHJX50Fqq+QqAslxUaOQytH+3JhRacXs1EpEt2JOOkYKytqFZAYir3SeH9fahniEaDzIBxlUw=="
+		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -17709,6 +17866,125 @@
 				"@jridgewell/sourcemap-codec": "1.4.14"
 			}
 		},
+		"@microsoft/applicationinsights-analytics-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-analytics-js/-/applicationinsights-analytics-js-3.2.2.tgz",
+			"integrity": "sha512-i6/7hYO7lFPE1rMARG6c4bGTuUJUiPb9GRfwMhzArpG39fqduCWpH6y2PdlwZzjyDQAxIOgBiSfLddgsAVoYOA==",
+			"requires": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			}
+		},
+		"@microsoft/applicationinsights-cfgsync-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-cfgsync-js/-/applicationinsights-cfgsync-js-3.2.2.tgz",
+			"integrity": "sha512-W4sQmQC9ZXN8ETYHcXQZl7kMACDkiC/a26OYx9IW8CzgZUI0U3hfDRonaj/1AMkM6zZbC2Zuto4vqpex7abJEg==",
+			"requires": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			}
+		},
+		"@microsoft/applicationinsights-channel-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.2.2.tgz",
+			"integrity": "sha512-4ruoKxgZYYa+K8JJu8RMY0egKazS8xClbx70NQHa/rJ7JYFgN3OIEIBZtFoMcHR8Vg7MEsNE5/wV6o7WWJkVIA==",
+			"requires": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			}
+		},
+		"@microsoft/applicationinsights-common": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.2.2.tgz",
+			"integrity": "sha512-e1C35gdkFSzWyUUR1S8FvisXW3nT3p6wWsLNs+vUKLOTQzsvW3XpNMVtNCq4MfHWiYDuz1lPSzo2eENaij1fVA==",
+			"requires": {
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			}
+		},
+		"@microsoft/applicationinsights-core-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.2.2.tgz",
+			"integrity": "sha512-dF6LZ4ahdhoHufw+N7OXRDzWT8QN193Dvpd8GLqEZdR/KtCTofPSI63yumu+ZkzKYadf1S3w2xg0OmbdyXexoQ==",
+			"requires": {
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			}
+		},
+		"@microsoft/applicationinsights-dependencies-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-dependencies-js/-/applicationinsights-dependencies-js-3.2.2.tgz",
+			"integrity": "sha512-15EUVU6Kh0B400i/2YNy+V9xMhOwnpzAMTAiyFo90Q1SC5rJIsmzqjAWQnFmxAeq5YQoZ2FuQQpD2qsUajVEQQ==",
+			"requires": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			}
+		},
+		"@microsoft/applicationinsights-properties-js": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-properties-js/-/applicationinsights-properties-js-3.2.2.tgz",
+			"integrity": "sha512-ovT123foF4WquHdk6f51YpRacx7ZgST7iwqRA/jshy/7NVqlu05JbrVB8IlrxNausdaRwX5CvSCca+SQbOW0ZA==",
+			"requires": {
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			}
+		},
+		"@microsoft/applicationinsights-shims": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
+			"integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+			"requires": {
+				"@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+			}
+		},
+		"@microsoft/applicationinsights-web": {
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web/-/applicationinsights-web-3.2.2.tgz",
+			"integrity": "sha512-DBJ83Fe7nHzH7QgMKFQrBN/Gbhoo5JgMQkBzJeTb5hMfNZUFOBEHWjytBdU9MEZVpa+Vk+RPQ72IOc0txbnJYw==",
+			"requires": {
+				"@microsoft/applicationinsights-analytics-js": "3.2.2",
+				"@microsoft/applicationinsights-cfgsync-js": "3.2.2",
+				"@microsoft/applicationinsights-channel-js": "3.2.2",
+				"@microsoft/applicationinsights-common": "3.2.2",
+				"@microsoft/applicationinsights-core-js": "3.2.2",
+				"@microsoft/applicationinsights-dependencies-js": "3.2.2",
+				"@microsoft/applicationinsights-properties-js": "3.2.2",
+				"@microsoft/applicationinsights-shims": "3.0.1",
+				"@microsoft/dynamicproto-js": "^2.0.3",
+				"@nevware21/ts-async": ">= 0.5.1 < 2.x",
+				"@nevware21/ts-utils": ">= 0.11.1 < 2.x"
+			}
+		},
+		"@microsoft/dynamicproto-js": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+			"integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+			"requires": {
+				"@nevware21/ts-utils": ">= 0.10.4 < 2.x"
+			}
+		},
 		"@ministryofjustice/frontend": {
 			"version": "1.8.1",
 			"resolved": "https://registry.npmjs.org/@ministryofjustice/frontend/-/frontend-1.8.1.tgz",
@@ -17718,6 +17994,19 @@
 				"moment": "^2.27.0"
 			}
 		},
+		"@nevware21/ts-async": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.1.tgz",
+			"integrity": "sha512-O2kN8n2HpDWJ7Oji+oTMnhITrCndmrNvrHbGDwAIBydx+FWvLE/vrw4QwnRRMvSCa2AJrcP59Ryklxv30KfkWQ==",
+			"requires": {
+				"@nevware21/ts-utils": ">= 0.11.2 < 2.x"
+			}
+		},
+		"@nevware21/ts-utils": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.2.tgz",
+			"integrity": "sha512-80W8BkS09kkGuUHJX50Fqq+QqAslxUaOQytH+3JhRacXs1EpEt2JOOkYKytqFZAYir3SeH9fahniEaDzIBxlUw=="
+		},
 		"@nodelib/fs.scandir": {
 			"version": "2.1.5",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/package.json b/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/package.json
index ada6dc7a5..8c8dfb3cf 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/package.json
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/package.json
@@ -2,7 +2,8 @@
 	"scripts": {
 		"build": "npm run build:assets & npm run build:frontend",
 		"build:frontend": "webpack",
-		"build:assets": "webpack --config webpack.assets.config.js",
+		"build:assets": "webpack --config webpack.assets.config.js & npm run build:assets:application-insights",
+		"build:assets:application-insights": "webpack --config webpack.appinsights.config.js",
 		"build:watch": "webpack --watch"
 	},
 	"devDependencies": {
@@ -17,6 +18,7 @@
 		"webpack-cli": "^4.10.0"
 	},
 	"dependencies": {
+		"@microsoft/applicationinsights-web": "^3.2.2",
 		"@ministryofjustice/frontend": "^1.8.1",
 		"accessible-autocomplete": "^2.0.4",
 		"dfe-frontend-alpha": "^1.0.1",
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/src/application-insights.js b/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/src/application-insights.js
new file mode 100644
index 000000000..a786f777d
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/src/application-insights.js
@@ -0,0 +1,16 @@
+// App Insights frontend
+import { ApplicationInsights } from '@microsoft/applicationinsights-web'
+
+const clickPluginInstance = new Microsoft.ApplicationInsights.ClickAnalyticsPlugin();
+const appInsights = new ApplicationInsights({ config: {
+   connectionString: window.appInsights.connectionString,
+   extensions: [ clickPluginInstance ],
+   extensionConfig: { [clickPluginInstance.identifier] : {
+      autoCapture : true,
+      dataTags: { useDefaultContentNameOrId: true }
+   } },
+} });
+
+appInsights.loadAppInsights();
+appInsights.setAuthenticatedUserContext(window.appInsights.authenticatedUserId, null, true);
+appInsights.trackPageView();
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/webpack.appinsights.config.js b/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/webpack.appinsights.config.js
new file mode 100644
index 000000000..d872596f9
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/wwwroot/webpack.appinsights.config.js
@@ -0,0 +1,9 @@
+const path = require('path');
+
+module.exports = {
+   entry: ['./src/application-insights.js', './node_modules/@microsoft/applicationinsights-web/dist/es5/applicationinsights-web.min.js'],
+   output: {
+      path: path.resolve(__dirname, 'dist'),
+      filename: 'application-insights.min.js',
+   }
+};

From ad2f97cbb495fae36d77c57205e7b690dafa31ba Mon Sep 17 00:00:00 2001
From: Ash Davies <3853061+DrizzlyOwl@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:13:17 +0100
Subject: [PATCH 23/23] Annotate App Insights for each deployment release
 (#1089)

---
 .github/workflows/build-and-push-image.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index d330ffd9c..73d659fab 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -44,6 +44,7 @@ jobs:
       docker-image-name: 'a2bint-app'
       docker-build-file-name: './Dockerfile'
       environment: ${{ needs.set-env.outputs.environment }}
+      annotate-release: ${{ needs.set-env.outputs.environment == 'dev' }}
     secrets:
       azure-acr-credentials: ${{ secrets.ACR_CREDENTIALS }}
       azure-acr-name: ${{ secrets.ACR_NAME }}