Merge pull request #2742 from TechnologyEnhancedLearning/Develop/Fixes/TD-4334-Issuewith'Completeby'datenotshowingonselfassessmentcards

rshrirohit · web-flow · commit a21da3ead8fc · 2024-07-11T12:29:31.000+01:00
TD-4334 Issue with 'Complete by' date not showing on self assessment cards
diff --git a/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs
@@ -526,7 +526,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
@@ -536,7 +536,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
`@@ -526,7 +526,7 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON`
`526`	`526`	`{`
`527`	`527`	`string sqlQuery = $@"`
`528`	`528`	`BEGIN TRANSACTION`
`529`		`- UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId`
	`529`	`+ UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic`
`530`	`530`	`WHERE ID = @candidateAssessmentId`
`531`	`531`
`532`	`532`	`UPDATE CandidateAssessmentSupervisors SET Removed = NULL`
`@@ -536,7 +536,7 @@ BEGIN TRANSACTION`
`536`	`536`	`COMMIT TRANSACTION";`
`537`	`537`
`538`	`538`	`connection.Execute(sqlQuery`
`539`		`- , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId });`
	`539`	`+ , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic });`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`if (candidateAssessmentId < 1)`