Skip to content

HEEDLS-470 - Corrected course statistics count from query #488

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
Jul 14, 2021
Merged

HEEDLS-470 - Corrected course statistics count from query #488

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
24 changes: 16 additions & 8 deletions DigitalLearningSolutions.Data/DataServices/CourseDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,32 @@ public interface ICourseDataService
public class CourseDataService : ICourseDataService
{
private const string DelegateCountQuery =
@"(SELECT COUNT(CandidateID)
@"(SELECT COUNT(pr.CandidateID)
FROM dbo.Progress AS pr
WHERE pr.CustomisationID = cu.CustomisationID) AS DelegateCount";
INNER JOIN dbo.Candidates AS can ON can.CandidateID = pr.CandidateID
WHERE pr.CustomisationID = cu.CustomisationID
AND can.CentreID = @centreId) AS DelegateCount";

private const string CompletedCountQuery =
@"(SELECT COUNT(CandidateID)
@"(SELECT COUNT(pr.CandidateID)
FROM dbo.Progress AS pr
WHERE pr.CustomisationID = cu.CustomisationID AND pr.Completed IS NOT NULL) AS CompletedCount";
INNER JOIN dbo.Candidates AS can ON can.CandidateID = pr.CandidateID
WHERE pr.CustomisationID = cu.CustomisationID AND pr.Completed IS NOT NULL
AND can.CentreID = @centreId) AS CompletedCount";

private const string AllAttemptsQuery =
@"(SELECT COUNT(AssessAttemptID)
@"(SELECT COUNT(aa.AssessAttemptID)
FROM dbo.AssessAttempts AS aa
WHERE aa.CustomisationID = cu.CustomisationID AND aa.[Status] IS NOT NULL) AS AllAttempts";
INNER JOIN dbo.Candidates AS can ON can.CandidateID = aa.CandidateID
WHERE aa.CustomisationID = cu.CustomisationID AND aa.[Status] IS NOT NULL
AND can.CentreID = @centreId) AS AllAttempts";

private const string AttemptsPassedQuery =
@"(SELECT COUNT(AssessAttemptID)
@"(SELECT COUNT(aa.AssessAttemptID)
FROM dbo.AssessAttempts AS aa
WHERE aa.CustomisationID = cu.CustomisationID AND aa.[Status] = 1) AS AttemptsPassed";
INNER JOIN dbo.Candidates AS can ON can.CandidateID = aa.CandidateID
WHERE aa.CustomisationID = cu.CustomisationID AND aa.[Status] = 1
AND can.CentreID = @centreId) AS AttemptsPassed";

private readonly IDbConnection connection;
private readonly ILogger<CourseDataService> logger;
Expand Down