From 9496e79e61df3831c3d3da5419cd6d0383d513c2 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 19 Nov 2024 09:00:37 +0000 Subject: [PATCH] TD-4950 Corrects visibility of verify multiple results button --- .../Controllers/SupervisorController/Supervisor.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs index 63b44952dd..f9fe3ec0c3 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs @@ -12,7 +12,6 @@ using DigitalLearningSolutions.Web.Extensions; using DigitalLearningSolutions.Web.Helpers; using DigitalLearningSolutions.Web.ServiceFilter; - using DigitalLearningSolutions.Web.Services; using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage; using DigitalLearningSolutions.Web.ViewModels.Supervisor; using GDS.MultiPageFormData.Enums; @@ -368,6 +367,8 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int var competencyIds = reviewedCompetencies.Select(c => c.Id).ToArray(); var competencyFlags = frameworkService.GetSelectedCompetencyFlagsByCompetecyIds(competencyIds); var competencies = SupervisorCompetencyFilterHelper.FilterCompetencies(reviewedCompetencies, competencyFlags, searchModel); + delegateSelfAssessment.ResultsVerificationRequests = competencies.SelectMany(competency => competency.AssessmentQuestions) + .Count(question => question.Verified == null && question.UserIsVerifier == true); var searchViewModel = searchModel == null ? new SearchSupervisorCompetencyViewModel(supervisorDelegateId, searchModel?.SearchText, delegateSelfAssessment.ID, delegateSelfAssessment.IsSupervisorResultsReviewed, false, null, null) : searchModel.Initialise(searchModel.AppliedFilters, competencyFlags.ToList(), delegateSelfAssessment.IsSupervisorResultsReviewed, false); @@ -395,6 +396,7 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int (int)superviseDelegate.DelegateUserID ); } + var competencySummaries = CertificateHelper.CanViewCertificate(reviewedCompetencies, model.SupervisorSignOffs); model.CompetencySummaries = competencySummaries; ViewBag.SupervisorSelfAssessmentReview = delegateSelfAssessment.SupervisorSelfAssessmentReview; @@ -1389,7 +1391,7 @@ public IActionResult CompetencySelfAssessmentCertificatesupervisor(int candidate } var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value); var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault(); - if ( (checkSupervisorDelegate == null) ) + if ((checkSupervisorDelegate == null)) { return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); } @@ -1423,9 +1425,9 @@ public async Task DownloadCertificate(int candidateAssessmentId) { return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); } - var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value); - var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault(); - if (checkSupervisorDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value); + var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault(); + if (checkSupervisorDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); var delegateUserId = competencymaindata.LearnerId; var competencycount = selfAssessmentService.GetCompetencyCountSelfAssessmentCertificate(candidateAssessmentId); var accessors = selfAssessmentService.GetAccessor(competencymaindata.SelfAssessmentID, competencymaindata.LearnerId);