diff --git a/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs b/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs index 714817c76a..12252082b4 100644 --- a/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs @@ -143,7 +143,7 @@ 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, @@ -151,14 +151,15 @@ int currentRun 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 diff --git a/DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs b/DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs index 14b36c9595..b704b41ca8 100644 --- a/DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs +++ b/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; } }