Skip to content

Commit 5c6015c

Browse files
committed
TD-5307 Fixes csv list of linked frameworks on dashboard
1 parent 2cde4fc commit 5c6015c

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,15 @@ FROM AdminUsers
9292
sa.Archived,
9393
sa.LastEdit,
9494
STUFF((
95-
SELECT
96-
', ' + f.FrameworkName
97-
FROM
98-
Frameworks f
99-
WHERE
100-
f.ID = saf.FrameworkId
101-
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS LinkedFrameworks,
95+
SELECT
96+
', ' + f.FrameworkName
97+
FROM
98+
SelfAssessmentFrameworks saf2
99+
INNER JOIN Frameworks f ON f.ID = saf2.FrameworkId
100+
WHERE
101+
saf2.SelfAssessmentId = sa.ID
102+
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, ''
103+
) AS LinkedFrameworks,
102104
(SELECT ProfessionalGroup
103105
FROM NRPProfessionalGroups
104106
WHERE (ID = sa.NRPProfessionalGroupID)) AS NRPProfessionalGroup,
@@ -115,8 +117,7 @@ FROM NRPRoles
115117

116118
private const string SelfAssessmentTables =
117119
@" LEFT OUTER JOIN
118-
SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL
119-
LEFT OUTER JOIN SelfAssessmentFrameworks AS saf ON sa.ID = saf.SelfAssessmentId";
120+
SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL";
120121

121122
private readonly IDbConnection connection;
122123
private readonly ILogger<CompetencyAssessmentDataService> logger;

0 commit comments

Comments
 (0)