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

TD-4469 fix report fails

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs

@@ -143,7 +143,7 @@ int currentRun
                     c.CustomisationName,
                     u.FirstName,
                     u.LastName,
-                    CASE WHEN COALESCE(ucd.Email, u.PrimaryEmail) LIKE '%@%' THEN COALESCE(ucd.Email, u.PrimaryEmail) ELSE '' END AS EmailAddress,
+                    COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress,
                     da.CandidateNumber AS DelegateId,
                     da.Answer1,
                     da.Answer2,
@@ -166,7 +166,8 @@ Users AS u INNER JOIN
                                  al.CustomisationID = @customisationId) AND (@courseCategoryId IS NULL OR
                                  al.CourseCategoryID = @courseCategoryId) AND (al.Registered = 1 OR
                                  al.Completed = 1 OR
-                                 al.Evaluated = 1) AND EXISTS
+                                 al.Evaluated = 1) AND
+                          (u.PrimaryEmail like '%_@_%' OR ucd.Email IS NOT NULL) AND EXISTS
                                      (SELECT ApplicationID
                                     FROM    Applications AS ap
                                     WHERE (ApplicationID = al.ApplicationID) AND (DefaultContentTypeID <> 4))

DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs

@@ -9,7 +9,7 @@ public class ActivityLogDetail
         public string? CustomisationName { get; set; }
         public string? FirstName { get; set; }
         public string? LastName { get; set; }
-        public string? PrimaryEmail { get; set; }
+        public string? EmailAddress { get; set; }
         public string? DelegateId { get; set; }
         public string? Answer1 { get; set; }
         public string? Answer2 { get; set; }