Skip to content

TD 4325 Added filter for optional #2860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2024
Merged

TD 4325 Added filter for optional #2860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ddf3a2
TD-4325 Added Filter For Optional
rshrirohit Sep 30, 2024
593a67b
TD-4325 Changes to logic have filters working with one another
rshrirohit Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions DigitalLearningSolutions.Web/Extensions/EnumExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public static string GetDescription(this SelfAssessmentCompetencyFilter status,
{
switch (status)
{
case SelfAssessmentCompetencyFilter.Optional:
return "Optional";
case SelfAssessmentCompetencyFilter.RequiresSelfAssessment:
return "Requires self assessment";
case SelfAssessmentCompetencyFilter.SelfAssessed:
Expand Down
18 changes: 10 additions & 8 deletions DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,23 @@ private static void ApplyResponseStatusFilters(ref IEnumerable<Competency> compe
{
var filteredCompetencies = competencies;
var appliedResponseStatusFilters = filters.Where(f => IsResponseStatusFilter(f));

if (appliedResponseStatusFilters.Any() || searchText.Length > 0)
{
var wordsInSearchText = searchText.Split().Where(w => w != string.Empty);
filters = appliedResponseStatusFilters;
filteredCompetencies = from c in competencies
let searchTextMatchesGroup = wordsInSearchText.All(w => c.CompetencyGroup?.Contains(w, StringComparison.CurrentCultureIgnoreCase) ?? false)
let searchTextMatchesCompetencyDescription = wordsInSearchText.All(w => c.Description?.Contains(w, StringComparison.CurrentCultureIgnoreCase) ?? false)
let searchTextMatchesCompetencyName = wordsInSearchText.All(w => c.Name?.Contains(w, StringComparison.CurrentCultureIgnoreCase) ?? false)
let responseStatusFilterMatchesAnyQuestion =
(filters.Contains((int)SelfAssessmentCompetencyFilter.RequiresSelfAssessment) && c.AssessmentQuestions.Any(q => q.ResultId == null))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.SelfAssessed) && c.AssessmentQuestions.Any(q => q.ResultId != null && q.Requested == null && q.SignedOff == null))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRequested) && c.AssessmentQuestions.Any(q => q.Verified == null && q.Requested != null))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRejected) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff != true))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.Verified) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff == true))
let responseStatusFilterMatchesAll =
(!filters.Contains((int)SelfAssessmentCompetencyFilter.RequiresSelfAssessment) || c.AssessmentQuestions.Any(q => q.ResultId == null))
&& (!filters.Contains((int)SelfAssessmentCompetencyFilter.SelfAssessed) || c.AssessmentQuestions.Any(q => q.ResultId != null && q.Requested == null && q.SignedOff == null))
&& (!filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRequested) || c.AssessmentQuestions.Any(q => q.Verified == null && q.Requested != null))
&& (!filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRejected) || c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff != 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)
&& (!appliedResponseStatusFilters.Any() || responseStatusFilterMatchesAll)
select c;
}
competencies = filteredCompetencies;
Expand Down Expand Up @@ -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,
Expand Down
Loading