Skip to content

TD-4469 fix report fails #2861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2024
Merged

TD-4469 fix report fails #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
Loading