Skip to content

TD-1128 Adds LearnerActive column to self assessment report #1633

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
kevwhitt-hee merged 1 commit into from
Feb 15, 2023
Merged

TD-1128 Adds LearnerActive column to self assessment report #1633

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
2 changes: 2 additions & 0 deletions ...Solutions.Data/DataServices/SelfAssessmentDataService/SelfAsssessmentReportDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ FROM SelfAssessmentResults as sar1 INNER JOIN
SELECT
sa.Name AS SelfAssessment
, can.LastName + ', ' + can.FirstName AS Learner
, can.Active AS LearnerActive
, can.ProfessionalRegistrationNumber AS PRN
, jg.JobGroupName AS JobGroup
, CASE WHEN c.CustomField1PromptID = 10 THEN can.Answer1 WHEN c.CustomField2PromptID = 10 THEN can.Answer2 WHEN c.CustomField3PromptID = 10 THEN can.Answer3 WHEN c.CustomField4PromptID = 10 THEN can.Answer4 WHEN c.CustomField5PromptID = 10 THEN can.Answer5 WHEN c.CustomField6PromptID = 10 THEN can.Answer6 ELSE '' END AS 'ProgrammeCourse'
Expand Down Expand Up @@ -102,6 +103,7 @@ SelfAssessments AS sa INNER JOIN
(sa.ID = @SelfAssessmentID) AND (sa.ArchivedDate IS NULL) AND (c.Active = 1) AND (ca.RemovedDate IS NULL)
Group by sa.Name
, can.LastName + ', ' + can.FirstName
, can.Active
, can.ProfessionalRegistrationNumber
, c.CustomField1PromptID
, c.CustomField2PromptID
Expand Down
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Data/Models/SelfAssessments/Export/SelfAssessmentReportData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ public class SelfAssessmentReportData
{
public string? SelfAssessment { get; set; }
public string? Learner { get; set; }
public bool LearnerActive { get; set; }
public string? PRN { get; set; }
public string? JobGroup { get; set; }
public string? ProgrammeCourse { get; set; }
Expand Down
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Data/Services/SelfAssessmentReportService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public byte[] GetSelfAssessmentExcelExportForCentre(int centreId, int selfAssess
{
x.SelfAssessment,
x.Learner,
x.LearnerActive,
x.PRN,
x.JobGroup,
x.ProgrammeCourse,
Expand Down