Revert "Revert "TD-2180 - query param added to reuse query in the course setup.""

This reverts commit 011fbb0.

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -623,7 +623,7 @@ public IEnumerable<CourseStatistics> GetCourseStatisticsAtCentreFilteredByCatego
             );
         }
 
-        public (IEnumerable<CourseStatistics>, int) GetCourseStatisticsAtCentre(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection, int centreId, int? categoryId,
+        public (IEnumerable<CourseStatistics>, int) GetCourseStatisticsAtCentre(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection, int centreId, int? categoryId, bool allCentreCourses, bool? hideInLearnerPortal,
             string isActive, string categoryName, string courseTopic, string hasAdminFields
         )
         {
@@ -671,7 +671,7 @@ LEFT JOIN CoursePrompts AS cp3 WITH (NOLOCK)
 			            ON cu.CourseField3PromptID = cp3.CoursePromptID
 
                     WHERE (ap.CourseCategoryID = @categoryId OR @categoryId IS NULL)
-                        AND (cu.CentreID = @centreId OR (cu.AllCentres = 1 AND ca.Active = 1))
+                        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'%')
@@ -681,6 +681,8 @@ AND ap.DefaultContentTypeID <> 4
                         AND ((@hasAdminFields = 'Any') OR (@hasAdminFields = 'true' AND (cp1.CoursePrompt IS NOT NULL OR cp2.CoursePrompt IS NOT NULL OR cp3.CoursePrompt IS NOT NULL))
                                                        OR (@hasAdminFields = 'false' AND (cp1.CoursePrompt IS NULL AND cp2.CoursePrompt IS NULL AND cp3.CoursePrompt IS NULL)))";
 
+            if (hideInLearnerPortal != null)
+                courseStatisticsFromTable += " AND cu.HideInLearnerPortal = @hideInLearnerPortal";
 
             string orderBy;
             string sortOrder;
@@ -710,6 +712,8 @@ AND ap.DefaultContentTypeID <> 4
                     sortDirection,
                     centreId,
                     categoryId,
+                    allCentreCourses,
+                    hideInLearnerPortal,
                     isActive,
                     categoryName,
                     courseTopic,
@@ -731,6 +735,8 @@ AND ap.DefaultContentTypeID <> 4
                     sortDirection,
                     centreId,
                     categoryId,
+                    allCentreCourses,
+                    hideInLearnerPortal,
                     isActive,
                     categoryName,
                     courseTopic,

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

@@ -130,13 +130,13 @@ public IActionResult Index(
                 }
             }
 
-            var (courses, resultCount)= courseService.GetCentreCourses(searchString ?? string.Empty, offSet, (int)itemsPerPage, sortBy, sortDirection, centreId, categoryId,
+            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,
+                (courses, resultCount) = courseService.GetCentreCourses(searchString ?? string.Empty, offSet, (int)itemsPerPage, sortBy, sortDirection, centreId, categoryId, true,null,
                                                             isActive, categoryName, courseTopic, hasAdminFields);
             }
 

DigitalLearningSolutions.Web/Services/CourseService.cs

@@ -7,6 +7,7 @@
     using DigitalLearningSolutions.Data.Models;
     using DigitalLearningSolutions.Data.Models.Courses;
     using DigitalLearningSolutions.Data.Utilities;
+    using DocumentFormat.OpenXml.Spreadsheet;
 
     public interface ICourseService
     {
@@ -102,7 +103,7 @@ int diagCompletionThreshold
 
         LearningLog? GetLearningLogDetails(int progressId);
 
-        public (IEnumerable<CourseStatisticsWithAdminFieldResponseCounts>, int) GetCentreCourses(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection, int centreId, int? categoryId,
+        public (IEnumerable<CourseStatisticsWithAdminFieldResponseCounts>, int) GetCentreCourses(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection, int centreId, int? categoryId, bool allCentreCourses, bool? hideInLearnerPortal,
            string isActive, string categoryName, string courseTopic, string hasAdminFields);
     }
 
@@ -365,10 +366,10 @@ public CentreCourseDetails GetCentreCourseDetails(int centreId, int? categoryId)
 
 
 
-        public (IEnumerable<CourseStatisticsWithAdminFieldResponseCounts>, int) GetCentreCourses(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection, int centreId, int? categoryId,
+        public (IEnumerable<CourseStatisticsWithAdminFieldResponseCounts>, int) GetCentreCourses(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection, int centreId, int? categoryId, bool allCentreCourses, bool? hideInLearnerPortal,
            string isActive, string categoryName, string courseTopic, string hasAdminFields)
         {
-            var (allCourses, resultCount) = courseDataService.GetCourseStatisticsAtCentre(searchString, offSet, itemsPerPage, sortBy, sortDirection,  centreId, categoryId,
+            var (allCourses, resultCount) = courseDataService.GetCourseStatisticsAtCentre(searchString, offSet, itemsPerPage, sortBy, sortDirection,  centreId, categoryId, allCentreCourses, hideInLearnerPortal,
            isActive, categoryName, courseTopic, hasAdminFields);
 
             return (allCourses.Select(