From 99d161e37a06997706ae42ebacc0d776fdee3b3d Mon Sep 17 00:00:00 2001
From: Daniel Manta <Daniel.Manta@hee.nhs.uk>
Date: Fri, 22 Jul 2022 16:20:07 +0100
Subject: [PATCH] DLSV2-560 Remove Staff member from my staff list results in
 error

---
 .../Views/Supervisor/RemoveConfirm.cshtml     |  1 +
 .../Supervisor/Shared/_StaffMemberCard.cshtml | 44 ++++++++++++-------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/RemoveConfirm.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/RemoveConfirm.cshtml
index c5a01dd7aa..3d299c67c6 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/RemoveConfirm.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/RemoveConfirm.cshtml
@@ -46,6 +46,7 @@
       @Html.HiddenFor(m => m.LastName)
       @Html.HiddenFor(m => m.DelegateEmail)
       @Html.HiddenFor(m => m.CandidateAssessmentCount)
+      @Html.HiddenFor(m => m.ReturnPageQuery)
     </form>
 
     <vc:cancel-link-with-return-page-query asp-controller="Supervisor" asp-action="MyStaffList" return-page-query="@Model.ReturnPageQuery" />
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
index d01e8c3b47..ed2b234c2f 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
@@ -71,16 +71,30 @@
         <partial name="Shared/_StaffDetails" model="Model.SupervisorDelegateDetail" view-data="@(new ViewDataDictionary(ViewData){{"isSupervisor", Model.IsUserSupervisor}})" />
       }
       </div>
-      <a class="nhsuk-button nhsuk-button--danger nhsuk-u-margin-top-4 button-small"
-         data-return-page-enabled="true"
-         asp-action="@(Model.SupervisorDelegateDetail.CandidateAssessmentCount == 0 ? "RemoveSupervisorDelegate" : "RemoveSupervisorDelegateConfirm")"
-         asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID"
-         asp-route-returnPageQuery="@Model.ReturnPageQuery">
-        Remove staff member
-      </a>
-
-  </div>
-
+      @if (Model.SupervisorDelegateDetail.CandidateAssessmentCount == 0)
+      {
+        <form method="post">
+          <button class="nhsuk-button nhsuk-button--danger nhsuk-u-margin-top-4 button-small" data-return-page-enabled="true"
+                  asp-action="RemoveSupervisorDelegate"
+                  asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID">
+            Remove staff member
+          </button>
+          @Html.Hidden("Id", Model.SupervisorDelegateDetail.ID)
+          @Html.Hidden("DelegateEmail", Model.SupervisorDelegateDetail.DelegateEmail)
+          @Html.Hidden("ConfirmedRemove", true)
+          @Html.HiddenFor(m => m.ReturnPageQuery)
+        </form>
+      }
+      else
+      {
+        <a class="nhsuk-button nhsuk-button--danger nhsuk-u-margin-top-4 button-small" data-return-page-enabled="true"
+              asp-action="RemoveSupervisorDelegateConfirm"
+              asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID"
+              asp-route-returnPageQuery="@Model.ReturnPageQuery">
+            Remove staff member
+        </a>
+      }
+    </div>
   </details>
   @if (Model.SupervisorDelegateDetail.CandidateID != null)
   {
@@ -95,11 +109,11 @@
   else if (Model.SupervisorDelegateDetail.AddedByDelegate)
   {
         <a class="nhsuk-button nhsuk-u-margin-left-4 nhsuk-u-margin-top-0"
-           aria-describedby="@Model.SupervisorDelegateDetail.ID-name"
-           asp-controller="Supervisor"
-           asp-action="ConfirmSupervise"
-           asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID">
+            aria-describedby="@Model.SupervisorDelegateDetail.ID-name"
+            asp-controller="Supervisor"
+            asp-action="ConfirmSupervise"
+            asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID">
           Confirm
         </a>
   }
-  </div>
+</div>