From cb631f987f340f6773b7bc3c3dcdbcd8f7c9f920 Mon Sep 17 00:00:00 2001 From: Martin Foster Date: Thu, 6 Oct 2022 12:46:37 +0100 Subject: [PATCH] Fixed signoff enabled & count to exclude Rejected. --- .../SelfAssessments/SelfAssessmentOverviewViewModel.cs | 2 +- .../SelfAssessments/SelfAssessmentOverview.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs index b094d90308..840a6de35f 100644 --- a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs @@ -24,7 +24,7 @@ public void Initialise(List unfilteredCompetencies) AllQuestionsVerifiedOrNotRequired = true; foreach (var assessmentQuestion in unfilteredCompetencies.SelectMany(c => c.AssessmentQuestions)) { - if ((assessmentQuestion.Result == null || assessmentQuestion.Verified == null) && assessmentQuestion.Required) + if ((assessmentQuestion.Result == null || assessmentQuestion.Verified == null || assessmentQuestion.SignedOff != true) && assessmentQuestion.Required) { AllQuestionsVerifiedOrNotRequired = false; break; diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml index 103b879ec2..0aa044d222 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml @@ -17,7 +17,7 @@ var competencySummaries = from g in Model.CompetencyGroups let questions = g.SelectMany(c => c.AssessmentQuestions).Where(q => q.Required) let selfAssessedCount = questions.Count(q => q.ResultId.HasValue) - let verifiedCount = questions.Count(q => q.Verified.HasValue) + let verifiedCount = questions.Count(q => q.Verified.HasValue && q.SignedOff is true) select new ViewDataDictionary(ViewData) { { "isSupervisorResultsReviewed", Model.SelfAssessment.IsSupervisorResultsReviewed },