Merge pull request #2771 from TechnologyEnhancedLearning/Develop/Features/TD-4469CourseReportDetail

TD-4469 Merging into correct branch

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs

@@ -102,9 +102,9 @@ public int GetActivityDetailRowCount(
         {
             return connection.QuerySingleOrDefault<int>(
                 @"SELECT COUNT(1) FROM
-                                 tActivityLog AS al
+                                 tActivityLog AS al INNER JOIN DelegateAccounts AS da ON al.CandidateID = da.ID
                         WHERE(al.LogDate >= @startDate) AND(@endDate IS NULL OR
-                                 al.LogDate <= @endDate) AND(al.CentreID = @centreId) AND(@jobGroupId IS NULL OR
+                                 al.LogDate <= @endDate) AND(al.CentreID = @centreId) AND (da.CentreID = @centreId) AND (@jobGroupId IS NULL OR
                                  al.JobGroupID = @jobGroupId) AND(@customisationId IS NULL OR
                                  al.CustomisationID = @customisationId) AND(@courseCategoryId IS NULL OR
                                  al.CourseCategoryID = @courseCategoryId) AND(al.Registered = 1 OR
@@ -160,7 +160,7 @@ Users AS u INNER JOIN
                                  DelegateAccounts AS da ON u.ID = da.UserID ON al.CandidateID = da.ID INNER JOIN
                                  Customisations AS c ON al.CustomisationID = c.CustomisationID
                     WHERE (al.LogDate >= @startDate) AND (@endDate IS NULL OR
-                                 al.LogDate <= @endDate) AND (al.CentreID = @centreId) AND (@jobGroupId IS NULL OR
+                                 al.LogDate <= @endDate) AND (al.CentreID = @centreId) AND (da.CentreID = @centreId) AND (@jobGroupId IS NULL OR
                                  al.JobGroupID = @jobGroupId) AND (@customisationId IS NULL OR
                                  al.CustomisationID = @customisationId) AND (@courseCategoryId IS NULL OR
                                  al.CourseCategoryID = @courseCategoryId) AND (al.Registered = 1 OR

DigitalLearningSolutions.Web.Tests/TestData/ActivityDataDownloadTest.xlsx

@@ -227,6 +227,10 @@ private void AddActivityDetailSheet(XLWorkbook workbook, int centreId, ActivityF
         {
             var itemsPerPage = Data.Extensions.ConfigurationExtensions.GetExportQueryRowLimit(configuration);
             var resultCount = GetActivityDetailRowCount(centreId, filterData);
+            if (resultCount == 0)
+            {
+                return;
+            }
             int totalRun = (int)(resultCount / itemsPerPage) + ((resultCount % itemsPerPage) > 0 ? 1 : 0);
             int currentRun = 1;
             List<ActivityLogDetail> activityLogDetails = new List<ActivityLogDetail>();