TD-149-service method added to get supervisor delegates detail

Author: Auldrin-Possa

DigitalLearningSolutions.Data/DataServices/SupervisorService.cs

@@ -16,6 +16,7 @@ public interface ISupervisorService
         DashboardData? GetDashboardDataForAdminId(int adminId);
         IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminId(int adminId);
         SupervisorDelegateDetail GetSupervisorDelegateDetailsById(int supervisorDelegateId, int adminId, int delegateUserId);
+        SupervisorDelegate GetSupervisorDelegate(int adminId, int delegateUserId);
         int? ValidateDelegate(int centreId, string delegateEmail);
         IEnumerable<DelegateSelfAssessment> GetSelfAssessmentsForSupervisorDelegateId(int supervisorDelegateId, int adminId);
         DelegateSelfAssessment? GetSelfAssessmentByCandidateAssessmentId(int candidateAssessmentId, int adminId);
@@ -347,6 +348,18 @@ INNER JOIN DelegateAccounts da
             return supervisorDelegateDetail!;
         }
 
+        public SupervisorDelegate GetSupervisorDelegate(int adminId, int delegateUserId)
+        {
+            var supervisorDelegateDetail = connection.Query<SupervisorDelegate>(
+                $@"SELECT ID,SupervisorAdminID,DelegateEmail,Added,NotificationSent,Removed,
+                    SupervisorEmail,AddedByDelegate,InviteHash,DelegateUserID
+                    FROM SupervisorDelegates
+                    WHERE DelegateUserID = @delegateUserId AND SupervisorAdminID = @adminId ", new { adminId, delegateUserId }
+            ).FirstOrDefault();
+
+            return supervisorDelegateDetail!;
+        }
+
         public int? ValidateDelegate(int centreId, string delegateEmail)
         {
             int? delegateUserId = (int?)connection.ExecuteScalar(

DigitalLearningSolutions.Web/Controllers/LearningPortalController/Current.cs

@@ -360,6 +360,7 @@ public IActionResult CompetencySelfAssessmentCertificate(int candidateAssessment
             }
 
             var delegateUserId = competencymaindata.LearnerId;
+            var supervisorDelegate = supervisorService.GetSupervisorDelegate(User.GetAdminIdKnownNotNull(), delegateUserId);
 
             var recentResults = selfAssessmentService.GetMostRecentResults(competencymaindata.SelfAssessmentID, competencymaindata.LearnerDelegateAccountId).ToList();
             var supervisorSignOffs = selfAssessmentService.GetSupervisorSignOffsForCandidateAssessment(competencymaindata.SelfAssessmentID, delegateUserId);
@@ -410,8 +411,7 @@ public IActionResult CompetencySelfAssessmentCertificate(int candidateAssessment
             ViewBag.CompetencySummaries = competencySummaries;
             var activitySummaryCompetencySelfAssesment = selfAssessmentService.GetActivitySummaryCompetencySelfAssesment(competencymaindata.Id);
             var model = new CompetencySelfAssessmentCertificateViewModel(competencymaindata, competencycount, route, accessors, activitySummaryCompetencySelfAssesment, roleCount);
-            ViewBag.LoggedInSupervisorDelegatesId = TempData["CertificateSupervisorDelegateId"];
-            TempData.Remove("CertificateSupervisorDelegateId");
+            ViewBag.LoggedInSupervisorDelegatesId = supervisorDelegate.ID;
             return View("Current/CompetencySelfAssessmentCertificate", model);
         }
         [Route("DownloadCertificate")]

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -368,7 +368,6 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int
             ViewBag.CanViewCertificate = CertificateHelper.CanViewCertificate(reviewedCompetencies, model.SupervisorSignOffs);
             ViewBag.SupervisorSelfAssessmentReview = delegateSelfAssessment.SupervisorSelfAssessmentReview;
             ViewBag.navigatedFrom = selfAssessmentResultId == null;
-            TempData["CertificateSupervisorDelegateId"] = supervisorDelegateId;
             return View("ReviewSelfAssessment", model);
         }
         [HttpPost]