Merge pull request #3069 from TechnologyEnhancedLearning/Develop/Fixes/TD-4435-Mismatchof'Enrolmentmethod'showingon'TrackingsystemDelegateactivities'screenfor'Digitalskillsassessmenttool'assessment

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

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -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
@@ -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)