Merge pull request #2156 from TechnologyEnhancedLearning/Develop/fix/TD-2180-Search-IssueFix

TD-2180-Search text with spaces fixed.

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -727,7 +727,7 @@ LEFT JOIN CoursePrompts AS cp3 WITH (NOLOCK)
                         AND (cu.CentreID = @centreId OR (cu.AllCentres = 1 AND ca.Active = @allCentreCourses))
                         AND ca.CentreID = @centreId
                         AND ap.DefaultContentTypeID <> 4
-                        AND ( ap.ApplicationName + ' ' + ' ' + cu.CustomisationName LIKE N'%' + @searchString + N'%')
+                        AND ( ap.ApplicationName + IIF(cu.CustomisationName IS NULL, '', ' - ' + cu.CustomisationName) LIKE N'%' + @searchString + N'%')
                         AND ((@isActive = 'Any') OR (@isActive = 'true' AND (cu.Active = 1 AND ap.ArchivedDate IS NULL)) OR (@isActive = 'false' AND ((cu.Active = 0 OR ap.ArchivedDate IS NOT NULL))))
                         AND ((@categoryName = 'Any') OR (cc.CategoryName = @categoryName))
                         AND ((@courseTopic = 'Any') OR (ct.CourseTopic = @courseTopic))

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/DelegateCoursesController.cs

@@ -60,6 +60,7 @@ public IActionResult Index(
             int? itemsPerPage = 10
         )
         {
+            searchString = searchString == null ? string.Empty : searchString.Trim();
             sortBy ??= DefaultSortByOptions.Name.PropertyName;
             sortDirection ??= GenericSortingHelper.Ascending;
 
@@ -130,13 +131,13 @@ public IActionResult Index(
                 }
             }
 
-            var (courses, resultCount)= courseService.GetCentreCourses(searchString ?? string.Empty, offSet, (int)itemsPerPage, sortBy, sortDirection, centreId, categoryId, true,null,
+            var (courses, resultCount) = courseService.GetCentreCourses(searchString ?? string.Empty, offSet, (int)itemsPerPage, sortBy, sortDirection, centreId, categoryId, true, null,
                                                             isActive, categoryName, courseTopic, hasAdminFields);
             if (courses.Count() == 0 && resultCount > 0)
             {
                 page = 1;
                 offSet = 0;
-                (courses, resultCount) = courseService.GetCentreCourses(searchString ?? string.Empty, offSet, (int)itemsPerPage, sortBy, sortDirection, centreId, categoryId, true,null,
+                (courses, resultCount) = courseService.GetCentreCourses(searchString ?? string.Empty, offSet, (int)itemsPerPage, sortBy, sortDirection, centreId, categoryId, true, null,
                                                             isActive, categoryName, courseTopic, hasAdminFields);
             }