Merge pull request #2943 from TechnologyEnhancedLearning/Develop/Fixes/TD-4950-FixSubmitResultFoDupeCompetency

TD-4950 Fixes to excel export and clear selection in self assessments

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentExportDataService.cs

@@ -128,7 +128,7 @@ public List<CandidateAssessmentExportDetail> GetCandidateAssessmentExportDetails
                     COALESCE (rr.LevelRAG, 0) AS ResultRAG
                 FROM CandidateAssessments ca
                 INNER JOIN SelfAssessmentResults s
-                    ON s.DelegateUserID = ca.DelegateUserID INNER JOIN SelfAssessmentStructure AS sas ON s.CompetencyID = sas.CompetencyID AND sas.SelfAssessmentID = @candidateAssessmentId           
+                    ON s.DelegateUserID = ca.DelegateUserID INNER JOIN SelfAssessmentStructure AS sas ON s.CompetencyID = sas.CompetencyID AND sas.SelfAssessmentID = s.SelfAssessmentID         
                 LEFT OUTER JOIN SelfAssessmentResultSupervisorVerifications AS sv
                     ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0
                 LEFT OUTER JOIN CandidateAssessmentSupervisors AS cas 

DigitalLearningSolutions.Web/Scripts/learningPortal/selfAssessment.ts

@@ -1,3 +1,5 @@
+import * as Checkboxes from '../checkboxes';
+
 function onSliderUpdate(inputElement: HTMLInputElement) {
   const selectedRatio = parseInt(inputElement.value, 10) / parseInt(inputElement.max, 10);
   // eslint-disable-next-line no-param-reassign
@@ -13,3 +15,4 @@ inputs.forEach((e) => onSliderUpdate(e));
 inputs.forEach((e) => {
   e.addEventListener('change', () => onSliderUpdate(e));
 });
+Checkboxes.default.setUpSelectAndDeselectInGroupButtons();