From 7e3577f81d44989b41333614026ff928da7fafde Mon Sep 17 00:00:00 2001
From: Jack Marshall <jack.marshall@nimbleapproach.com>
Date: Fri, 14 Feb 2025 15:52:34 +0000
Subject: [PATCH 1/3] Fixed finance plan caching issue, added errors to num
 inputs and corrected error messages

---
 .../PupilNumbers/EditCapacityWhenFull.cshtml  | 12 +++---
 .../EditPost16PublishedAdmissionNumber.cshtml |  4 +-
 .../EditPre16PublishedAdmissionNumber.cshtml  |  8 ++--
 .../EditRecruitmentAndViability.cshtml        |  9 ----
 .../_CapacityBuildupRowInput.cshtml           |  8 ----
 .../FinancePlan/EditFinancePlanTask.cshtml.cs | 43 ++++++++++++++++---
 .../FinancePlan/EditUnderwrittenPlaces.cshtml | 24 +++++++++--
 .../EditUnderwrittenPlaces.cshtml.cs          | 30 ++++++-------
 .../FinancePlan/ViewFinancePlanTask.cshtml    |  7 ++-
 .../Pages/Shared/_NumberInputCell.cshtml      | 18 +++++---
 .../ViewModels/ProjectStatusViewModel.cs      |  3 +-
 11 files changed, 100 insertions(+), 66 deletions(-)

diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditCapacityWhenFull.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditCapacityWhenFull.cshtml
index dbb8f3273..77103552d 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditCapacityWhenFull.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditCapacityWhenFull.cshtml
@@ -37,20 +37,20 @@
                 <tr class="govuk-table__row">
                     <td class="govuk-table__cell">Reception to year 6</td>
                     <td class="govuk-table__cell">
-                        <govuk-number-input-cell id="reception-to-year6" name="reception-to-year6" asp-for="@Model.ReceptionToYear6" label="Reception to year 6" />
+                        <govuk-number-input-cell id="reception-to-year6" name="reception-to-year6" asp-for="@Model.ReceptionToYear6" />
                     </td>
                 </tr>
                 <tr class="govuk-table__row">
                     <td class="govuk-table__cell">Year 7 to year 11</td>
                     <td class="govuk-table__cell">
-                        <govuk-number-input-cell id="year7-to-year11" name="year7-to-year11" asp-for="@Model.Year7ToYear11" label="Year 7 to year 11" />
+                        <govuk-number-input-cell id="year7-to-year11" name="year7-to-year11" asp-for="@Model.Year7ToYear11" />
 
                     </td>
                 </tr>
                 <tr class="govuk-table__row">
                     <td class="govuk-table__cell">Year 12 to year 14</td>
                     <td class="govuk-table__cell">
-                        <govuk-number-input-cell id="year12-to-year14" name="year12-to-year14" asp-for="@Model.Year12ToYear14" label="Year 12 to year 14" />
+                        <govuk-number-input-cell id="year12-to-year14" name="year12-to-year14" asp-for="@Model.Year12ToYear14" />
 
                     </td>
                 </tr>
@@ -70,20 +70,20 @@
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Nursery</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="nursery" name="nursery" asp-for="@Model.Nursery" label="Nursery" />
+                            <govuk-number-input-cell id="nursery" name="nursery" asp-for="@Model.Nursery" />
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Special educational needs (specialist resource provision)</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="special-education-needs" name="special-education-needs" asp-for="@Model.SpecialEducationNeeds" label="Special educational needs" />
+                            <govuk-number-input-cell id="special-education-needs" name="special-education-needs" asp-for="@Model.SpecialEducationNeeds" />
 
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Alternative provision (specialist resource provision)</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="alternative-provision" name="alternative-provision" asp-for="@Model.AlternativeProvision" label="Alternative provision" />
+                            <govuk-number-input-cell id="alternative-provision" name="alternative-provision" asp-for="@Model.AlternativeProvision" />
 
                         </td>
                     </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPost16PublishedAdmissionNumber.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPost16PublishedAdmissionNumber.cshtml
index 06da480fb..ff0f333c9 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPost16PublishedAdmissionNumber.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPost16PublishedAdmissionNumber.cshtml
@@ -38,13 +38,13 @@
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Year 12</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="year12" name="year12" asp-for="@Model.Year12" label="Year 12" />
+                            <govuk-number-input-cell id="year12" name="year12" asp-for="@Model.Year12" />
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Other post-16</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="other-post16" name="other-post16" asp-for="@Model.OtherPost16" label="Other post-16" />
+                            <govuk-number-input-cell id="other-post16" name="other-post16" asp-for="@Model.OtherPost16" />
 
                         </td>
                     </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPre16PublishedAdmissionNumber.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPre16PublishedAdmissionNumber.cshtml
index d389761cf..e864b1d7d 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPre16PublishedAdmissionNumber.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPre16PublishedAdmissionNumber.cshtml
@@ -38,27 +38,27 @@
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Reception</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="reception" name="reception" asp-for="@Model.Reception" label="Reception" />
+                            <govuk-number-input-cell id="reception" name="reception" asp-for="@Model.Reception" />
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Year 7</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="year7" name="year7" asp-for="@Model.Year7" label="Year 7" />
+                            <govuk-number-input-cell id="year7" name="year7" asp-for="@Model.Year7" />
 
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Year 10</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="year10" name="year10" asp-for="@Model.Year10" label="Year 10" />
+                            <govuk-number-input-cell id="year10" name="year10" asp-for="@Model.Year10" />
 
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Other pre-16</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="other-pre16" name="other-pre16" asp-for="@Model.OtherPre16" label="Other pre-16" />
+                            <govuk-number-input-cell id="other-pre16" name="other-pre16" asp-for="@Model.OtherPre16" />
 
                         </td>
                     </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditRecruitmentAndViability.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditRecruitmentAndViability.cshtml
index 8e38bbda8..3700ee49c 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditRecruitmentAndViability.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditRecruitmentAndViability.cshtml
@@ -40,17 +40,14 @@
                         <td class="govuk-table__cell">Reception to year 6</td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.ReceptionToYear6.MinimumViableNumber"
-                                                     label="Reception to year 6 minimum viable number"
                                                      test-id="reception-to-year6-mvn" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.ReceptionToYear6.ApplicationsReceived"
-                                                     label="Reception to year 6 applications received"
                                                      test-id="reception-to-year6-applications-received" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.ReceptionToYear6.AcceptedOffers"
