From 3ab04e7fc45db0bd961ce400a6cce2b14d60a569 Mon Sep 17 00:00:00 2001
From: George Blackwell <George.Blackwell@softwire.com>
Date: Mon, 7 Mar 2022 17:01:27 +0000
Subject: [PATCH 1/2] fixed remove enrolment styling & title

---
 .../ConfirmRemoveFromCourse.cshtml            | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml
index dee984b8c6..5502b7476b 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml
@@ -5,7 +5,7 @@
 
 @{
   var errorHasOccurred = !ViewData.ModelState.IsValid;
-  ViewData["Title"] = errorHasOccurred ? $"Error: Remove delegate enrolment from {Model.CourseName}" : $"Remove delegate enrolment from {Model.CourseName}";
+  ViewData["Title"] = "Remove enrolment";
   var cancelLinkRouteData = new Dictionary<string, string> { { "delegateId", Model.DelegateId.ToString() } };
 }
 
@@ -14,25 +14,41 @@
     @if (errorHasOccurred) {
       <vc:error-summary order-of-property-names="@(new[] { nameof(Model.Confirm) })" />
     }
-    <h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-8 word-break">Remove enrolment</h1>
-    <h2 class="nhsuk-heading-l word-break">Delegate: @Model.Name</h2>
-    <h2 class="nhsuk-heading-l word-break">Activity: @Model.CourseName</h2>
-    <div class="nhsuk-form-group">
-      <form asp-action="ExecuteRemoveFromCourse" asp-route-delegateId="@Model.DelegateId" asp-route-customisationId="@Model.CustomisationId">
-        <fieldset class="nhsuk-fieldset" aria-describedby="example-hint">
-          <div class="nhsuk-checkboxes">
-            <div class="nhsuk-checkboxes__item">
-              <input type="hidden" name="name" value="@Model.Name" />
-              <input type="hidden" name="courseName" value="@Model.CourseName" />
-              <vc:single-checkbox asp-for="@nameof(Model.Confirm)"
-                                  label="I am sure that I wish to remove this enrolment"
-                                  hint-text="This action will remove the activity from the delegate’s Current Activities list and archive their progress." />
-            </div>
-          </div>
-          <button class="nhsuk-button delete-button nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-6" role="button" type="submit">Remove enrolment</button>
-        </fieldset>
-      </form>
-      <vc:cancel-link asp-controller="ViewDelegate" asp-action="Index" asp-all-route-data="@cancelLinkRouteData" />
-    </div>
+    <h1 class="nhsuk-heading-xl">Remove enrolment</h1>
+  </div>
+</div>
+
+<div class="nhsuk-grid-row">
+  <div class="nhsuk-grid-column-one-quarter nhsuk-heading-l nhsuk-u-font-weight-bold">
+    Delegate:
+  </div>
+  <div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal word-break">
+    @Model.Name
+  </div>
+</div>
+
+<div class="nhsuk-grid-row">
+  <div class="nhsuk-grid-column-one-quarter nhsuk-heading-l nhsuk-u-font-weight-bold">
+    Activity:
+  </div>
+  <div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal word-break">
+    @Model.CourseName
+  </div>
+</div>
+
+<div class="nhsuk-grid-row">
+  <div class="nhsuk-grid-column-full">
+    <form class="nhsuk-u-margin-bottom-3" asp-action="ExecuteRemoveFromCourse" asp-route-delegateId="@Model.DelegateId" asp-route-customisationId="@Model.CustomisationId">
+      <input type="hidden" name="name" value="@Model.Name" />
+      <input type="hidden" name="courseName" value="@Model.CourseName" />
+
+      <vc:single-checkbox asp-for="@nameof(Model.Confirm)"
+                          label="I am sure that I wish to remove this enrolment"
+                          hint-text="This action will remove the activity from the delegate’s Current Activities list and archive their progress." />
+
+      <button class="nhsuk-button delete-button" role="button" type="submit">Remove enrolment</button>
+    </form>
+
+    <vc:cancel-link asp-controller="ViewDelegate" asp-action="Index" asp-all-route-data="@cancelLinkRouteData" />
   </div>
 </div>

From ff4d20c56b6742a0c6dbb1690dbe3643c59c0521 Mon Sep 17 00:00:00 2001
From: George Blackwell <George.Blackwell@softwire.com>
Date: Tue, 8 Mar 2022 12:46:38 +0000
Subject: [PATCH 2/2] fix error message & confirmation alert

---
 .../Delegates/ViewDelegate/RemoveFromCourseViewModel.cs         | 2 +-
 .../Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/ViewDelegate/RemoveFromCourseViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/ViewDelegate/RemoveFromCourseViewModel.cs
index 5970e490c7..35975acd40 100644
--- a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/ViewDelegate/RemoveFromCourseViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/ViewDelegate/RemoveFromCourseViewModel.cs
@@ -19,7 +19,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
             {
                 validationResults.Add(
                     new ValidationResult(
-                        "Please confirm with the checkbox that you wish to remove this delegate from this course",
+                        "Confirm you wish to remove this delegate from this course",
                         new[]
                         {
                             nameof(Confirm)
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml
index 5502b7476b..ec73333e7c 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml
@@ -5,7 +5,7 @@
 
 @{
   var errorHasOccurred = !ViewData.ModelState.IsValid;
-  ViewData["Title"] = "Remove enrolment";
+  ViewData["Title"] = errorHasOccurred ? "Error: Remove enrolment" : "Remove enrolment";
   var cancelLinkRouteData = new Dictionary<string, string> { { "delegateId", Model.DelegateId.ToString() } };
 }