Skip to content

Commit 8765ddc

Browse files
committed
TD-5310 Begins to implement MVC components for optional competencies view
1 parent 25fa3e0 commit 8765ddc

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,5 +640,26 @@ public IActionResult ViewSelectedCompetencies(ViewSelectedCompetenciesFormData m
640640
competencyAssessmentService.UpdateSelectCompetenciesTaskStatus(model.ID, model.TaskStatus.Value, null);
641641
return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID });
642642
}
643+
[HttpGet]
644+
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional")]
645+
public IActionResult SelectOptionalCompetencies(int competencyAssessmentId)
646+
{
647+
var adminId = GetAdminID();
648+
var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId);
649+
if (competencyAssessmentBase == null)
650+
{
651+
logger.LogWarning($"Failed to load Optional Competencies page for competencyAssessmentId: {competencyAssessmentId} adminId: {adminId}");
652+
return StatusCode(500);
653+
}
654+
if (competencyAssessmentBase.UserRole < 2)
655+
{
656+
return StatusCode(403);
657+
}
658+
var competencies = competencyAssessmentService.GetCompetenciesForCompetencyAssessment(competencyAssessmentId);
659+
660+
var competencyAssessmentTaskStatus = competencyAssessmentService.GetCompetencyAssessmentTaskStatus(competencyAssessmentId, null);
661+
var model = new SelectOptionalCompetenciesViewModel(competencyAssessmentBase, competencies, competencyAssessmentTaskStatus.OptionalCompetenciesTaskStatus);
662+
return View(model);
663+
}
643664
}
644665
}

DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ string direction
6363
//DELETE DATA
6464
bool RemoveFrameworkCompetenciesFromAssessment(int competencyAssessmentId, int frameworkId);
6565
bool RemoveCompetencyFromAssessment(int competencyAssessmentId, int competencyId);
66-
}
66+
}
6767
public class CompetencyAssessmentService : ICompetencyAssessmentService
6868
{
6969
private readonly ICompetencyAssessmentDataService competencyAssessmentDataService;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
2+
@model SelectOptionalCompetenciesViewModel;
3+
<h1>Select optional competencies</h1>

0 commit comments

Comments
 (0)