-                            label="Reception to year 6 accepted offers"
                             test-id="reception-to-year6-accepted-offers" />
                         </td>
                     </tr>
@@ -58,17 +55,14 @@
                         <td class="govuk-table__cell">Year 7 to year 11</td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year7ToYear11.MinimumViableNumber"
-                                                     label="Year 7 to year 11 minimum viable number"
                                                      test-id="year7-to-year11-mvn" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year7ToYear11.ApplicationsReceived"
-                                                     label="Year 7 to year 11 applications received"
                                                      test-id="year7-to-year11-applications-received" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year7ToYear11.AcceptedOffers"
-                            label="Year 7 to year 11 accepted offers"
                             test-id="year7-to-year11-accepted-offers" />
                         </td>
                     </tr>
@@ -76,17 +70,14 @@
                         <td class="govuk-table__cell">Year 12 to year 14</td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year12ToYear14.MinimumViableNumber"
-                                                     label="Year 12 to year 14 minimum viable number"
                                                      test-id="year12-to-year14-mvn" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year12ToYear14.ApplicationsReceived"
-                                                     label="Year 12 to year 14 applications received"
                                                      test-id="year12-to-year14-applications-received" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year12ToYear14.AcceptedOffers"
-                            label="Year 12 to year 14 accepted offers"
                             test-id="year12-to-year14-accepted-offers" />
                         </td>
                     </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/_CapacityBuildupRowInput.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/_CapacityBuildupRowInput.cshtml
index bf89f9f72..101e28b6c 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/_CapacityBuildupRowInput.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/_CapacityBuildupRowInput.cshtml
@@ -10,35 +10,30 @@
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.CurrentCapacity"
                                  id="@idPrefix-current-capacity-field"
                                  name="@idPrefix-current-capacity-field"
-                                 label="@Model.SchoolYear capacity buildup current capacity"
                                  test-id="@idPrefix-current-capacity-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.FirstYear"
                                  id="@idPrefix-first-year-field"
                                  name="@idPrefix-first-year-field"
-                                 label="@Model.SchoolYear capacity buildup first year"
                                  test-id="@idPrefix-first-year-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.SecondYear"
                                  id="@idPrefix-second-year-field"
                                  name="@idPrefix-second-year-field"
-                                 label="@Model.SchoolYear capacity buildup second year"
                                  test-id="@idPrefix-second-year-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.ThirdYear"
                                  id="@idPrefix-third-year-field"
                                  name="@idPrefix-third-year-field"
-                                 label="@Model.SchoolYear capacity buildup third year"
                                  test-id="@idPrefix-third-year-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.FourthYear"
                                  id="@idPrefix-fourth-year-field"
                                  name="@idPrefix-fourth-year-field"
-                                 label="@Model.SchoolYear capacity buildup fourth year"
                                  test-id="@idPrefix-fourth-year-field" />
     </td>
 
@@ -46,7 +41,6 @@
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.FifthYear"
                                  id="@idPrefix-fifth-year-field"
                                  name="@idPrefix-fifth-year-field"
-                                 label="@Model.SchoolYear capacity buildup fifth year"
                                  test-id="@idPrefix-fifth-year-field" />
     </td>
 
@@ -54,14 +48,12 @@
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.SixthYear"
                                  id="@idPrefix-sixth-year-field"
                                  name="@idPrefix-sixth-year-field"
-                                 label="@Model.SchoolYear capacity buildup sixth year"
                                  test-id="@idPrefix-sixth-year-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.SeventhYear"
                                  id="@idPrefix-seventh-year-field"
                                  name="@idPrefix-seventh-year-field"
-                                 label="@Model.SchoolYear capacity buildup seventh year"
                                  test-id="@idPrefix-seventh-year-field" />
     </td>
 </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditFinancePlanTask.cshtml.cs b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditFinancePlanTask.cshtml.cs
index 787e15c7c..0eb825b79 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditFinancePlanTask.cshtml.cs
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditFinancePlanTask.cshtml.cs
@@ -15,6 +15,8 @@
 using System.ComponentModel;
 using System.Linq;
 using Dfe.ManageFreeSchoolProjects.Services.Tasks;
+using Dfe.ManageFreeSchoolProjects.ViewModels;
+using Microsoft.AspNetCore.Http;
 
 
 namespace Dfe.ManageFreeSchoolProjects.Pages.Project.Tasks.FinancePlan
@@ -25,6 +27,7 @@ public class EditFinancePlanTaskModel : PageModel
         private readonly IUpdateProjectByTaskService _updateProjectTaskService;
         private readonly IUpdateFinancePlanCache _updateFinancePlanCache;
         private readonly ILogger<EditFinancePlanTaskModel> _logger;
+        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly ErrorService _errorService;
 
         [BindProperty(SupportsGet = true, Name = "projectId")]
@@ -70,12 +73,14 @@ public EditFinancePlanTaskModel(
             IUpdateProjectByTaskService updateProjectTaskService,
             IUpdateFinancePlanCache updateFinancePlanCache,
             ILogger<EditFinancePlanTaskModel> logger,
+            IHttpContextAccessor httpContextAccessor,
             ErrorService errorService)
         {
             _getProjectService = getProjectService;
             _updateProjectTaskService = updateProjectTaskService;
             _updateFinancePlanCache = updateFinancePlanCache;
             _logger = logger;
+            _httpContextAccessor = httpContextAccessor;
             _errorService = errorService;
         }
 
