You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
+9-5Lines changed: 9 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -2410,15 +2410,19 @@ public IEnumerable<BulkCompetency> GetBulkCompetenciesForFramework(int framework
2410
2410
else
2411
2411
{
2412
2412
returnconnection.Query<BulkCompetency>(
2413
-
@"SELECT fc.ID, cg.Name AS CompetencyGroup, cg.Description AS GroupDescription, c.Name AS Competency, c.Description AS CompetencyDescription, c.AlwaysShowDescription, STRING_AGG(f.FlagName, ', ') AS FlagsCsv
2414
-
FROM Flags AS f RIGHT OUTER JOIN
2415
-
CompetencyFlags AS cf ON f.ID = cf.FlagID RIGHT OUTER JOIN
2413
+
@"SELECT fc.ID, cg.Name AS CompetencyGroup, cg.Description AS GroupDescription, c.Name AS Competency, c.Description AS CompetencyDescription, c.AlwaysShowDescription, STUFF((
2414
+
SELECT ', ' + f.FlagName
2415
+
FROM Flags AS f
2416
+
INNER JOIN CompetencyFlags AS cf ON f.ID = cf.FlagID
2417
+
WHERE cf.CompetencyID = c.ID
2418
+
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS FlagsCsv
2419
+
FROM
2416
2420
Competencies AS c INNER JOIN
2417
2421
FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID INNER JOIN
2418
2422
FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID INNER JOIN
2419
-
CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID ON cf.CompetencyID = c.ID
2423
+
CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID
2420
2424
WHERE (fc.FrameworkID = @frameworkId)
2421
-
GROUP BY fc.ID, cg.Name, cg.Description, c.Name, c.Description, c.AlwaysShowDescription, fcg.Ordering, fc.Ordering
2425
+
GROUP BY fc.ID, c.ID, cg.Name, cg.Description, c.Name, c.Description, c.AlwaysShowDescription, fcg.Ordering, fc.Ordering
0 commit comments