|
12 | 12 | using DigitalLearningSolutions.Web.Extensions; |
13 | 13 | using DigitalLearningSolutions.Web.Helpers; |
14 | 14 | using DigitalLearningSolutions.Web.ServiceFilter; |
15 | | - using DigitalLearningSolutions.Web.Services; |
16 | 15 | using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage; |
17 | 16 | using DigitalLearningSolutions.Web.ViewModels.Supervisor; |
18 | 17 | using GDS.MultiPageFormData.Enums; |
@@ -368,6 +367,8 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int |
368 | 367 | var competencyIds = reviewedCompetencies.Select(c => c.Id).ToArray(); |
369 | 368 | var competencyFlags = frameworkService.GetSelectedCompetencyFlagsByCompetecyIds(competencyIds); |
370 | 369 | var competencies = SupervisorCompetencyFilterHelper.FilterCompetencies(reviewedCompetencies, competencyFlags, searchModel); |
| 370 | + delegateSelfAssessment.ResultsVerificationRequests = competencies.SelectMany(competency => competency.AssessmentQuestions) |
| 371 | + .Count(question => question.Verified == null && question.UserIsVerifier == true); |
371 | 372 | var searchViewModel = searchModel == null ? |
372 | 373 | new SearchSupervisorCompetencyViewModel(supervisorDelegateId, searchModel?.SearchText, delegateSelfAssessment.ID, delegateSelfAssessment.IsSupervisorResultsReviewed, false, null, null) |
373 | 374 | : searchModel.Initialise(searchModel.AppliedFilters, competencyFlags.ToList(), delegateSelfAssessment.IsSupervisorResultsReviewed, false); |
@@ -395,6 +396,7 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int |
395 | 396 | (int)superviseDelegate.DelegateUserID |
396 | 397 | ); |
397 | 398 | } |
| 399 | + |
398 | 400 | var competencySummaries = CertificateHelper.CanViewCertificate(reviewedCompetencies, model.SupervisorSignOffs); |
399 | 401 | model.CompetencySummaries = competencySummaries; |
400 | 402 | ViewBag.SupervisorSelfAssessmentReview = delegateSelfAssessment.SupervisorSelfAssessmentReview; |
@@ -1389,7 +1391,7 @@ public IActionResult CompetencySelfAssessmentCertificatesupervisor(int candidate |
1389 | 1391 | } |
1390 | 1392 | var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value); |
1391 | 1393 | var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault(); |
1392 | | - if ( (checkSupervisorDelegate == null) ) |
| 1394 | + if ((checkSupervisorDelegate == null)) |
1393 | 1395 | { |
1394 | 1396 | return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); |
1395 | 1397 | } |
@@ -1423,9 +1425,9 @@ public async Task<IActionResult> DownloadCertificate(int candidateAssessmentId) |
1423 | 1425 | { |
1424 | 1426 | return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); |
1425 | 1427 | } |
1426 | | - var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value); |
1427 | | - var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault(); |
1428 | | - if (checkSupervisorDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); |
| 1428 | + var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value); |
| 1429 | + var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault(); |
| 1430 | + if (checkSupervisorDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); |
1429 | 1431 | var delegateUserId = competencymaindata.LearnerId; |
1430 | 1432 | var competencycount = selfAssessmentService.GetCompetencyCountSelfAssessmentCertificate(candidateAssessmentId); |
1431 | 1433 | var accessors = selfAssessmentService.GetAccessor(competencymaindata.SelfAssessmentID, competencymaindata.LearnerId); |
|
0 commit comments