Skip to content

TD-570 - Framework - Preview option resulted in error #1451

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
Nov 4, 2022
Merged

TD-570 - Framework - Preview option resulted in error #1451

Show file tree
Hide file tree
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/Services/FrameworkService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1817,8 +1817,8 @@ public Competency GetFrameworkCompetencyForPreview(int frameworkCompetencyId)
AQ.CommentsPrompt,
AQ.CommentsHint
FROM Competencies AS C INNER JOIN
FrameworkCompetencies AS FC ON C.ID = FC.CompetencyID INNER JOIN
FrameworkCompetencyGroups AS FCG ON FC.FrameworkCompetencyGroupID = FCG.ID INNER JOIN
FrameworkCompetencies AS FC ON C.ID = FC.CompetencyID LEFT JOIN
FrameworkCompetencyGroups AS FCG ON FC.FrameworkCompetencyGroupID = FCG.ID LEFT JOIN
CompetencyGroups AS CG ON FCG.CompetencyGroupID = CG.ID INNER JOIN
CompetencyAssessmentQuestions AS CAQ ON C.ID = CAQ.CompetencyID INNER JOIN
AssessmentQuestions AS AQ ON CAQ.AssessmentQuestionID = AQ.ID
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Controllers/FrameworksController/Competencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public IActionResult DeleteFrameworkCompetency(int frameworkId, int frameworkCom
frameworkService.DeleteFrameworkCompetency(frameworkCompetencyId, GetAdminId());
return frameworkCompetencyGroupId != null ? new RedirectResult(Url.Action("ViewFramework", new { tabname = "Structure", frameworkId, frameworkCompetencyGroupId }) + "#fcgroup-" + frameworkCompetencyGroupId.ToString()) : new RedirectResult(Url.Action("ViewFramework", new { tabname = "Structure", frameworkId }) + "#fc-ungrouped");
}
[Route("/Frameworks/{frameworkId}/Competency/{frameworkCompetencyGroupId}/{frameworkCompetencyId}/Preview/")]
[Route("/Frameworks/{frameworkId}/Competency/{frameworkCompetencyGroupId:int=0}/{frameworkCompetencyId}/Preview/")]
public IActionResult PreviewCompetency(int frameworkId, int frameworkCompetencyGroupId, int frameworkCompetencyId)
{
var adminId = GetAdminId();
Expand Down