diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs index 3249387f20..af9bfadff6 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs @@ -378,6 +378,7 @@ int resultId var delegateSelfAssessment = supervisorService.GetSelfAssessmentBaseByCandidateAssessmentId(candidateAssessmentId); var assessmentQuestion = GetLevelDescriptorsForAssessmentQuestion(competency.AssessmentQuestions.First()); + competency.CompetencyFlags = frameworkService.GetSelectedCompetencyFlagsByCompetecyId(competency.Id); var model = new ReviewCompetencySelfAsessmentViewModel() { DelegateSelfAssessment = delegateSelfAssessment, diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml index 787415fe40..95c016e91c 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml @@ -58,75 +58,81 @@
-
- @Model.Competency.Vocabulary -
-
- @Model.Competency.Name -
- +
+ @Model.Competency.Vocabulary +
+
+ @Model.Competency.Name +
- @if (Model.Competency.Description != null) + @if (Model.Competency.CompetencyFlags.Any()) { -
+
- Description + Flags
- @Html.Raw(Model.Competency.Description) +
+
+ } + @if (Model.Competency.Description != null) + { +
+
+ Description +
+
+ @Html.Raw(Model.Competency.Description) +
}
-
- Question -
-
- @Model.Competency.AssessmentQuestions.First().Question -
- +
+ Question +
+
+ @Model.Competency.AssessmentQuestions.First().Question +
-
- Learner response -
-
- -
- +
+ Learner response +
+
+ +
@if (Model.Competency.AssessmentQuestions.First().ResultRAG > 0) {
-
- Role expectations -
-
- @(Model.Competency.AssessmentQuestions.First().ResultRAG == 1 ? "Not meeting" : Model.Competency.AssessmentQuestions.First().ResultRAG == 2 ? "Partially meeting" : "Fully meeting" ) -
- +
+ Role expectations +
+
+ @(Model.Competency.AssessmentQuestions.First().ResultRAG == 1 ? "Not meeting" : Model.Competency.AssessmentQuestions.First().ResultRAG == 2 ? "Partially meeting" : "Fully meeting" ) +
} @if (Model.Competency.AssessmentQuestions.First().IncludeComments) {
-
- Comments -
-
- @Html.Raw(Model.Competency.AssessmentQuestions.First().SupportingComments) -
+
+ Comments +
+
+ @Html.Raw(Model.Competency.AssessmentQuestions.First().SupportingComments) +
}
-
- Status -
-
- -
- +
+ Status +
+
+ +
@if (errorHasOccurred)