Merge pull request #2163 from TechnologyEnhancedLearning/Develop/fix/TD-2182-Course-Setup-list-to-use-SQL-filtering-IssueFix

TD-2182-Course Setup list to use SQL filtering-Issue fix

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -748,7 +748,7 @@ AND ap.DefaultContentTypeID <> 4
             if (sortBy == "CourseName" || sortBy == "SearchableName")
                 orderBy = " ORDER BY ap.ApplicationName + cu.CustomisationName " + sortOrder;
             else
-                orderBy = " ORDER BY " + sortBy;
+                orderBy = " ORDER BY " + sortBy + sortOrder + ", LTRIM(RTRIM(ap.ApplicationName)) + LTRIM(RTRIM(cu.CustomisationName))";
 
             orderBy += " OFFSET " + offSet + " ROWS FETCH NEXT " + itemsPerPage + " ROWS ONLY ";
 

DigitalLearningSolutions.Web.Tests/ViewModels/TrackingSystem/CourseSetup/CourseStatisticsViewModelFilterOptionsTests.cs

@@ -34,7 +34,7 @@ public class CourseStatisticsViewModelFilterOptionsTests
 
         private readonly FilterModel expectedStatusFilterViewModel = new FilterModel(
             "Active",
-            "Status",
+            "Active status",
             new[]
             {
                 new FilterOptionModel(

DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs

@@ -89,6 +89,7 @@ public IActionResult Index(
             int? itemsPerPage = 10
         )
         {
+            searchString = searchString == null ? string.Empty : searchString.Trim();
             sortBy ??= DefaultSortByOptions.Name.PropertyName;
             sortDirection ??= GenericSortingHelper.Ascending;
 
@@ -158,7 +159,7 @@ public IActionResult Index(
                             hasAdminFields = filterValue;
 
                         if (filter.Contains("HideInLearnerPortal"))
-                            hideInLearnerPortal = filterValue=="true" ? true:false;
+                            hideInLearnerPortal = filterValue == "true" ? true : false;
                     }
                 }
             }
@@ -717,16 +718,16 @@ private static IEnumerable<CourseStatisticsWithAdminFieldResponseCounts> UpdateC
             {
                 if (course.Archived || course.Active == false)
                 {
-                  course.NotActive = true;
+                    course.NotActive = true;
                 }
                 else
                 {
-                  course.NotActive = false;
+                    course.NotActive = false;
                 }
             }
 
             return updatedCourses;
         }
 
-  }
+    }
 }

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseStatisticsViewModelFilterOptions.cs

@@ -40,7 +40,7 @@ IEnumerable<string> topics
                     "Topic",
                     GetTopicOptions(topics)
                 ),
-                new FilterModel(nameof(CourseStatistics.Active), "Status", CourseStatusOptions,"course status"),
+                new FilterModel(nameof(CourseStatistics.Active), "Active status", CourseStatusOptions,"course status"),
                 new FilterModel(
                     nameof(CourseStatistics.HideInLearnerPortal),
                     "Visibility",