Merge pull request #2761 from TechnologyEnhancedLearning/Develop/Features/TD-4324-IncludeOptionalintheFilteroptionsonthelearnercompetenciesmenu

TD-4324 Include "Optional" in the Filter options on the learner competencies menu

Author: rshrirohit

DigitalLearningSolutions.Data/Enums/SelfAssessmentCompetencyFilter.cs

@@ -2,6 +2,7 @@
 {
     public enum SelfAssessmentCompetencyFilter
     {
+        Optional = -11,
         AwaitingConfirmation = -10,
         PendingConfirmation = -9,
         RequiresSelfAssessment = -8,

DigitalLearningSolutions.Web/Helpers/SupervisorCompetencyFilterHelper.cs

@@ -48,6 +48,7 @@ private static void ApplyResponseStatusFilters(ref IEnumerable<Competency> compe
                                        || (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRejected) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff != true))
                                        || (filters.Contains((int)SelfAssessmentCompetencyFilter.AwaitingConfirmation) && c.AssessmentQuestions.Any(q => q.Verified == null && q.Requested != null && q.UserIsVerifier == true))
                                        || (filters.Contains((int)SelfAssessmentCompetencyFilter.Verified) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff == true))
+                                       ||  (filters.Contains((int)SelfAssessmentCompetencyFilter.Optional) && c.Optional )
                                        where (wordsInSearchText.Count() == 0 || searchTextMatchesGroup || searchTextMatchesCompetencyDescription || searchTextMatchesCompetencyName)
                                            && (!appliedResponseStatusFilters.Any() || responseStatusFilterMatchesAnyQuestion)
                                        select c;
@@ -111,6 +112,7 @@ public static bool IsResponseStatusFilter(int filter)
         {
             var responseStatusFilters = new int[]
             {
+                (int)SelfAssessmentCompetencyFilter.Optional,
                 (int)SelfAssessmentCompetencyFilter.RequiresSelfAssessment,
                 (int)SelfAssessmentCompetencyFilter.SelfAssessed,
                 (int)SelfAssessmentCompetencyFilter.Verified,