Merge pull request #2818 from TechnologyEnhancedLearning/Develop/Fixes/TD-4668-Issueshowingduplicateselfassessmentrecordson'SupervisorDashboard'screen

TD-4668 Issue showing duplicate self assessment records on 'Supervisor Dashboard' screen

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -533,17 +533,24 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
                     );
                 }
             }
-
-            if (candidateAssessmentId > 1)
+            if (candidateAssessmentId > 1 && supervisorDelegateId == 0)
+            {
+                connection.Execute(
+                        @"UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
+                  WHERE ID = @candidateAssessmentId",
+                        new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic }
+                    );
+            }
+                if (candidateAssessmentId > 1 && supervisorDelegateId !=0)
             {
                 string sqlQuery = $@"
                 BEGIN TRANSACTION
                 UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
                   WHERE ID = @candidateAssessmentId
 
                 UPDATE CandidateAssessmentSupervisors SET Removed = NULL
-                  {((selfAssessmentSupervisorRoleId > 0) ? " ,SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID" : string.Empty)}
-                  WHERE CandidateAssessmentID = @candidateAssessmentId
+                 {((selfAssessmentSupervisorRoleId > 0) ? " ,SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID" : string.Empty)}
+                WHERE CandidateAssessmentID = @candidateAssessmentId
 
                 COMMIT TRANSACTION";