Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ sa.Name AS SelfAssessment
, CASE WHEN c.CustomField1PromptID = 1 THEN can.Answer1 WHEN c.CustomField2PromptID = 1 THEN can.Answer2 WHEN c.CustomField3PromptID = 1 THEN can.Answer3 WHEN c.CustomField4PromptID = 1 THEN can.Answer4 WHEN c.CustomField5PromptID = 1 THEN can.Answer5 WHEN c.CustomField6PromptID = 1 THEN can.Answer6 ELSE '' END AS 'DepartmentTeam'

, can.DateRegistered AS Registered
, ca.StartedDate AS Started
, ca.StartedDate AS Enrolled
, ca.LastAccessed
, COALESCE(COUNT(DISTINCT LAR.Optional), 0) AS [OptionalProficiencies]
, COALESCE(COUNT(DISTINCT LAR.SelfAssessed),0) AS [SelfAssessedAchieved]
, COALESCE(COUNT(DISTINCT LAR.Confirmed), 0) AS [ConfirmedResults]
, max(casv.Requested) AS SignOffRequested
, max(1*casv.SignedOff) AS SignOffAchieved
, min(casv.Verified) AS ReviewedDate
, min(casv.Verified) AS SignOffReviewed
FROM
CandidateAssessments AS ca INNER JOIN
Candidates AS can ON ca.CandidateID = can.CandidateID AND can.CentreID = @centreId INNER JOIN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ public class SelfAssessmentReportData
public string? Organisation { get; set; }
public string? DepartmentTeam { get; set; }
public DateTime? Registered { get; set; }
public DateTime? Started { get; set; }
public DateTime? Enrolled { get; set; }
public DateTime? LastAccessed { get; set; }
public int? OptionalProficiencies { get; set; }
public int? SelfAssessedAchieved { get; set; }
public int? ConfirmedResults { get; set; }
public DateTime? SignOffRequested { get; set; }
public bool SignOffAchieved { get; set; }
public DateTime? ReviewedDate { get; set; }
public DateTime? SignOffReviewed { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ public byte[] GetSelfAssessmentExcelExportForCentre(int centreId, int selfAssess
x.Organisation,
x.DepartmentTeam,
x.Registered,
x.Started,
x.Enrolled,
x.LastAccessed,
x.OptionalProficiencies,
x.SelfAssessedAchieved,
x.ConfirmedResults,
x.SignOffRequested,
x.SignOffAchieved,
x.ReviewedDate
x.SignOffReviewed
}
);
using var workbook = new XLWorkbook();
Expand Down