Skip to content

TD-4495-Issue with adding the filters on 'Centre administrators' screen for 'Bedfordshire Hospitals NHS Trust' centre #2918

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
rshrirohit merged 1 commit into from
Nov 6, 2024
Merged

TD-4495-Issue with adding the filters on 'Centre administrators' screen for 'Bedfordshire Hospitals NHS Trust' centre #2918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions DigitalLearningSolutions.Data.Migrations/202411051212_UpdateCourseCategories.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202411051212)]
public class UpdateCourseCategories : ForwardOnlyMigration
{
public override void Up()
{
Execute.Sql(@$"UPDATE CourseCategories SET CategoryName = LTRIM(RTRIM(CategoryName))");
}

}
}
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function updateAppliedFilters(existingFilterString: string, possibleFilters: IAp

function getMatchingFilterTag(possibleFilters: IAppliedFilterTag[], filter: string): Element {
const appliedFilterTag = <IAppliedFilterTag>possibleFilters.find(
(pf) => pf.filterValue === filter,
(pf) => pf.filterValue === filter.trim(),
);
return appliedFilterTag.element;
}
Expand Down
4 changes: 1 addition & 3 deletions ...eb/ViewModels/TrackingSystem/Centre/Administrator/AdministratorsViewModelFilterOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
using DigitalLearningSolutions.Data.Models.User;
using DigitalLearningSolutions.Web.Helpers.FilterOptions;
using DigitalLearningSolutions.Web.Models.Enums;
using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage;

public static class AdministratorsViewModelFilterOptions
{
Expand Down Expand Up @@ -51,7 +49,7 @@ public static IEnumerable<FilterOptionModel> GetCategoryOptions(IEnumerable<stri

public static List<FilterModel> GetAllAdministratorsFilterModels(IEnumerable<Category> categories)
{
var categoryStrings = categories.Select(c => c.CategoryName);
var categoryStrings = categories.Select(c => c.CategoryName.Trim());
categoryStrings = categoryStrings.Prepend("All");
var filters = new List<FilterModel>
{
Expand Down