@@ -165,15 +170,39 @@ private async Task LoadProject()
         {
             var project = await _getProjectService.Execute(ProjectId, TaskName.FinancePlan);
 
-            FinancePlanAgreed = project.FinancePlan.FinancePlanAgreed == YesNo.Yes;
-            DateAgreed = project.FinancePlan.DateAgreed;
-            PlanSavedInWorkplacesFolder = project.FinancePlan.PlanSavedInWorkplacesFolder == YesNo.Yes;
-            LocalAuthorityAgreedToPupilNumbers = project.FinancePlan.LocalAuthorityAgreedPupilNumbers?.ToString();
-            TrustOptIntoRpa = project.FinancePlan.TrustWillOptIntoRpa?.ToString();
-            RpaStartDate = project.FinancePlan.RpaStartDate;
-            RpaCoverType = project.FinancePlan.RpaCoverType;
+            var referrerQuery = _httpContextAccessor.HttpContext.Request.Query["referrer"];
+
+            var isReferred = Enum.TryParse(referrerQuery, out Referrer referrer);
+
+
+            if (isReferred && referrer == Referrer.EditUnderwrittenPlaces)
+            {
+                var existingCacheItem = _updateFinancePlanCache.Get();
+
+                FinancePlanAgreed = existingCacheItem.FinancePlan.FinancePlanAgreed == YesNo.Yes;
+                DateAgreed = existingCacheItem.FinancePlan.DateAgreed;
+                PlanSavedInWorkplacesFolder = existingCacheItem.FinancePlan.PlanSavedInWorkplacesFolder == YesNo.Yes;
+                LocalAuthorityAgreedToPupilNumbers = existingCacheItem.FinancePlan.LocalAuthorityAgreedPupilNumbers?.ToString();
+                TrustOptIntoRpa = existingCacheItem.FinancePlan.TrustWillOptIntoRpa?.ToString();
+                RpaStartDate = existingCacheItem.FinancePlan.RpaStartDate;
+                RpaCoverType = existingCacheItem.FinancePlan.RpaCoverType;
+
+            }
+
+            else
+            {
+                FinancePlanAgreed = project.FinancePlan.FinancePlanAgreed == YesNo.Yes;
+                DateAgreed = project.FinancePlan.DateAgreed;
+                PlanSavedInWorkplacesFolder = project.FinancePlan.PlanSavedInWorkplacesFolder == YesNo.Yes;
+                LocalAuthorityAgreedToPupilNumbers = project.FinancePlan.LocalAuthorityAgreedPupilNumbers?.ToString();
+                TrustOptIntoRpa = project.FinancePlan.TrustWillOptIntoRpa?.ToString();
+                RpaStartDate = project.FinancePlan.RpaStartDate;
+                RpaCoverType = project.FinancePlan.RpaCoverType;
+            }
 
             SchoolName = project.SchoolName;
+
+
         }
 
         private static YesNoNotApplicable? ConvertYesNoNotApplicable(string value)
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml
index 94af855d2..a25436771 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml
@@ -6,7 +6,7 @@
 @{
     ViewData["Title"] = $"Local authority underwriting pupil numbers - {Model.SchoolName}";
 
-    var backlink = string.Format(RouteConstants.EditFinancePlanTask, Model.ProjectId);
+    var backlink = string.Format(RouteConstants.EditFinancePlanTask, Model.ProjectId) + "?referrer=" + Referrer.EditUnderwrittenPlaces;
 
 }
 @section BeforeMain {
@@ -28,7 +28,9 @@
             School phase
         </dt>
         <dd class="govuk-summary-list__value">
-            @Model.SchoolPhase.ToDescription()
+            @{
+                RenderValue(Model.SchoolPhase.ToDescription());
+            }
         </dd>
     </div>
 </govuk-summary-list>
@@ -126,4 +128,20 @@
         </form>
 
     </div>
-</div>
\ No newline at end of file
+</div>
+
+@functions {
+
+    public void RenderValue(string value)
+    {
+        if (string.IsNullOrEmpty(value) || value == "NotSet")
+        {
+            <span class="empty">Empty</span>
+        }
+        else
+        {
+            @value
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs
index e9c81574b..2ad0e3ef0 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs
@@ -34,77 +34,77 @@ public class EditUnderwrittenPlacesModel : PageModel
         public FinancePlanTask FinancePlan { get; set; }
 
         [BindProperty(Name = "primary-year-1-places")]
-        [DisplayName("Primary Year 1 Places")]
+        [DisplayName("Primary places in first year of opening")]
         [ValidNumber(0,9999)]
         public string PrimaryYear1Places { get; set; }
 
         [BindProperty(Name = "primary-year-2-places")]
-        [DisplayName("Primary Year 2 Places")]
+        [DisplayName("Primary places in second year of opening")]
         [ValidNumber(0, 9999)]
         public string PrimaryYear2Places { get; set; }
 
         [BindProperty(Name = "primary-year-3-places")]
-        [DisplayName("Primary Year 3 Places")]
+        [DisplayName("Primary places in third year of opening")]
         [ValidNumber(0, 9999)]
         public string PrimaryYear3Places { get; set; }
 
         [BindProperty(Name = "primary-year-4-places")]
-        [DisplayName("Primary Year 4 Places")]
+        [DisplayName("Primary places in fourth year of opening")]
         [ValidNumber(0, 9999)]
         public string PrimaryYear4Places { get; set; }
 
         [BindProperty(Name = "primary-year-5-places")]
-        [DisplayName("Primary Year 5 Places")]
+        [DisplayName("Primary places in fifth year of opening")]
         [ValidNumber(0, 9999)]
         public string PrimaryYear5Places { get; set; }
 
         [BindProperty(Name = "primary-year-6-places")]
-        [DisplayName("Primary Year 6 Places")]
+        [DisplayName("Primary places in sixth year of opening")]
         [ValidNumber(0, 9999)]
         public string PrimaryYear6Places { get; set; }
 
         [BindProperty(Name = "primary-year-7-places")]
-        [DisplayName("Primary Year 7 Places")]
+        [DisplayName("Primary places in seventh year of opening")]
         [ValidNumber(0, 9999)]
         public string PrimaryYear7Places { get; set; }
 
         [BindProperty(Name = "secondary-year-1-places")]
-        [DisplayName("Secondary Year 1 Places")]
+        [DisplayName("Secondary places in first year of opening")]
         [ValidNumber(0, 9999)]
         public string SecondaryYear1Places { get; set; }
 
         [BindProperty(Name = "secondary-year-2-places")]
-        [DisplayName("Secondary Year 2 Places")]
+        [DisplayName("Secondary places in second year of opening")]
         [ValidNumber(0, 9999)]
         public string SecondaryYear2Places { get; set; }
 
         [BindProperty(Name = "secondary-year-3-places")]
-        [DisplayName("Secondary Year 3 Places")]
+        [DisplayName("Secondary places in third year of opening")]
         [ValidNumber(0, 9999)]
         public string SecondaryYear3Places { get; set; }
 
         [BindProperty(Name = "secondary-year-4-places")]
-        [DisplayName("Secondary Year 4 Places")]
+        [DisplayName("Secondary places in fourth year of opening")]
         [ValidNumber(0, 9999)]
         public string SecondaryYear4Places { get; set; }
 
         [BindProperty(Name = "secondary-year-5-places")]
-        [DisplayName("Secondary Year 5 Places")]
+        [DisplayName("Secondary places in fifth year of opening")]
         [ValidNumber(0, 9999)]
         public string SecondaryYear5Places { get; set; }
 
         [BindProperty(Name = "sixteen-to-nineteen-year-1-places")]
-        [DisplayName("16 to 19 Year 1 Places")]
+        [DisplayName("16 to 19 places in first year of opening")]
         [ValidNumber(0, 9999)]
         public string SixteenToNineteenYear1Places { get; set; }
 
         [BindProperty(Name = "sixteen-to-nineteen-year-2-places")]
-        [DisplayName("16 to 19 Year 2 Places")]
+        [DisplayName("16 to 19 places in second year of opening")]
         [ValidNumber(0, 9999)]
         public string SixteenToNineteenYear2Places { get; set; }
 
         [BindProperty(Name = "sixteen-to-nineteen-year-3-places")]
-        [DisplayName("16 to 19 Year 3 Places")]
+        [DisplayName("16 to 19 places in third year of opening")]
         [ValidNumber(0, 9999)]
         public string SixteenToNineteenYear3Places { get; set; }
 
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/ViewFinancePlanTask.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/ViewFinancePlanTask.cshtml
index 7ec57659f..49d8e7ccb 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/ViewFinancePlanTask.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/ViewFinancePlanTask.cshtml
@@ -167,8 +167,7 @@
                         Comments about underwritten places
                     </dt>
                     <dd class="govuk-summary-list__value">
-                        <div class="govuk-body dfe-text-area-display">@{RenderValue(@financePlan.CommentsAboutUnderwrittenPlaces);}
-                        </div>
+                        @{RenderComments(@financePlan.CommentsAboutUnderwrittenPlaces);}
                     </dd>
                     <dd class="govuk-summary-list__actions">
                         <a class="govuk-link" href="@editlink">Change<span class="govuk-visually-hidden"> comments about underwritten places</span></a>
@@ -198,7 +197,7 @@
 
 @functions {
 
-    public void RenderValue(string value)
+    public void RenderComments(string value)
     {
         if (string.IsNullOrEmpty(value) || value == "NotSet")
         {
@@ -206,7 +205,7 @@
         }
         else
         {
-            @value
+            <div class="govuk-body dfe-text-area-display">@value</div>
         }
     }
 
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_NumberInputCell.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_NumberInputCell.cshtml
index f3dbcf1a4..4ec50a007 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_NumberInputCell.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_NumberInputCell.cshtml
@@ -5,13 +5,17 @@
     var showSuffix = !string.IsNullOrWhiteSpace(Model.Suffix);
     var showLabel = !string.IsNullOrWhiteSpace(Model.Label);
 }
-@{
-    if (showLabel)
+<div class="govuk-form-group @(showError ? "govuk-form-group--error" : "")">
+    @if (showLabel)
     {
-        <div class="govuk-heading-s">@Model.Label</div>
+    <div class="govuk-heading-s">@Model.Label</div>
+    }
+    @if (showError)
+    {
+        <span id="@Model.Id-error" class="govuk-error-message">
+            <span class="govuk-visually-hidden">Error:</span> @Model.ErrorMessage
+        </span>
     }
-}
-<div class="govuk-form-group @(showError ? "govuk-form-group--error" : "")">
     @{
         if (showSuffix)
         {
@@ -21,7 +25,7 @@
                        name="@Model.Name"
                        type="text"
                        value="@Model.Value"
-                       aria-label="@Model.Label"
+                       aria-label="@Model.Name"
                        data-testid="@Model.TestId" />
                 <div class="govuk-input__suffix" aria-hidden="true">@Model.Suffix</div>
             </div>
@@ -33,7 +37,7 @@
                    name="@Model.Name"
                    type="text"
                    value="@Model.Value"
-                   aria-label="@Model.Label"
+                   aria-label="@Model.Name"
                    data-testid="@Model.TestId" />
         }
     }
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/ViewModels/ProjectStatusViewModel.cs b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/ViewModels/ProjectStatusViewModel.cs
index 843524250..90e1be3df 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/ViewModels/ProjectStatusViewModel.cs
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/ViewModels/ProjectStatusViewModel.cs
@@ -16,5 +16,6 @@ public enum Referrer
 {
     ProjectOverview = 0,
     TaskList = 1,
-    ContactsOverview
+    ContactsOverview = 2,
+    EditUnderwrittenPlaces = 3,
 }
\ No newline at end of file

From 97622bd65411801b207126bca124518097d83172 Mon Sep 17 00:00:00 2001
From: Jack Marshall <jack.marshall@nimbleapproach.com>
Date: Fri, 14 Feb 2025 16:21:41 +0000
Subject: [PATCH 2/3] Added labels back to num input and creating new show
 label property so aria labels are still readable

---
 .../PupilNumbers/EditCapacityWhenFull.cshtml  | 12 ++--
 .../EditPost16PublishedAdmissionNumber.cshtml |  4 +-
 .../EditPre16PublishedAdmissionNumber.cshtml  |  8 +--
 .../EditRecruitmentAndViability.cshtml        |  9 +++
 .../_CapacityBuildupRowInput.cshtml           |  8 +++
 .../FinancePlan/EditUnderwrittenPlaces.cshtml | 60 +++++++++----------
 .../Pages/Shared/_NumberInputCell.cshtml      |  7 +--
 .../TagHelpers/NumberInputCellTagHelper.cs    |  9 ++-
 8 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditCapacityWhenFull.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditCapacityWhenFull.cshtml
index 77103552d..dbb8f3273 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditCapacityWhenFull.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditCapacityWhenFull.cshtml
@@ -37,20 +37,20 @@
                 <tr class="govuk-table__row">
                     <td class="govuk-table__cell">Reception to year 6</td>
                     <td class="govuk-table__cell">
-                        <govuk-number-input-cell id="reception-to-year6" name="reception-to-year6" asp-for="@Model.ReceptionToYear6" />
+                        <govuk-number-input-cell id="reception-to-year6" name="reception-to-year6" asp-for="@Model.ReceptionToYear6" label="Reception to year 6" />
                     </td>
                 </tr>
                 <tr class="govuk-table__row">
                     <td class="govuk-table__cell">Year 7 to year 11</td>
                     <td class="govuk-table__cell">
-                        <govuk-number-input-cell id="year7-to-year11" name="year7-to-year11" asp-for="@Model.Year7ToYear11" />
+                        <govuk-number-input-cell id="year7-to-year11" name="year7-to-year11" asp-for="@Model.Year7ToYear11" label="Year 7 to year 11" />
 
                     </td>
                 </tr>
                 <tr class="govuk-table__row">
                     <td class="govuk-table__cell">Year 12 to year 14</td>
                     <td class="govuk-table__cell">
-                        <govuk-number-input-cell id="year12-to-year14" name="year12-to-year14" asp-for="@Model.Year12ToYear14" />
+                        <govuk-number-input-cell id="year12-to-year14" name="year12-to-year14" asp-for="@Model.Year12ToYear14" label="Year 12 to year 14" />
 
                     </td>
                 </tr>
@@ -70,20 +70,20 @@
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Nursery</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="nursery" name="nursery" asp-for="@Model.Nursery" />
+                            <govuk-number-input-cell id="nursery" name="nursery" asp-for="@Model.Nursery" label="Nursery" />
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Special educational needs (specialist resource provision)</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="special-education-needs" name="special-education-needs" asp-for="@Model.SpecialEducationNeeds" />
+                            <govuk-number-input-cell id="special-education-needs" name="special-education-needs" asp-for="@Model.SpecialEducationNeeds" label="Special educational needs" />
 
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Alternative provision (specialist resource provision)</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="alternative-provision" name="alternative-provision" asp-for="@Model.AlternativeProvision" />
+                            <govuk-number-input-cell id="alternative-provision" name="alternative-provision" asp-for="@Model.AlternativeProvision" label="Alternative provision" />
 
                         </td>
                     </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPost16PublishedAdmissionNumber.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPost16PublishedAdmissionNumber.cshtml
index ff0f333c9..06da480fb 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPost16PublishedAdmissionNumber.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPost16PublishedAdmissionNumber.cshtml
@@ -38,13 +38,13 @@
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Year 12</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="year12" name="year12" asp-for="@Model.Year12" />
+                            <govuk-number-input-cell id="year12" name="year12" asp-for="@Model.Year12" label="Year 12" />
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Other post-16</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="other-post16" name="other-post16" asp-for="@Model.OtherPost16" />
+                            <govuk-number-input-cell id="other-post16" name="other-post16" asp-for="@Model.OtherPost16" label="Other post-16" />
 
                         </td>
                     </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPre16PublishedAdmissionNumber.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPre16PublishedAdmissionNumber.cshtml
index e864b1d7d..d389761cf 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPre16PublishedAdmissionNumber.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditPre16PublishedAdmissionNumber.cshtml
@@ -38,27 +38,27 @@
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Reception</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="reception" name="reception" asp-for="@Model.Reception" />
+                            <govuk-number-input-cell id="reception" name="reception" asp-for="@Model.Reception" label="Reception" />
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Year 7</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="year7" name="year7" asp-for="@Model.Year7" />
+                            <govuk-number-input-cell id="year7" name="year7" asp-for="@Model.Year7" label="Year 7" />
 
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Year 10</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="year10" name="year10" asp-for="@Model.Year10" />
+                            <govuk-number-input-cell id="year10" name="year10" asp-for="@Model.Year10" label="Year 10" />
 
                         </td>
                     </tr>
                     <tr class="govuk-table__row">
                         <td class="govuk-table__cell">Other pre-16</td>
                         <td class="govuk-table__cell">
-                            <govuk-number-input-cell id="other-pre16" name="other-pre16" asp-for="@Model.OtherPre16" />
+                            <govuk-number-input-cell id="other-pre16" name="other-pre16" asp-for="@Model.OtherPre16" label="Other pre-16" />
 
                         </td>
                     </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditRecruitmentAndViability.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditRecruitmentAndViability.cshtml
index 3700ee49c..8e38bbda8 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditRecruitmentAndViability.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/EditRecruitmentAndViability.cshtml
@@ -40,14 +40,17 @@
                         <td class="govuk-table__cell">Reception to year 6</td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.ReceptionToYear6.MinimumViableNumber"
+                                                     label="Reception to year 6 minimum viable number"
                                                      test-id="reception-to-year6-mvn" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.ReceptionToYear6.ApplicationsReceived"
+                                                     label="Reception to year 6 applications received"
                                                      test-id="reception-to-year6-applications-received" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.ReceptionToYear6.AcceptedOffers"
+                            label="Reception to year 6 accepted offers"
                             test-id="reception-to-year6-accepted-offers" />
                         </td>
                     </tr>
@@ -55,14 +58,17 @@
                         <td class="govuk-table__cell">Year 7 to year 11</td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year7ToYear11.MinimumViableNumber"
+                                                     label="Year 7 to year 11 minimum viable number"
                                                      test-id="year7-to-year11-mvn" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year7ToYear11.ApplicationsReceived"
+                                                     label="Year 7 to year 11 applications received"
                                                      test-id="year7-to-year11-applications-received" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year7ToYear11.AcceptedOffers"
+                            label="Year 7 to year 11 accepted offers"
                             test-id="year7-to-year11-accepted-offers" />
                         </td>
                     </tr>
@@ -70,14 +76,17 @@
                         <td class="govuk-table__cell">Year 12 to year 14</td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year12ToYear14.MinimumViableNumber"
+                                                     label="Year 12 to year 14 minimum viable number"
                                                      test-id="year12-to-year14-mvn" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year12ToYear14.ApplicationsReceived"
+                                                     label="Year 12 to year 14 applications received"
                                                      test-id="year12-to-year14-applications-received" />
                         </td>
                         <td class="govuk-table__cell">
                             <govuk-number-input-cell asp-for="@Model.Year12ToYear14.AcceptedOffers"
+                            label="Year 12 to year 14 accepted offers"
                             test-id="year12-to-year14-accepted-offers" />
                         </td>
                     </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/_CapacityBuildupRowInput.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/_CapacityBuildupRowInput.cshtml
index 101e28b6c..bf89f9f72 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/_CapacityBuildupRowInput.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/PupilNumbers/_CapacityBuildupRowInput.cshtml
@@ -10,30 +10,35 @@
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.CurrentCapacity"
                                  id="@idPrefix-current-capacity-field"
                                  name="@idPrefix-current-capacity-field"
+                                 label="@Model.SchoolYear capacity buildup current capacity"
                                  test-id="@idPrefix-current-capacity-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.FirstYear"
                                  id="@idPrefix-first-year-field"
                                  name="@idPrefix-first-year-field"
+                                 label="@Model.SchoolYear capacity buildup first year"
                                  test-id="@idPrefix-first-year-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.SecondYear"
                                  id="@idPrefix-second-year-field"
                                  name="@idPrefix-second-year-field"
+                                 label="@Model.SchoolYear capacity buildup second year"
                                  test-id="@idPrefix-second-year-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.ThirdYear"
                                  id="@idPrefix-third-year-field"
                                  name="@idPrefix-third-year-field"
+                                 label="@Model.SchoolYear capacity buildup third year"
                                  test-id="@idPrefix-third-year-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.FourthYear"
                                  id="@idPrefix-fourth-year-field"
                                  name="@idPrefix-fourth-year-field"
+                                 label="@Model.SchoolYear capacity buildup fourth year"
                                  test-id="@idPrefix-fourth-year-field" />
     </td>
 
@@ -41,6 +46,7 @@
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.FifthYear"
                                  id="@idPrefix-fifth-year-field"
                                  name="@idPrefix-fifth-year-field"
+                                 label="@Model.SchoolYear capacity buildup fifth year"
                                  test-id="@idPrefix-fifth-year-field" />
     </td>
 
@@ -48,12 +54,14 @@
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.SixthYear"
                                  id="@idPrefix-sixth-year-field"
                                  name="@idPrefix-sixth-year-field"
+                                 label="@Model.SchoolYear capacity buildup sixth year"
                                  test-id="@idPrefix-sixth-year-field" />
     </td>
     <td class="govuk-table__cell">
         <govuk-number-input-cell asp-for="@Model.CapacityBuildupRow.SeventhYear"
                                  id="@idPrefix-seventh-year-field"
                                  name="@idPrefix-seventh-year-field"
+                                 label="@Model.SchoolYear capacity buildup seventh year"
                                  test-id="@idPrefix-seventh-year-field" />
     </td>
 </tr>
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml
index a25436771..a0f96561a 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml
@@ -47,13 +47,13 @@
                     <h1 class="govuk-heading-l" data-testid="title">
                         Provide the total number of underwritten places
                     </h1>
-                    <govuk-number-input-cell id="primary-year-1-places" name="primary-year-1-places" asp-for="@Model.PrimaryYear1Places" label="First year of opening" suffix="places" />
-                    <govuk-number-input-cell id="primary-year-2-places" name="primary-year-2-places" asp-for="@Model.PrimaryYear2Places" label="Second year of opening" suffix="places" />
-                    <govuk-number-input-cell id="primary-year-3-places" name="primary-year-3-places" asp-for="@Model.PrimaryYear3Places" label="Third year of opening" suffix="places" />
-                    <govuk-number-input-cell id="primary-year-4-places" name="primary-year-4-places" asp-for="@Model.PrimaryYear4Places" label="Fourth year of opening" suffix="places" />
-                    <govuk-number-input-cell id="primary-year-5-places" name="primary-year-5-places" asp-for="@Model.PrimaryYear5Places" label="Fifth year of opening" suffix="places" />
-                    <govuk-number-input-cell id="primary-year-6-places" name="primary-year-6-places" asp-for="@Model.PrimaryYear6Places" label="Sixth year of opening" suffix="places" />
-                    <govuk-number-input-cell id="primary-year-7-places" name="primary-year-7-places" asp-for="@Model.PrimaryYear7Places" label="Seventh year of opening" suffix="places" />
+                    <govuk-number-input-cell id="primary-year-1-places" name="primary-year-1-places" asp-for="@Model.PrimaryYear1Places" show-label=true label="First year of opening" suffix="places" />
+                    <govuk-number-input-cell id="primary-year-2-places" name="primary-year-2-places" asp-for="@Model.PrimaryYear2Places" show-label=true label="Second year of opening" suffix="places" />
+                    <govuk-number-input-cell id="primary-year-3-places" name="primary-year-3-places" asp-for="@Model.PrimaryYear3Places" show-label=true label="Third year of opening" suffix="places" />
+                    <govuk-number-input-cell id="primary-year-4-places" name="primary-year-4-places" asp-for="@Model.PrimaryYear4Places" show-label=true label="Fourth year of opening" suffix="places" />
+                    <govuk-number-input-cell id="primary-year-5-places" name="primary-year-5-places" asp-for="@Model.PrimaryYear5Places" show-label=true label="Fifth year of opening" suffix="places" />
+                    <govuk-number-input-cell id="primary-year-6-places" name="primary-year-6-places" asp-for="@Model.PrimaryYear6Places" show-label=true label="Sixth year of opening" suffix="places" />
+                    <govuk-number-input-cell id="primary-year-7-places" name="primary-year-7-places" asp-for="@Model.PrimaryYear7Places" show-label=true label="Seventh year of opening" suffix="places" />
                 </div>
             }
 
@@ -63,11 +63,11 @@
                     <h1 class="govuk-heading-l" data-testid="title">
                         Provide the total number of underwritten places
                     </h1>
-                    <govuk-number-input-cell id="secondary-year-1-places" name="secondary-year-1-places" asp-for="@Model.SecondaryYear1Places" label="First year of opening" suffix="places" />
-                    <govuk-number-input-cell id="secondary-year-2-places" name="secondary-year-2-places" asp-for="@Model.SecondaryYear2Places" label="Second year of opening" suffix="places" />
-                    <govuk-number-input-cell id="secondary-year-3-places" name="secondary-year-3-places" asp-for="@Model.SecondaryYear3Places" label="Third year of opening" suffix="places" />
-                    <govuk-number-input-cell id="secondary-year-4-places" name="secondary-year-4-places" asp-for="@Model.SecondaryYear4Places" label="Fourth year of opening" suffix="places" />
-                    <govuk-number-input-cell id="secondary-year-5-places" name="secondary-year-5-places" asp-for="@Model.SecondaryYear5Places" label="Fifth year of opening" suffix="places" />
+                    <govuk-number-input-cell id="secondary-year-1-places" name="secondary-year-1-places" asp-for="@Model.SecondaryYear1Places" show-label=true label="First year of opening" suffix="places" />
+                    <govuk-number-input-cell id="secondary-year-2-places" name="secondary-year-2-places" asp-for="@Model.SecondaryYear2Places" show-label=true label="Second year of opening" suffix="places" />
+                    <govuk-number-input-cell id="secondary-year-3-places" name="secondary-year-3-places" asp-for="@Model.SecondaryYear3Places" show-label=true label="Third year of opening" suffix="places" />
+                    <govuk-number-input-cell id="secondary-year-4-places" name="secondary-year-4-places" asp-for="@Model.SecondaryYear4Places" show-label=true label="Fourth year of opening" suffix="places" />
+                    <govuk-number-input-cell id="secondary-year-5-places" name="secondary-year-5-places" asp-for="@Model.SecondaryYear5Places" show-label=true label="Fifth year of opening" suffix="places" />
                 </div>
             }
 
@@ -77,9 +77,9 @@
                     <h1 class="govuk-heading-l" data-testid="title">
                         Provide the total number of underwritten places
                     </h1>
-                    <govuk-number-input-cell id="sixteen-to-nineteen-year-1-places" name="sixteen-to-nineteen-year-1-places" asp-for="@Model.SixteenToNineteenYear1Places" label="First year of opening" suffix="places" />
-                    <govuk-number-input-cell id="sixteen-to-nineteen-year-2-places" name="sixteen-to-nineteen-year-2-places" asp-for="@Model.SixteenToNineteenYear2Places" label="Second year of opening" suffix="places" />
-                    <govuk-number-input-cell id="sixteen-to-nineteen-year-3-places" name="sixteen-to-nineteen-year-3-places" asp-for="@Model.SixteenToNineteenYear3Places" label="Third year of opening" suffix="places" />
+                    <govuk-number-input-cell id="sixteen-to-nineteen-year-1-places" name="sixteen-to-nineteen-year-1-places" asp-for="@Model.SixteenToNineteenYear1Places" show-label=true label="First year of opening" suffix="places" />
+                    <govuk-number-input-cell id="sixteen-to-nineteen-year-2-places" name="sixteen-to-nineteen-year-2-places" asp-for="@Model.SixteenToNineteenYear2Places" show-label=true label="Second year of opening" suffix="places" />
+                    <govuk-number-input-cell id="sixteen-to-nineteen-year-3-places" name="sixteen-to-nineteen-year-3-places" asp-for="@Model.SixteenToNineteenYear3Places" show-label=true label="Third year of opening" suffix="places" />
                 </div>
             }
 
@@ -89,33 +89,33 @@
                         <h1 class="govuk-heading-l" data-testid="title">
                             Provide the total number of underwritten primary places
                         </h1>
-                        <govuk-number-input-cell id="primary-year-1-places" name="primary-year-1-places" asp-for="@Model.PrimaryYear1Places" label="First year of opening" suffix="places" />
-                        <govuk-number-input-cell id="primary-year-2-places" name="primary-year-2-places" asp-for="@Model.PrimaryYear2Places" label="Second year of opening" suffix="places" />
-                        <govuk-number-input-cell id="primary-year-3-places" name="primary-year-3-places" asp-for="@Model.PrimaryYear3Places" label="Third year of opening" suffix="places" />
-                        <govuk-number-input-cell id="primary-year-4-places" name="primary-year-4-places" asp-for="@Model.PrimaryYear4Places" label="Fourth year of opening" suffix="places" />
-                        <govuk-number-input-cell id="primary-year-5-places" name="primary-year-5-places" asp-for="@Model.PrimaryYear5Places" label="Fifth year of opening" suffix="places" />
-                        <govuk-number-input-cell id="primary-year-6-places" name="primary-year-6-places" asp-for="@Model.PrimaryYear6Places" label="Sixth year of opening" suffix="places" />
-                        <govuk-number-input-cell id="primary-year-7-places" name="primary-year-7-places" asp-for="@Model.PrimaryYear7Places" label="Seventh year of opening" suffix="places" />
+                        <govuk-number-input-cell id="primary-year-1-places" name="primary-year-1-places" asp-for="@Model.PrimaryYear1Places" show-label=true label="First year of opening" suffix="places" />
+                        <govuk-number-input-cell id="primary-year-2-places" name="primary-year-2-places" asp-for="@Model.PrimaryYear2Places" show-label=true label="Second year of opening" suffix="places" />
+                        <govuk-number-input-cell id="primary-year-3-places" name="primary-year-3-places" asp-for="@Model.PrimaryYear3Places" show-label=true label="Third year of opening" suffix="places" />
+                        <govuk-number-input-cell id="primary-year-4-places" name="primary-year-4-places" asp-for="@Model.PrimaryYear4Places" show-label=true label="Fourth year of opening" suffix="places" />
+                        <govuk-number-input-cell id="primary-year-5-places" name="primary-year-5-places" asp-for="@Model.PrimaryYear5Places" show-label=true label="Fifth year of opening" suffix="places" />
+                        <govuk-number-input-cell id="primary-year-6-places" name="primary-year-6-places" asp-for="@Model.PrimaryYear6Places" show-label=true label="Sixth year of opening" suffix="places" />
+                        <govuk-number-input-cell id="primary-year-7-places" name="primary-year-7-places" asp-for="@Model.PrimaryYear7Places" show-label=true label="Seventh year of opening" suffix="places" />
                     </div>
 
                     <div class="govuk-form-group govuk-!-margin-bottom-9">
                         <h1 class="govuk-heading-l" data-testid="title">
                             Provide the total number of underwritten secondary places
                         </h1>
-                        <govuk-number-input-cell id="secondary-year-1-places" name="secondary-year-1-places" asp-for="@Model.SecondaryYear1Places" label="First year of opening" suffix="places" />
-                        <govuk-number-input-cell id="secondary-year-2-places" name="secondary-year-2-places" asp-for="@Model.SecondaryYear2Places" label="Second year of opening" suffix="places" />
-                        <govuk-number-input-cell id="secondary-year-3-places" name="secondary-year-3-places" asp-for="@Model.SecondaryYear3Places" label="Third year of opening" suffix="places" />
-                        <govuk-number-input-cell id="secondary-year-4-places" name="secondary-year-4-places" asp-for="@Model.SecondaryYear4Places" label="Fourth year of opening" suffix="places" />
-                        <govuk-number-input-cell id="secondary-year-5-places" name="secondary-year-5-places" asp-for="@Model.SecondaryYear5Places" label="Fifth year of opening" suffix="places" />
+                        <govuk-number-input-cell id="secondary-year-1-places" name="secondary-year-1-places" asp-for="@Model.SecondaryYear1Places" show-label=true label="First year of opening" suffix="places" />
+                        <govuk-number-input-cell id="secondary-year-2-places" name="secondary-year-2-places" asp-for="@Model.SecondaryYear2Places" show-label=true label="Second year of opening" suffix="places" />
+                        <govuk-number-input-cell id="secondary-year-3-places" name="secondary-year-3-places" asp-for="@Model.SecondaryYear3Places" show-label=true label="Third year of opening" suffix="places" />
+                        <govuk-number-input-cell id="secondary-year-4-places" name="secondary-year-4-places" asp-for="@Model.SecondaryYear4Places" show-label=true label="Fourth year of opening" suffix="places" />
+                        <govuk-number-input-cell id="secondary-year-5-places" name="secondary-year-5-places" asp-for="@Model.SecondaryYear5Places" show-label=true label="Fifth year of opening" suffix="places" />
                     </div>
 
                     <div class="govuk-form-group govuk-!-margin-bottom-9">
                         <h1 class="govuk-heading-l" data-testid="title">
                             Provide the total number of underwritten 16 to 19 places
                         </h1>
-                        <govuk-number-input-cell id="sixteen-to-nineteen-year-1-places" name="sixteen-to-nineteen-year-1-places" asp-for="@Model.SixteenToNineteenYear1Places" label="First year of opening" suffix="places" />
-                        <govuk-number-input-cell id="sixteen-to-nineteen-year-2-places" name="sixteen-to-nineteen-year-2-places" asp-for="@Model.SixteenToNineteenYear2Places" label="Second year of opening" suffix="places" />
-                        <govuk-number-input-cell id="sixteen-to-nineteen-year-3-places" name="sixteen-to-nineteen-year-3-places" asp-for="@Model.SixteenToNineteenYear3Places" label="Third year of opening" suffix="places" />
+                        <govuk-number-input-cell id="sixteen-to-nineteen-year-1-places" name="sixteen-to-nineteen-year-1-places" asp-for="@Model.SixteenToNineteenYear1Places" show-label=true label="First year of opening" suffix="places" />
+                        <govuk-number-input-cell id="sixteen-to-nineteen-year-2-places" name="sixteen-to-nineteen-year-2-places" asp-for="@Model.SixteenToNineteenYear2Places" show-label=true label="Second year of opening" suffix="places" />
+                        <govuk-number-input-cell id="sixteen-to-nineteen-year-3-places" name="sixteen-to-nineteen-year-3-places" asp-for="@Model.SixteenToNineteenYear3Places" show-label=true label="Third year of opening" suffix="places" />
                     </div>
                 }
 
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_NumberInputCell.cshtml b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_NumberInputCell.cshtml
index 4ec50a007..1dfcc70b3 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_NumberInputCell.cshtml
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Shared/_NumberInputCell.cshtml
@@ -3,10 +3,9 @@
 @{
     var showError = !string.IsNullOrWhiteSpace(Model.ErrorMessage);
     var showSuffix = !string.IsNullOrWhiteSpace(Model.Suffix);
-    var showLabel = !string.IsNullOrWhiteSpace(Model.Label);
 }
 <div class="govuk-form-group @(showError ? "govuk-form-group--error" : "")">
