From 0a1e604c8484084bf3b3bf409d334876c6afbe27 Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Fri, 26 Aug 2022 08:44:23 +0100
Subject: [PATCH 1/3] DLSV2-619 Tweaks to wording following feedback

---
 .../Views/Supervisor/NominateSupervisor.cshtml       | 12 ++++++------
 .../Views/Supervisor/Shared/_StaffMemberCard.cshtml  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml
index f1858176c1..26d2cc0457 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml
@@ -5,7 +5,7 @@
 @{
   var errorHasOccurred = !ViewData.ModelState.IsValid;
   ViewData["Application"] = "Supervisor";
-  ViewData["Title"] = (errorHasOccurred ? "Error: " : "") + "My Staff - Nominate Supervisor";
+  ViewData["Title"] = (errorHasOccurred ? "Error: " : "") + "Confirm Nominate supervisor";
   ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/Supervisor/MyStaff";
   ViewData["HeaderPathName"] = "My Staff";
 }
@@ -20,7 +20,7 @@
     {
       <vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
     }
-    <h1 id="page-heading">Confirm Nominate Supervisor</h1>
+    <h1 id="page-heading">@ViewData["Title"]</h1>
     <div class="nhsuk-grid-row">
       <div class="nhsuk-grid-column-one-quarter nhsuk-heading-l">
         <div class="nhsuk-u-font-weight-bold">
@@ -31,13 +31,13 @@
         @Model.FirstName @Model.LastName (@Model.DelegateEmail)
       </div>
     </div>
-    <p class="nhsuk-body-m">By nominating this member of staff as a supervisor, you are confirming there competence to assess the capability of others.</p>
-    <p>Once the nominated supervisor role has been assigned, it can only be removed by a Centre Manager or Clinical Centre Manager.</p>
+    <p class="nhsuk-body-m">By promoting this member of staff to the Nominated supervisor role, you are confirming there competence to assess the capability of others.</p>
+    <p>Once the Nominated supervisor role has been assigned, it can only be removed by a Centre Manager or Clinical Centre Manager.</p>
     <form method="post" asp-controller="Supervisor">
       <div class="nhsuk-checkboxes__item">
         <vc:single-checkbox asp-for="@nameof(Model.ActionConfirmed)"
-                            label="I am sure that I wish to nominate @Model.FirstName @Model.LastName as a supervisor"
-                            hint-text="This action will grant the staff member nominated supervisor role and I understand that this role can only be removed by a Centre Manager or Clinical Centre Manager." />
+                            label="I am sure that I wish to promote @Model.FirstName @Model.LastName to the Nominated supervisor role"
+                            hint-text="I understand that the Nominated Supervisor role can only be removed by a Centre Manager or Clinical Centre Manager." />
       </div>
       <button type="submit" class="nhsuk-button nhsuk-u-margin-top-4" asp-action="ConfirmNominateSupervisor">
         Confirm
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
index f8f6c53a4d..75514c69f5 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
@@ -79,7 +79,7 @@
                asp-action="NominateSupervisor"
                asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID"
                asp-route-returnPageQuery="@Model.ReturnPageQuery">
-                    Nominate supervisor
+                    Promote to Nominated supervisor
                 </a>
             }
             @if (Model.SupervisorDelegateDetail.CandidateAssessmentCount == 0)

From 6e411a1d85e376cbb3f95d383c870e8b7e11db1a Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Fri, 26 Aug 2022 08:45:39 +0100
Subject: [PATCH 2/3] IDE Formatter changes

---
 .../Supervisor/NominateSupervisor.cshtml      | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml
index 26d2cc0457..216b33a3d1 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml
@@ -3,53 +3,53 @@
 @model SupervisorDelegateViewModel;
 @inject IConfiguration Configuration;
 @{
-  var errorHasOccurred = !ViewData.ModelState.IsValid;
-  ViewData["Application"] = "Supervisor";
-  ViewData["Title"] = (errorHasOccurred ? "Error: " : "") + "Confirm Nominate supervisor";
-  ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/Supervisor/MyStaff";
-  ViewData["HeaderPathName"] = "My Staff";
+    var errorHasOccurred = !ViewData.ModelState.IsValid;
+    ViewData["Application"] = "Supervisor";
+    ViewData["Title"] = (errorHasOccurred ? "Error: " : "") + "Confirm Nominate supervisor";
+    ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/Supervisor/MyStaff";
+    ViewData["HeaderPathName"] = "My Staff";
 }
 
 @section NavMenuItems {
-  <partial name="Shared/_NavMenuItems" />
+    <partial name="Shared/_NavMenuItems" />
 }
 
-<div class="nhsuk-grid-row">
-  <div class="nhsuk-grid-column-full">
-    @if (errorHasOccurred)
-    {
-      <vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
-    }
-    <h1 id="page-heading">@ViewData["Title"]</h1>
     <div class="nhsuk-grid-row">
