Merge branch 'DLS-Release-v1.2.4' into UAT

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/NotificationService.cs

@@ -159,7 +159,11 @@ int numLearningLogItemsAffected
                     " Note: This message has been copied to the administrator(s) managing this activity, for their information.";
             }
 
-            const string emailSubjectLine = "Digital Learning Solutions Activity Complete";
+            string courseName = progressCompletionData.CourseName.Length > 30
+                                ? progressCompletionData.CourseName.Substring(0, 30)
+                                : progressCompletionData.CourseName;
+
+            string emailSubjectLine = $"Digital Learning Solutions Activity Complete - {courseName}";
             var delegateNameOrGenericTitle = progress.DelegateFirstName ?? "Digital Learning Solutions Delegate";
             var emailsToCc = GetEmailsToCc(
                 progressCompletionData.AdminId,

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/LearningPortal/Available/ConfirmRetirement.cshtml

@@ -20,9 +20,9 @@
     {
       <vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
     }
-    <h1 id="page-heading">Confirm Retirement</h1>
+    <h1 id="page-heading">Confirm Enrolment</h1>
             <p class="nhsuk-body-m">You are about to enrol on a retiring <strong>@Model.Name</strong> self-assessment.</p>
-            <p class="nhsuk-body-m">     Retirement date:   <strong>@Model.RetirementDate?.ToString("dd MMMM yyyy")</strong>  </p>
+            <p class="nhsuk-body-m">     Retirement date:   <strong>@Model.RetirementDate?.ToString("dd/MM/yyyy")</strong>  </p>
             <p class="nhsuk-body-m">After this date, the <strong>@Model.Name</strong> self-assessment will no longer be accessible.</p>
 
             <p class="nhsuk-body-m">Please consider:</p>

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageSupervisors.cshtml

@@ -23,7 +23,8 @@
 <link rel="stylesheet" href="@Url.Content("~/css/learningPortal/selfAssessment.css")" asp-append-version="true">
 <h1>@Model.SelfAssessment.Name - Manage Supervisors</h1>
 
-@if (Model.SelfAssessment.ManageSupervisorsDescription != null)
+@* Temporarily hidden - TD-5638 *@
+@* @if (Model.SelfAssessment.ManageSupervisorsDescription != null)
 {
     <div class="nhsuk-warning-callout">
         <h3 class="nhsuk-warning-callout__label">
@@ -36,7 +37,7 @@
             @Html.Raw(Model.SelfAssessment.ManageSupervisorsDescription)
         </p>
     </div>
-}
+} *@
 
 @if (Model.Supervisors.Any())
 {

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_SelfAssessmentCertificateSecondPage.cshtml

@@ -23,12 +23,12 @@
             </p>
         </div>
         <div class="activity">
-            <p><b>Responses confirmed by nominated supervisor</b></p> <p>
+            <p><b>Number of confirmed responses</b></p> <p>
                 @Model.ConfirmedResponses
             </p>
         </div>
         <div class="activity">
-            <p><b>Nominated supervisors</b></p><ul>
+            <p><b>Individual @Model.VocabPlural.ToLower() signed off by</b></p><ul>
                 @foreach (var accessor in Model.Accessors)
                 {
                     <p>

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>