Skip to content

TD-5220 fix order comparison for ungrouped competencies #3227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

TD-5220 fix order comparison for ungrouped competencies #3227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2435,7 +2435,7 @@ Competencies AS c INNER JOIN
CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID
WHERE (fc.FrameworkID = @frameworkId)
GROUP BY fc.ID, c.ID, cg.Name, cg.Description, c.Name, c.Description, c.AlwaysShowDescription, fcg.Ordering, fc.Ordering
ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering",
ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering, fc.ID",
new { frameworkId }
);
}
Expand All @@ -2448,7 +2448,7 @@ public List<int> GetFrameworkCompetencyOrder(int frameworkId, List<int> framewor
FROM FrameworkCompetencies AS fc LEFT JOIN
FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID
WHERE (fc.FrameworkID = @frameworkId) AND (fc.ID IN @frameworkCompetencyIds)
ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering",
ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering, fc.ID",
new { frameworkId, frameworkCompetencyIds }
).ToList();
}
Expand Down
Loading