Merge pull request #793 from DFE-Digital/feature/transfer-dates-and-h…

…istory Fix ids to ensure reasons correctly show
DFE-Digital · Jul 8, 2024 · 12bb3b5 · 12bb3b5
2 parents 1f0d37b + 475c607
commit 12bb3b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Dfe.PrepareTransfers.Web/Pages/Projects/TransferDates/Reason.cshtml b/Dfe.PrepareTransfers.Web/Pages/Projects/TransferDates/Reason.cshtml
@@ -37,7 +37,7 @@
                         @foreach (var reason in Model.ReasonOptions)
                         {
                             var checkboxId = reason.Heading.ToLower().Replace(" ", "-");
-                            var textareaName = $"Details{reason.Heading.Replace(" ", "")}";
+                            var textareaName = $"Details[{checkboxId}]";
                             <div class="govuk-checkboxes__item">
                                 <input class="govuk-checkboxes__input" id="@checkboxId" name="Reasons" type="checkbox" value="@checkboxId" data-aria-controls="conditional-@checkboxId">
                                 <label class="govuk-label govuk-checkboxes__label" for="@checkboxId">@reason.Heading</label>

diff --git a/Dfe.PrepareTransfers.Web/Pages/Projects/TransferDates/Reason.cshtml.cs b/Dfe.PrepareTransfers.Web/Pages/Projects/TransferDates/Reason.cshtml.cs
@@ -85,6 +85,7 @@ public async Task<IActionResult> OnPostAsync()
             return RedirectToPage("/Projects/TransferDates/Index", new { Urn });
         }
 
+
         private List<ReasonChange> GetReasonOptions(bool isDateSooner)
         {
             var soonerReasons = new List<string> { "faster-progress", "error-correction" };

diff --git a/Dfe.PrepareTransfers.Web/Pages/TaskList/DateHistory/DateHistory.cshtml b/Dfe.PrepareTransfers.Web/Pages/TaskList/DateHistory/DateHistory.cshtml
@@ -2,6 +2,7 @@
 @using Dfe.PrepareTransfers.Data.Models
 @using Dfe.PrepareTransfers.Data.Models.AdvisoryBoardDecision
 @using Dfe.PrepareTransfers.Data.TRAMS
+@using Dfe.PrepareTransfers.Web.ExtensionMethods
 @model Dfe.PrepareTransfers.Web.Pages.TaskList.DateHistory.DateHistory
 
 @{
@@ -18,15 +19,22 @@
     <partial name="_SubMenu" />
 </div>
 <div class="govuk-!-margin-bottom-12">
-    <h2 class="govuk-heading-l govuk-!-margin-bottom govuk-!-font-size-36">Transfer date history</h2>
+
 
-    @if (Model.OpeningDateHistory == null || !Model.OpeningDateHistory.Any())
+    @if ((Model.OpeningDateHistory == null || !Model.OpeningDateHistory.Any()) && Model.Project.Dates.Target is not null) 
     {
+        <h2 class="govuk-heading-l govuk-!-margin-bottom-12 govuk-!-font-size-36">Current proposed transfer date</h2>
+        <p class="govuk-body">The current proposed transfer date is <strong>@Model.Project.Dates.Target.ToFormattedDate()</strong>.</p>
+    }
+    else if ((Model.OpeningDateHistory == null || !Model.OpeningDateHistory.Any()) && Model.Project.Dates.Target is null)
+    {        
+        <h2 class="govuk-heading-l govuk-!-margin-bottom govuk-!-font-size-36">Transfer date history</h2>
         <p class="govuk-body">The proposed transfer date has not been entered yet. When it has been it will be displayed here.</p>
         <p class="govuk-body">Any future changes to the proposed transfer date will also be shown here.</p>
     }
     else
     {
+        <h2 class="govuk-heading-l govuk-!-margin-bottom govuk-!-font-size-36">Current proposed transfer date</h2>
         <p class="govuk-body">The current proposed transfer date is <strong>@Model.OpeningDateHistory.OrderByDescending(h => h.ChangedAt).FirstOrDefault()?.NewDate?.ToString("d MMMM yyyy")</strong>.</p>
 
         <h3 class="govuk-heading-m">Transfer date changes</h3>
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,6 +85,7 @@ public async Task<IActionResult> OnPostAsync() @@
                 return RedirectToPage("/Projects/TransferDates/Index", new { Urn });
             }
             private List<ReasonChange> GetReasonOptions(bool isDateSooner)
             {
                 var soonerReasons = new List<string> { "faster-progress", "error-correction" };
@@ Expand Down @@