Skip to content

Commit 3ddf3a2

Browse files
committed
TD-4325 Added Filter For Optional
1 parent 97783c5 commit 3ddf3a2

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

DigitalLearningSolutions.Web/Extensions/EnumExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ public static string GetDescription(this SelfAssessmentCompetencyFilter status,
1919
{
2020
switch (status)
2121
{
22+
case SelfAssessmentCompetencyFilter.Optional:
23+
return "Optional";
2224
case SelfAssessmentCompetencyFilter.RequiresSelfAssessment:
2325
return "Requires self assessment";
2426
case SelfAssessmentCompetencyFilter.SelfAssessed:

DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ private static void ApplyResponseStatusFilters(ref IEnumerable<Competency> compe
4848
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRequested) && c.AssessmentQuestions.Any(q => q.Verified == null && q.Requested != null))
4949
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRejected) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff != true))
5050
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.Verified) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff == true))
51+
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.Optional) && c.Optional)
5152
where (wordsInSearchText.Count() == 0 || searchTextMatchesGroup || searchTextMatchesCompetencyDescription || searchTextMatchesCompetencyName)
5253
&& (!appliedResponseStatusFilters.Any() || responseStatusFilterMatchesAnyQuestion)
5354
select c;
@@ -111,6 +112,7 @@ public static bool IsResponseStatusFilter(int filter)
111112
{
112113
var responseStatusFilters = new int[]
113114
{
115+
(int)SelfAssessmentCompetencyFilter.Optional,
114116
(int)SelfAssessmentCompetencyFilter.RequiresSelfAssessment,
115117
(int)SelfAssessmentCompetencyFilter.SelfAssessed,
116118
(int)SelfAssessmentCompetencyFilter.Verified,

0 commit comments

Comments
 (0)