Merge pull request #2448 from TechnologyEnhancedLearning/Develop/fix/TD-1988-All-centre-learners-progress-on-DCSA

TD-1988- Show all centre learners progress on DCSA reports, regardless of which centre enrolled

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/DCSAReportDataService.cs

@@ -8,8 +8,8 @@
 
     public interface IDCSAReportDataService
     {
-        IEnumerable<DCSADelegateCompletionStatus> GetDelegateCompletionStatusForCentre(int centreId);
-        IEnumerable<DCSAOutcomeSummary> GetOutcomeSummaryForCentre(int centreId);
+        IEnumerable<DCSADelegateCompletionStatus> GetDelegateCompletionStatus();
+        IEnumerable<DCSAOutcomeSummary> GetOutcomeSummary();
     }
     public partial class DCSAReportDataService : IDCSAReportDataService
     {
@@ -21,7 +21,7 @@ public DCSAReportDataService(IDbConnection connection, ILogger<SelfAssessmentDat
             this.connection = connection;
             this.logger = logger;
         }
-        public IEnumerable<DCSAOutcomeSummary> GetOutcomeSummaryForCentre(int centreId)
+        public IEnumerable<DCSAOutcomeSummary> GetOutcomeSummary()
         {
             return connection.Query<DCSAOutcomeSummary>(
                 @"SELECT DATEPART(month, caa.StartedDate) AS EnrolledMonth, DATEPART(yyyy, caa.StartedDate) AS EnrolledYear, jg.JobGroupName AS JobGroup, ca.Answer1 AS CentreField1, ca.Answer2 AS CentreField2, ca.Answer3 AS CentreField3, CASE WHEN (caa.SubmittedDate IS NOT NULL) 
@@ -107,24 +107,20 @@ FROM    SelfAssessmentResults AS sar INNER JOIN
                 FROM   Candidates AS ca INNER JOIN
                              CandidateAssessments AS caa ON ca.UserID = caa.DelegateUserID AND ca.CentreID = caa.CentreID INNER JOIN Users AS u ON caa.DelegateUserID = u.ID INNER JOIN
                              JobGroups AS jg ON u.JobGroupID = jg.JobGroupID
-                WHERE (ca.Active = 1) AND (ca.CentreID = @centreId) AND (caa.SelfAssessmentID = 1)
-                ORDER BY EnrolledYear DESC, EnrolledMonth DESC, JobGroup, CentreField1, CentreField2, CentreField3, Status",
-                new { centreId }
-            );
+                WHERE (ca.Active = 1) AND (caa.SelfAssessmentID = 1)
+                ORDER BY EnrolledYear DESC, EnrolledMonth DESC, JobGroup, CentreField1, CentreField2, CentreField3, Status");
         }
 
-        public IEnumerable<DCSADelegateCompletionStatus> GetDelegateCompletionStatusForCentre(int centreId)
+        public IEnumerable<DCSADelegateCompletionStatus> GetDelegateCompletionStatus()
         {
             return connection.Query<DCSADelegateCompletionStatus>(
                 @"SELECT DATEPART(month, caa.StartedDate) AS EnrolledMonth, DATEPART(yyyy, caa.StartedDate) AS EnrolledYear, ca.FirstName, ca.LastName, ca.EmailAddress AS Email, ca.Answer1 AS CentreField1, ca.Answer2 AS CentreField2, ca.Answer3 AS CentreField3, CASE WHEN (caa.SubmittedDate IS NOT NULL) 
                              THEN 'Submitted' WHEN (caa.UserBookmark LIKE N'/LearningPortal/SelfAssessment/1/Review' AND caa.SubmittedDate IS NULL) THEN 'Reviewing' ELSE 'Incomplete' END AS Status
                 FROM   Candidates AS ca INNER JOIN
                              CandidateAssessments AS caa ON ca.UserID = caa.DelegateUserID AND ca.CentreID = caa.CentreID INNER JOIN
                              JobGroups AS jg ON ca.JobGroupID = jg.JobGroupID
-                WHERE (ca.Active = 1) AND (ca.CentreID = @centreId) AND  caa.NonReportable = 0
-                ORDER BY EnrolledYear DESC, EnrolledMonth DESC, ca.LastName, ca.FirstName",
-                new { centreId }
-            );
+                WHERE (ca.Active = 1) AND (caa.SelfAssessmentID = 1) AND  caa.NonReportable = 0
+                ORDER BY EnrolledYear DESC, EnrolledMonth DESC, ca.LastName, ca.FirstName");
         }
     }
 }

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs

@@ -42,8 +42,8 @@ public IActionResult Index()
         public IActionResult DownloadDigitalCapabilityToExcel()
         {
             var centreId = User.GetCentreIdKnownNotNull();
-            var dataFile = selfAssessmentReportService.GetDigitalCapabilityExcelExportForCentre(centreId);
-            var fileName = $"DLS DSAT Report - Centre {centreId} - downloaded {clockUtility.UtcToday:yyyy-MM-dd}.xlsx";
+            var dataFile = selfAssessmentReportService.GetDigitalCapabilityExcelExport();
+            var fileName = $"DLS DSAT Report - downloaded {clockUtility.UtcToday:yyyy-MM-dd}.xlsx";
             return File(
                 dataFile,
                 FileHelper.GetContentTypeFromFileName(fileName),

DigitalLearningSolutions.Web/Services/SelfAssessmentReportService.cs

@@ -11,7 +11,7 @@
 
     public interface ISelfAssessmentReportService
     {
-        byte[] GetDigitalCapabilityExcelExportForCentre(int centreId);
+        byte[] GetDigitalCapabilityExcelExport();
         byte[] GetSelfAssessmentExcelExportForCentre(int centreId, int selfAssessmentId);
         IEnumerable<SelfAssessmentSelect> GetSelfAssessmentsForReportList(int centreId, int? categoryId);
     }
@@ -34,10 +34,10 @@ private static void AddSheetToWorkbook(IXLWorkbook workbook, string sheetName, I
             table.Theme = XLTableTheme.TableStyleLight9;
             sheet.Columns().AdjustToContents();
         }
-        public byte[] GetDigitalCapabilityExcelExportForCentre(int centreId)
+        public byte[] GetDigitalCapabilityExcelExport()
         {
-            var delegateCompletionStatus = dcsaReportDataService.GetDelegateCompletionStatusForCentre(centreId);
-            var outcomeSummary = dcsaReportDataService.GetOutcomeSummaryForCentre(centreId);
+            var delegateCompletionStatus = dcsaReportDataService.GetDelegateCompletionStatus();
+            var outcomeSummary = dcsaReportDataService.GetOutcomeSummary();
             var summary = delegateCompletionStatus.Select(
                 x => new
                 {