-    @if (showLabel)
+    @if (Model.ShowLabel)
     {
     <div class="govuk-heading-s">@Model.Label</div>
     }
@@ -25,7 +24,7 @@
                        name="@Model.Name"
                        type="text"
                        value="@Model.Value"
-                       aria-label="@Model.Name"
+                       aria-label="@Model.Label"
                        data-testid="@Model.TestId" />
                 <div class="govuk-input__suffix" aria-hidden="true">@Model.Suffix</div>
             </div>
@@ -37,7 +36,7 @@
                    name="@Model.Name"
                    type="text"
                    value="@Model.Value"
-                   aria-label="@Model.Name"
+                   aria-label="@Model.Label"
                    data-testid="@Model.TestId" />
         }
     }
diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/TagHelpers/NumberInputCellTagHelper.cs b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/TagHelpers/NumberInputCellTagHelper.cs
index fdd1ead43..2da0498f3 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/TagHelpers/NumberInputCellTagHelper.cs
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/TagHelpers/NumberInputCellTagHelper.cs
@@ -11,7 +11,12 @@ namespace Dfe.ManageFreeSchoolProjects.TagHelpers
     [HtmlTargetElement("govuk-number-input-cell", TagStructure = TagStructure.WithoutEndTag)]
     public class NumberInputCellTagHelper : InputTagHelperBase
     {
-        public NumberInputCellTagHelper(IHtmlHelper htmlHelper) : base(htmlHelper) { }
+
+        [HtmlAttributeName("show-label")]
+        public bool ShowLabel { get; set; }
+
+        public NumberInputCellTagHelper(IHtmlHelper htmlHelper) : base(htmlHelper) {
+        }
 
         protected override async Task<IHtmlContent> RenderContentAsync()
         {
@@ -32,6 +37,7 @@ protected override async Task<IHtmlContent> RenderContentAsync()
                 Name = Name,
                 Value = For.Model?.ToString(),
                 Label = Label,
+                ShowLabel = ShowLabel,
                 Suffix = Suffix,
             };
 
@@ -52,6 +58,7 @@ public class NumberInputCellViewModel
         public string Value { get; set; }
         public string ErrorMessage { get; set; }
         public string Label { get; set; }
+        public bool ShowLabel { get; set; }
         public string Suffix { get; set; }
     }
 }

From 002958bfd825971f7736c3a014880aa5c6a7cd6f Mon Sep 17 00:00:00 2001
From: Jack Marshall <jack.marshall@nimbleapproach.com>
Date: Mon, 17 Feb 2025 10:04:47 +0000
Subject: [PATCH 3/3] Fixed issue with school phase field not loading when an
 error is found

---
 .../Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs
index 2ad0e3ef0..b82e80e37 100644
--- a/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs
+++ b/Dfe.ManageFreeSchoolProjects/Dfe.ManageFreeSchoolProjects/Pages/Project/Tasks/FinancePlan/EditUnderwrittenPlaces.cshtml.cs
@@ -149,6 +149,10 @@ public async Task<ActionResult> OnGet()
 
         public async Task<ActionResult> OnPost()
         {
+            var projectId = RouteData.Values["projectId"] as string;
+            var projectOverview = await _getProjectOverviewService.Execute(projectId);
+
+            SchoolPhase = projectOverview.SchoolDetails.SchoolPhase;
 
             if (!ModelState.IsValid)
             {