Skip to content

TD-4435 Mismatch of 'Enrolment method' showing on 'Tracking system' & 'Delegate activities' screen for 'Digital skills assessment tool' assessment #3069

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
Jan 23, 2025
Merged

TD-4435 Mismatch of 'Enrolment method' showing on 'Tracking system' & 'Delegate activities' screen for 'Digital skills assessment tool' assessment #3069

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
8 changes: 4 additions & 4 deletions DigitalLearningSolutions.Data/DataServices/CourseDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,16 +537,16 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
if (candidateAssessmentId > 1 && supervisorDelegateId == 0)
{
connection.Execute(
@"UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
@"UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic, EnrolledByAdminId = @enrolledByAdminId
WHERE ID = @candidateAssessmentId",
new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic }
new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic, enrolledByAdminId }
);
}
if (candidateAssessmentId > 1 && supervisorDelegateId != 0)
{
string sqlQuery = $@"
BEGIN TRANSACTION
UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic, EnrolledByAdminId = @enrolledByAdminId
WHERE ID = @candidateAssessmentId

UPDATE CandidateAssessmentSupervisors SET Removed = NULL
Expand All @@ -556,7 +556,7 @@ BEGIN TRANSACTION
COMMIT TRANSACTION";

connection.Execute(sqlQuery
, new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic, supervisorDelegateId });
, new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic, supervisorDelegateId, enrolledByAdminId });
}

if (supervisorId > 0)
Expand Down
Loading