-      <div class="nhsuk-grid-column-one-quarter nhsuk-heading-l">
-        <div class="nhsuk-u-font-weight-bold">
-          Staff member:
+        <div class="nhsuk-grid-column-full">
+            @if (errorHasOccurred)
+        {
+            <vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
+        }
+        <h1 id="page-heading">@ViewData["Title"]</h1>
+        <div class="nhsuk-grid-row">
+            <div class="nhsuk-grid-column-one-quarter nhsuk-heading-l">
+                <div class="nhsuk-u-font-weight-bold">
+                    Staff member:
+                </div>
+            </div>
+            <div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal">
+                @Model.FirstName @Model.LastName (@Model.DelegateEmail)
+            </div>
         </div>
-      </div>
-      <div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal">
-        @Model.FirstName @Model.LastName (@Model.DelegateEmail)
-      </div>
-    </div>
-    <p class="nhsuk-body-m">By promoting this member of staff to the Nominated supervisor role, you are confirming there competence to assess the capability of others.</p>
-    <p>Once the Nominated supervisor role has been assigned, it can only be removed by a Centre Manager or Clinical Centre Manager.</p>
-    <form method="post" asp-controller="Supervisor">
-      <div class="nhsuk-checkboxes__item">
-        <vc:single-checkbox asp-for="@nameof(Model.ActionConfirmed)"
-                            label="I am sure that I wish to promote @Model.FirstName @Model.LastName to the Nominated supervisor role"
-                            hint-text="I understand that the Nominated Supervisor role can only be removed by a Centre Manager or Clinical Centre Manager." />
-      </div>
-      <button type="submit" class="nhsuk-button nhsuk-u-margin-top-4" asp-action="ConfirmNominateSupervisor">
-        Confirm
-      </button>
-      @Html.HiddenFor(m => m.Id)
-      @Html.HiddenFor(m => m.FirstName)
-      @Html.HiddenFor(m => m.LastName)
-      @Html.HiddenFor(m => m.DelegateEmail)
-      @Html.HiddenFor(m => m.CandidateAssessmentCount)
-      @Html.HiddenFor(m => m.ReturnPageQuery)
-    </form>
+        <p class="nhsuk-body-m">By promoting this member of staff to the Nominated supervisor role, you are confirming there competence to assess the capability of others.</p>
+        <p>Once the Nominated supervisor role has been assigned, it can only be removed by a Centre Manager or Clinical Centre Manager.</p>
+        <form method="post" asp-controller="Supervisor">
+            <div class="nhsuk-checkboxes__item">
+                <vc:single-checkbox asp-for="@nameof(Model.ActionConfirmed)"
+                                    label="I am sure that I wish to promote @Model.FirstName @Model.LastName to the Nominated supervisor role"
+                                    hint-text="I understand that the Nominated Supervisor role can only be removed by a Centre Manager or Clinical Centre Manager." />
+            </div>
+            <button type="submit" class="nhsuk-button nhsuk-u-margin-top-4" asp-action="ConfirmNominateSupervisor">
+                Confirm
+            </button>
+            @Html.HiddenFor(m => m.Id)
+            @Html.HiddenFor(m => m.FirstName)
+            @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" />
-  </div>
+        <vc:cancel-link-with-return-page-query asp-controller="Supervisor" asp-action="MyStaffList" return-page-query="@Model.ReturnPageQuery" />
+    </div>
 </div>

From 68d979124501da8a9b15d40501636223eb6bb255 Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Fri, 26 Aug 2022 08:56:45 +0100
Subject: [PATCH 3/3] DLSV2-619 Hides button for not registered staff

and makes "not registered" the consistent term used
---
 DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml      | 2 +-
 .../Views/Supervisor/Shared/_StaffMemberCard.cshtml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml
index 52ae7eecb7..e1561e1a8c 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml
@@ -34,7 +34,7 @@
             @Model.DashboardData.StaffCount Staff  @if (Model.DashboardData.StaffUnregisteredCount > 0)
             {
               <span class="nhsuk-u-secondary-text-color nhsuk-u-font-weight-normal">
-                (@Model.DashboardData.StaffUnregisteredCount unregistered)
+                (@Model.DashboardData.StaffUnregisteredCount not registered)
               </span>
             }
           </p>
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
index 75514c69f5..d21b41ec13 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
@@ -72,7 +72,7 @@
                     <partial name="Shared/_StaffDetails" model="Model.SupervisorDelegateDetail" view-data="@(new ViewDataDictionary(ViewData){{"isSupervisor", Model.IsUserSupervisor}})" />
                 }
             </div>
-            @if (Model.SupervisorDelegateDetail.DlsRole == DlsRole.Learner && Model.IsUserSupervisor)
+            @if (Model.SupervisorDelegateDetail.DlsRole == DlsRole.Learner && Model.IsUserSupervisor && Model.SupervisorDelegateDetail.CandidateID != null)
             {
                 <a class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-top-4 button-small"
                data-return-page-enabled="true"