From 364de028fda4f6c77b45a81c6923d742491b737f Mon Sep 17 00:00:00 2001
From: OluwatobiAwe <Oluwatobi.Awe@hee.nhs.uk>
Date: Fri, 4 Nov 2022 10:50:50 +0000
Subject: [PATCH 1/3] supervisor email check

---
 .../Controllers/SupervisorController/Supervisor.cs           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
index e47d0e69ff..85400c63c1 100644
--- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
+++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
@@ -99,13 +99,14 @@ public IActionResult AddSuperviseDelegate(MyStaffListViewModel model)
             var supervisorEmail = GetUserEmail();
 
             ModelState.Remove("Page");
-            if (ModelState.IsValid)
+            if (ModelState.IsValid && supervisorEmail != model.DelegateEmail)
             {
                 AddSupervisorDelegateAndReturnId(adminId, model.DelegateEmail ?? String.Empty, supervisorEmail, centreId);
                 return RedirectToAction("MyStaffList", model.Page);
             }
             else
             {
+                if (supervisorEmail == model.DelegateEmail) { ModelState.AddModelError("DelegateEmail", "A supervisor cannot be added as a member"); }
                 ModelState.ClearErrorsForAllFieldsExcept("DelegateEmail");
                 return MyStaffList(model.SearchString, model.SortBy, model.SortDirection, model.Page);
             }
@@ -131,7 +132,7 @@ public IActionResult AddMultipleSuperviseDelegates(AddMultipleSupervisorDelegate
                 var delegateEmailsList = NewlineSeparatedStringListHelper.SplitNewlineSeparatedList(model.DelegateEmails);
                 foreach (var delegateEmail in delegateEmailsList)
                 {
-                    if (delegateEmail.Length > 0)
+                    if (delegateEmail.Length > 0 && supervisorEmail != delegateEmail)
                     {
                         if (RegexStringValidationHelper.IsValidEmail(delegateEmail))
                         {

From fa727aaaf95676826fcfdc0a8e2de01e33a97378 Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Tue, 8 Nov 2022 08:24:20 +0000
Subject: [PATCH 2/3] Wording tweaks

---
 .../Controllers/SupervisorController/Supervisor.cs              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
index 85400c63c1..9b12c9cc16 100644
--- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
+++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
@@ -106,7 +106,7 @@ public IActionResult AddSuperviseDelegate(MyStaffListViewModel model)
             }
             else
             {
-                if (supervisorEmail == model.DelegateEmail) { ModelState.AddModelError("DelegateEmail", "A supervisor cannot be added as a member"); }
+                if (supervisorEmail == model.DelegateEmail) { ModelState.AddModelError("DelegateEmail", "The email address must not match the email address you are logged in with."); }
                 ModelState.ClearErrorsForAllFieldsExcept("DelegateEmail");
                 return MyStaffList(model.SearchString, model.SortBy, model.SortDirection, model.Page);
             }

From 4b1a75fd5a2d37b9f8dc1913d26402bb3fab317e Mon Sep 17 00:00:00 2001
From: OluwatobiAwe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 10 Nov 2022 07:20:39 +0000
Subject: [PATCH 3/3] removed style white:nowrap for TD-191

---
 .../Views/Shared/Components/TextInput/Default.cshtml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
index 7c051ad49f..b8cbf14122 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
@@ -1,7 +1,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
 @using DigitalLearningSolutions.Web.Helpers
 @model TextInputViewModel
-<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")" style="white-space:nowrap">
+<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
   <label class="nhsuk-label" for="@Model.Name">
     @Model.Label
   </label>