Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -393,7 +393,7 @@ LEFT JOIN UserCentreDetails ucd
         public IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID)
         {
             return connection.Query<SupervisorForEnrolDelegate>(
-                $@"SELECT AdminID, Forename + ' ' + Surname + ' (' + CentreName +')' AS Name, Email FROM AdminUsers AS au
+                $@"SELECT AdminID, Forename + ' ' + Surname + ' (' + Email +'),' + ' ' + CentreNameAS Name, Email FROM AdminUsers AS au
                     WHERE (Supervisor = 1) AND (CentreID = @CentreID) AND (CategoryID = 0 OR
                          CategoryID = (SELECT au.CategoryID FROM Applications AS a INNER JOIN
                            Customisations AS c ON a.ApplicationID = c.ApplicationID
@@ -1201,4 +1201,4 @@ FROM CandidateAssessments AS CA
                         WHERE CA.ID = @candidateAssessmentId AND NonReportable = 0 ", new { candidateAssessmentId });
         }
     }
-}
+}

DigitalLearningSolutions.Data/Models/SessionData/Tracking/Delegate/Enrol/SessionEnrolDelegate.cs

@@ -13,6 +13,7 @@ public class SessionEnrolDelegate
         public string? SelfAssessmentSupervisorRoleName { get; set; }
         public int? SupervisorID { get; set; }
         public string? SupervisorName { get; set; }
+        public string? SupervisorEmail { get; set; }
         public bool IsSelfAssessment { get; set; }
         public int AssessmentVersion { get; set; }
     }

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/EnrolController.cs

@@ -255,6 +255,7 @@ public IActionResult EnrolDelegateSupervisor(int delegateId, EnrolSupervisorView
             {
                 sessionEnrol.SupervisorName = supervisorList.FirstOrDefault(x => x.AdminId == model.SelectedSupervisor).Name;
                 sessionEnrol.SupervisorID = model.SelectedSupervisor;
+                sessionEnrol.SupervisorEmail = supervisorList.FirstOrDefault(x => x.AdminId == model.SelectedSupervisor).Email;
             }
             if (model.SelectedSupervisorRoleId.HasValue && model.SelectedSupervisorRoleId.Value > 0)
             {
@@ -291,6 +292,7 @@ public IActionResult EnrolDelegateSummary(int delegateId)
 
             var model = new EnrolSummaryViewModel();
             model.SupervisorName = sessionEnrol.SupervisorName;
+            model.SupervisorEmail = sessionEnrol.SupervisorEmail;
             model.ActivityName = sessionEnrol.AssessmentName;
             model.CompleteByDate = sessionEnrol.CompleteByDate;
             model.DelegateId = delegateId;
@@ -315,12 +317,11 @@ public IActionResult EnrolDelegateSummary()
             }
             else
             {
-                var adminEmail = User.GetUserPrimaryEmailKnownNotNull();
                 var selfAssessmentId = enrolService.EnrolOnActivitySelfAssessment(
                     sessionEnrol.AssessmentID.GetValueOrDefault(),
                     delegateId,
                     sessionEnrol.SupervisorID.GetValueOrDefault(),
-                    adminEmail,
+                    sessionEnrol.SupervisorEmail,
                     sessionEnrol.SelfAssessmentSupervisorRoleId.GetValueOrDefault(),
                     sessionEnrol.CompleteByDate,
                     (int)sessionEnrol.DelegateUserID,

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/Enrol/EnrolDelegateSummaryViewModel.cs

@@ -9,6 +9,7 @@ public class EnrolSummaryViewModel
         public string? ActivityName { get; set; }
         public DateTime? CompleteByDate { get; set; }
         public string? SupervisorName { get; set; }
+        public string? SupervisorEmail { get; set; }
         public string? SupervisorRoleName { get; set; }
         public bool? IsMandatory { get; set; }
         public string? ValidFor { get; set; }