Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

rshrirohit · rshrirohit · commit 69970db63282 · 2024-07-11T12:33:44.000+01:00
diff --git a/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs
@@ -527,7 +527,7 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
             {
                 string sqlQuery = $@"
                 BEGIN TRANSACTION
-                UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId
+                UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
                   WHERE ID = @candidateAssessmentId
 
                 UPDATE CandidateAssessmentSupervisors SET Removed = NULL
@@ -537,7 +537,7 @@ BEGIN TRANSACTION
                 COMMIT TRANSACTION";
 
                 connection.Execute(sqlQuery
-                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId });
+                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic });
             }
 
             if (candidateAssessmentId < 1)

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON`
`527`	`527`	`{`
`528`	`528`	`string sqlQuery = $@"`
`529`	`529`	`BEGIN TRANSACTION`
`530`		`- UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId`
	`530`	`+ UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic`
`531`	`531`	`WHERE ID = @candidateAssessmentId`
`532`	`532`
`533`	`533`	`UPDATE CandidateAssessmentSupervisors SET Removed = NULL`
`@@ -537,7 +537,7 @@ BEGIN TRANSACTION`
`537`	`537`	`COMMIT TRANSACTION";`
`538`	`538`
`539`	`539`	`connection.Execute(sqlQuery`
`540`		`- , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId });`
	`540`	`+ , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic });`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`if (candidateAssessmentId < 1)`