Skip to content

TD-4469 Merging into correct branch #2771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: TD-4469 Adds usage detail tab to centre course report export
merged 1 commit into from
Aug 8, 2024
Merged

TD-4469 Merging into correct branch #2771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Binary file modified DigitalLearningSolutions.Web.Tests/TestData/ActivityDataDownloadTest.xlsx
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions DigitalLearningSolutions.Web/Services/ActivityService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand Down