diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml index 8a8df8157d..8e03ac72ef 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewCompetencySelfAsessment.cshtml @@ -19,14 +19,14 @@
  • My Staff
  • @Model.SupervisorDelegate.FirstName @Model.SupervisorDelegate.LastName + asp-action="DelegateProfileAssessments" + asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]">@Model.SupervisorDelegate.FirstName @Model.SupervisorDelegate.LastName
  • + asp-action="ReviewDelegateSelfAssessment" + asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" + asp-route-candidateAssessmentId="@Model.DelegateSelfAssessment.ID"> @(Model.DelegateSelfAssessment.RoleName.Length > 35 ? Model.DelegateSelfAssessment.RoleName.Substring(0, 32) + "..." : Model.DelegateSelfAssessment.RoleName)
  • @@ -37,9 +37,9 @@

    + asp-action="ReviewDelegateSelfAssessment" + asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" + asp-route-candidateAssessmentId="@Model.DelegateSelfAssessment.ID"> Back to @(Model.DelegateSelfAssessment.RoleName.Length > 35 ? Model.DelegateSelfAssessment.RoleName.Substring(0, 32) + "..." : Model.DelegateSelfAssessment.RoleName)

    @@ -122,13 +122,15 @@ } @if (Model.Competency.AssessmentQuestions.First().IncludeComments) { + var promptText = string.IsNullOrEmpty(Model.Competency.AssessmentQuestions.First()?.CommentsPrompt) ? + Model.DelegateSelfAssessment.ReviewerCommentsLabel : Model.Competency.AssessmentQuestions.First()?.CommentsPrompt;
    @(((Model.Competency.AssessmentQuestions.First().SignedOff == true && Model.Competency.AssessmentQuestions.First().Verified.HasValue) || (Model.Competency.AssessmentQuestions.First().ResultId != null && Model.Competency.AssessmentQuestions.First().Verified == null && Model.Competency.AssessmentQuestions.First().Requested != null && Model.Competency.AssessmentQuestions.First().UserIsVerifier == false) || (Model.Competency.AssessmentQuestions.First().Verified == null && Model.Competency.AssessmentQuestions.First().Requested != null) && (!String.IsNullOrEmpty(Model.DelegateSelfAssessment.ReviewerCommentsLabel))) - ? Model.DelegateSelfAssessment.ReviewerCommentsLabel : "Comments") + ? promptText : "Comments")
    @Html.Raw(Model.Competency.AssessmentQuestions.First().SupportingComments)