Merge pull request #3419 from TechnologyEnhancedLearning/Develop/Fixes/TD-6105-RemovingConfirmDelegateCode

TD-6105 Removing confirm delegate code

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -39,7 +39,6 @@ public interface ISupervisorDataService
         IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId);
         SupervisorDelegateDetail GetSupervisorDelegateDetailsByIdWithoutRemoveClause(int supervisorDelegateId, int adminId, int delegateUserId);
         //UPDATE DATA
-        bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int candidateId, int adminId);
         bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId);
         bool UpdateSelfAssessmentResultSupervisorVerifications(int selfAssessmentResultSupervisorVerificationId, string? comments, bool signedOff, int adminId);
         bool UpdateSelfAssessmentResultSupervisorVerificationsEmailSent(int selfAssessmentResultSupervisorVerificationId);
@@ -522,22 +521,6 @@ FROM  AdminAccounts AS aa INNER JOIN
                 new { CentreID, CategoryID });
         }
 
-        public bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId)
-        {
-            var numberOfAffectedRows = connection.Execute(
-         @"UPDATE SupervisorDelegates SET Confirmed = getUTCDate()
-            WHERE ID = @supervisorDelegateId AND Confirmed IS NULL AND Removed IS NULL AND (CandidateID = @candidateId OR SupervisorAdminID = @adminId)",
-        new { supervisorDelegateId, delegateUserId, adminId });
-            if (numberOfAffectedRows < 1)
-            {
-                logger.LogWarning(
-                    $"Not confirming SupervisorDelegate as db update failed. supervisorDelegateId: {supervisorDelegateId}, delegateUserId: {delegateUserId}, adminId: {adminId}"
-                );
-                return false;
-            }
-            return true;
-        }
-
         public bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId)
         {
 

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -263,16 +263,6 @@ private string IsMemberAlreadySupervisor(int adminId,
             return string.Empty;
         }
 
-        public IActionResult ConfirmSupervise(int supervisorDelegateId)
-        {
-            var adminId = GetAdminId();
-            if (supervisorService.ConfirmSupervisorDelegateById(supervisorDelegateId, 0, adminId))
-            {
-                frameworkNotificationService.SendSupervisorDelegateConfirmed(supervisorDelegateId, adminId, 0, GetCentreId());
-            }
-
-            return RedirectToAction("MyStaffList");
-        }
         public IActionResult RemoveSupervisorDelegate()
         {
             return RedirectToAction("MyStaffList");

DigitalLearningSolutions.Web/Services/FrameworkNotificationService.cs

@@ -16,7 +16,6 @@ public interface IFrameworkNotificationService
         void SendReviewRequest(int id, int invitedByAdminId, bool required, bool reminder, int centreId);
         void SendReviewOutcomeNotification(int reviewId, int centreId);
         void SendSupervisorDelegateInvite(int supervisorDelegateId, int adminId, int centreId);
-        void SendSupervisorDelegateConfirmed(int superviseDelegateId, int adminId, int delegateUserId, int centreId);
         void SendSupervisorResultReviewed(int adminId, int supervisorDelegateId, int candidateAssessmentId, int resultId, int centreId);
         void SendSupervisorEnroledDelegate(int adminId, int supervisorDelegateId, int candidateAssessmentId, DateTime? completeByDate, int centreId);
         void SendReminderDelegateSelfAssessment(int adminId, int supervisorDelegateId, int candidateAssessmentId, int centreId);
@@ -227,24 +226,6 @@ public void SendSupervisorDelegateInvite(int supervisorDelegateId, int adminId,
             }
         }
 
-        public void SendSupervisorDelegateConfirmed(int supervisorDelegateId, int adminId, int delegateUserId, int centreId)
-        {
-            var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, adminId, delegateUserId);
-
-            string centreName = GetCentreName(centreId);
-            string emailSubjectLine = "Supervisor Confirmed - Digital Learning Solutions";
-            var builder = new BodyBuilder();
-            builder.TextBody = $@"Dear {supervisorDelegate.FirstName}
-You have been identified as a supervised delegate by {supervisorDelegate.SupervisorName} ({supervisorDelegate.SupervisorEmail}) ({centreName}) in the NHS England, Digital Learning Solutions (DLS) platform.
-
-You are already registered as a delegate at the supervisor's DLS centre so they can now assign competency self assessments and view and validate your self assessment results.
-
-If this looks like a mistake, please contact {supervisorDelegate.SupervisorName} ({supervisorDelegate.SupervisorEmail}) ({centreName}) directly to correct.";
-            builder.HtmlBody = $@"<body style= 'font-family: Calibri; font-size: small;'><p>Dear {supervisorDelegate.FirstName}</p><p>{supervisorDelegate.SupervisorName} ({centreName}) has accepted your request to be your supervisor for profile asessment activities in the NHS England, Digital Learning Solutions platform.</p><p><a href='{GetCurrentActivitiesUrl()}'>Click here</a> to access your role profile assessments.</p></body>";
-            string toEmail = (@adminId == 0 ? supervisorDelegate.DelegateEmail : supervisorDelegate.SupervisorEmail);
-            emailService.SendEmail(new Email(emailSubjectLine, builder, toEmail));
-        }
-
         public void SendSupervisorResultReviewed(int adminId, int supervisorDelegateId, int candidateAssessmentId, int resultId, int centreId)
         {
             var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, adminId, 0);

DigitalLearningSolutions.Web/Services/SupervisorService.cs

@@ -37,7 +37,6 @@ public interface ISupervisorService
         SupervisorDelegateDetail GetSupervisorDelegateDetailsByIdWithoutRemoveClause(int supervisorDelegateId, int adminId, int delegateUserId);
 
         //UPDATE DATA
-        bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int candidateId, int adminId);
         bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId);
         bool UpdateSelfAssessmentResultSupervisorVerifications(int selfAssessmentResultSupervisorVerificationId, string? comments, bool signedOff, int adminId);
         bool UpdateSelfAssessmentResultSupervisorVerificationsEmailSent(int selfAssessmentResultSupervisorVerificationId);
@@ -70,11 +69,6 @@ public int AddSuperviseDelegate(int? supervisorAdminId, int? delegateUserId, str
             return supervisorDataService.AddSuperviseDelegate(supervisorAdminId, delegateUserId, delegateEmail, supervisorEmail, centreId);
         }
 
-        public bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int candidateId, int adminId)
-        {
-            return supervisorDataService.ConfirmSupervisorDelegateById(supervisorDelegateId, candidateId, adminId);
-        }
-
         public int EnrolDelegateOnAssessment(int delegateUserId, int supervisorDelegateId, int selfAssessmentId, DateTime? completeByDate, int? selfAssessmentSupervisorRoleId, int adminId, int centreId, bool isLoggedInUser)
         {
             return supervisorDataService.EnrolDelegateOnAssessment(delegateUserId, supervisorDelegateId, selfAssessmentId, completeByDate, selfAssessmentSupervisorRoleId, adminId, centreId, isLoggedInUser);

DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml

@@ -134,14 +134,4 @@
             View self assessments (@Model.SupervisorDelegateDetail.CandidateAssessmentCount)
         </a>
     }
-    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">
-            Confirm
-        </a>
-    }
 </div>