Merge pull request #2849 from TechnologyEnhancedLearning/Develop/Features/TD-4469-FixReportFails

TD-4469 fix test fails re enrolled column name and GUID emails

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs

@@ -143,22 +143,23 @@ int currentRun
                     c.CustomisationName,
                     u.FirstName,
                     u.LastName,
-                    u.PrimaryEmail,
+                    CASE WHEN COALESCE(ucd.Email, u.PrimaryEmail) LIKE '%@%' THEN COALESCE(ucd.Email, u.PrimaryEmail) ELSE '' END AS EmailAddress,
                     da.CandidateNumber AS DelegateId,
                     da.Answer1,
                     da.Answer2,
                     da.Answer3,
                     da.Answer4,
                     da.Answer5,
                     da.Answer6,
-                    al.Registered,
+                    al.Registered AS Enrolled,
                     al.Completed,
                     al.Evaluated
                     FROM   Applications AS a INNER JOIN
                                  tActivityLog AS al ON a.ApplicationID = al.ApplicationID INNER JOIN
                                  Users AS u INNER JOIN
                                  DelegateAccounts AS da ON u.ID = da.UserID ON al.CandidateID = da.ID AND al.CentreID = da.CentreID INNER JOIN
-                                 Customisations AS c ON al.CustomisationID = c.CustomisationID
+                                 Customisations AS c ON al.CustomisationID = c.CustomisationID LEFT OUTER JOIN
+                                 UserCentreDetails AS ucd ON u.ID = ucd.UserID AND c.CentreID = al.CentreID
                     WHERE (al.LogDate >= @startDate) AND (@endDate IS NULL OR
                                  al.LogDate <= @endDate) AND (al.CentreID = @centreId) AND (@jobGroupId IS NULL OR
                                  al.JobGroupID = @jobGroupId) AND (@customisationId IS NULL OR

DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs

@@ -17,7 +17,7 @@ public class ActivityLogDetail
         public string? Answer4 { get; set; }
         public string? Answer5 { get; set; }
         public string? Answer6 { get; set; }
-        public bool Registered { get; set; }
+        public bool Enrolled { get; set; }
         public bool Completed { get; set; }
         public bool Evaluated { get; set; }
     }