Merge pull request #3420 from TechnologyEnhancedLearning/Develop/Fixes/TD-6442-Requireself-assessmentfilterdoesnotreturnthecorrectresultswhentheresultsareclearedandfiltered

rshrirohit · web-flow · commit d0bcf99ae49c · 2025-11-24T12:08:45.000Z
TD-6442 Require self-assessment filter does not return the correct results when the results are cleared and filtered
diff --git a/DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs b/DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs
@@ -54,7 +54,7 @@ bool MatchesSearch(Competency c) =>
             // Define reusable filter checks
             var filterChecks = new Dictionary<SelfAssessmentCompetencyFilter, Func<Competency, bool>>
             {
-                [SelfAssessmentCompetencyFilter.RequiresSelfAssessment] = c => c.AssessmentQuestions.Any(q => q.ResultId == null),
+                [SelfAssessmentCompetencyFilter.RequiresSelfAssessment] = c => c.AssessmentQuestions.Any(q => q.ResultId == null || q.Result == null),
                 [SelfAssessmentCompetencyFilter.SelfAssessed] = c => c.AssessmentQuestions.Any(q => q.ResultId != null && q.Requested == null && q.SignedOff == null),
                 [SelfAssessmentCompetencyFilter.ConfirmationRequested] = c => c.AssessmentQuestions.Any(q => q.Verified == null && q.Requested != null),
                 [SelfAssessmentCompetencyFilter.ConfirmationRejected] = c => c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff != true),

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ bool MatchesSearch(Competency c) =>`
`54`	`54`	`// Define reusable filter checks`
`55`	`55`	`var filterChecks = new Dictionary<SelfAssessmentCompetencyFilter, Func<Competency, bool>>`
`56`	`56`	`{`
`57`		`- [SelfAssessmentCompetencyFilter.RequiresSelfAssessment] = c => c.AssessmentQuestions.Any(q => q.ResultId == null),`
	`57`	`+ [SelfAssessmentCompetencyFilter.RequiresSelfAssessment] = c => c.AssessmentQuestions.Any(q => q.ResultId == null \|\| q.Result == null),`
`58`	`58`	`[SelfAssessmentCompetencyFilter.SelfAssessed] = c => c.AssessmentQuestions.Any(q => q.ResultId != null && q.Requested == null && q.SignedOff == null),`
`59`	`59`	`[SelfAssessmentCompetencyFilter.ConfirmationRequested] = c => c.AssessmentQuestions.Any(q => q.Verified == null && q.Requested != null),`
`60`	`60`	`[SelfAssessmentCompetencyFilter.ConfirmationRejected] = c => c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff != true),`