Skip to content

Commit 9976a70

Browse files
authored
Merge pull request #2945 from TechnologyEnhancedLearning/release-v1.0.0
Release v1.0.0 to UAT
2 parents dfbcb59 + a0af08d commit 9976a70

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentExportDataService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public List<CandidateAssessmentExportDetail> GetCandidateAssessmentExportDetails
128128
COALESCE (rr.LevelRAG, 0) AS ResultRAG
129129
FROM CandidateAssessments ca
130130
INNER JOIN SelfAssessmentResults s
131-
ON s.DelegateUserID = ca.DelegateUserID INNER JOIN SelfAssessmentStructure AS sas ON s.CompetencyID = sas.CompetencyID AND sas.SelfAssessmentID = @candidateAssessmentId
131+
ON s.DelegateUserID = ca.DelegateUserID INNER JOIN SelfAssessmentStructure AS sas ON s.CompetencyID = sas.CompetencyID AND sas.SelfAssessmentID = s.SelfAssessmentID
132132
LEFT OUTER JOIN SelfAssessmentResultSupervisorVerifications AS sv
133133
ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0
134134
LEFT OUTER JOIN CandidateAssessmentSupervisors AS cas

DigitalLearningSolutions.Web/Scripts/learningPortal/selfAssessment.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import * as Checkboxes from '../checkboxes';
2+
13
function onSliderUpdate(inputElement: HTMLInputElement) {
24
const selectedRatio = parseInt(inputElement.value, 10) / parseInt(inputElement.max, 10);
35
// eslint-disable-next-line no-param-reassign
@@ -13,3 +15,4 @@ inputs.forEach((e) => onSliderUpdate(e));
1315
inputs.forEach((e) => {
1416
e.addEventListener('change', () => onSliderUpdate(e));
1517
});
18+
Checkboxes.default.setUpSelectAndDeselectInGroupButtons();

0 commit comments

Comments
 (0)