From 60f1ac667a73cbc165ab45db5f9c990d52061aad Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Mon, 7 Oct 2024 08:18:39 +0100 Subject: [PATCH 1/2] Fixes labelling of date range on last line of summary report --- DigitalLearningSolutions.Web/Services/ActivityService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web/Services/ActivityService.cs b/DigitalLearningSolutions.Web/Services/ActivityService.cs index 6b15e5e36b..5dee278ed3 100644 --- a/DigitalLearningSolutions.Web/Services/ActivityService.cs +++ b/DigitalLearningSolutions.Web/Services/ActivityService.cs @@ -140,7 +140,7 @@ public byte[] GetActivityDataFileForCentre(int centreId, ActivityFilterData filt last.DateInformation.GetDateRangeLabel( DateHelper.StandardDateFormat, filterData.EndDate ?? clockUtility.UtcNow, - true + false ), last.Enrolments, last.Completions, From 5acb15d1186ddc3f985c17cd3e23436bcf71ce7f Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Mon, 7 Oct 2024 09:05:59 +0100 Subject: [PATCH 2/2] Fixes test by providing correct end date for expected result --- .../Services/ActivityServiceTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web.Tests/Services/ActivityServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/ActivityServiceTests.cs index 97b953285f..ee4b6328e7 100644 --- a/DigitalLearningSolutions.Web.Tests/Services/ActivityServiceTests.cs +++ b/DigitalLearningSolutions.Web.Tests/Services/ActivityServiceTests.cs @@ -436,7 +436,7 @@ public void GetActivityDataFileForCentre_returns_expected_excel_data() var filterData = new ActivityFilterData( DateTime.Parse("2020-9-1"), - DateTime.Parse("2021-9-1"), + DateTime.Parse("2021-9-30"), null, null, null,