Skip to content

Commit 84ed4ae

Browse files
authored
Merge pull request #2918 from TechnologyEnhancedLearning/Develop/Fix/TD-4495-Issue-with-adding-the-filters
TD-4495-Issue with adding the filters on 'Centre administrators' screen for 'Bedfordshire Hospitals NHS Trust' centre
2 parents d3d98e7 + b277e24 commit 84ed4ae

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202411051212)]
6+
public class UpdateCourseCategories : ForwardOnlyMigration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(@$"UPDATE CourseCategories SET CategoryName = LTRIM(RTRIM(CategoryName))");
11+
}
12+
13+
}
14+
}

DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ function updateAppliedFilters(existingFilterString: string, possibleFilters: IAp
262262

263263
function getMatchingFilterTag(possibleFilters: IAppliedFilterTag[], filter: string): Element {
264264
const appliedFilterTag = <IAppliedFilterTag>possibleFilters.find(
265-
(pf) => pf.filterValue === filter,
265+
(pf) => pf.filterValue === filter.trim(),
266266
);
267267
return appliedFilterTag.element;
268268
}

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/AdministratorsViewModelFilterOptions.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
99
using DigitalLearningSolutions.Data.Models.User;
1010
using DigitalLearningSolutions.Web.Helpers.FilterOptions;
11-
using DigitalLearningSolutions.Web.Models.Enums;
12-
using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage;
1311

1412
public static class AdministratorsViewModelFilterOptions
1513
{
@@ -51,7 +49,7 @@ public static IEnumerable<FilterOptionModel> GetCategoryOptions(IEnumerable<stri
5149

5250
public static List<FilterModel> GetAllAdministratorsFilterModels(IEnumerable<Category> categories)
5351
{
54-
var categoryStrings = categories.Select(c => c.CategoryName);
52+
var categoryStrings = categories.Select(c => c.CategoryName.Trim());
5553
categoryStrings = categoryStrings.Prepend("All");
5654
var filters = new List<FilterModel>
5755
{

0 commit comments

Comments
 (0)