TD-483 Begins to implement interface and redirect to add competencies when none exist

kevwhitt-hee · kevwhitt-hee · commit 8e2920bac66b · 2025-06-05T09:09:31.000+01:00
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManageCompetencyAssessmentViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManageCompetencyAssessmentViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using DigitalLearningSolutions.Data.Models.CompetencyAssessments;
+using DigitalLearningSolutions.Web.Helpers;
 
 namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 {
@@ -13,12 +14,14 @@ CompetencyAssessmentTaskStatus competencyAssessmentTaskStatus
             PublishStatusID = competencyAssessmentBase.PublishStatusID;
             UserRole = competencyAssessmentBase.UserRole;
             CompetencyAssessmentTaskStatus = competencyAssessmentTaskStatus;
-            Vocabulary = competencyAssessmentBase.Vocabulary;
+            VocabularySingular = FrameworkVocabularyHelper.VocabularySingular(competencyAssessmentBase.Vocabulary);
+            VocabularyPlural = FrameworkVocabularyHelper.VocabularyPlural(competencyAssessmentBase.Vocabulary);
         }
         public string CompetencyAssessmentName { get; set; }
         public int PublishStatusID { get; set; }
         public int UserRole { get; set; }
-        public string? Vocabulary { get; set; }
+        public string VocabularySingular { get; set; }
+        public string VocabularyPlural { get; set; }
         public CompetencyAssessmentTaskStatus CompetencyAssessmentTaskStatus { get; set; }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectCompetenciesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectCompetenciesViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using DigitalLearningSolutions.Data.Models.CompetencyAssessments;
+using DigitalLearningSolutions.Web.Helpers;
 using System.Collections.Generic;
 
 namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
@@ -12,10 +13,14 @@ public SelectCompetenciesViewModel(CompetencyAssessmentBase competencyAssessment
             CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName;
             UserRole = competencyAssessmentBase.UserRole;
             Competencies = competencies;
+            VocabularySingular = FrameworkVocabularyHelper.VocabularySingular(competencyAssessmentBase.Vocabulary);
+            VocabularyPlural = FrameworkVocabularyHelper.VocabularyPlural(competencyAssessmentBase.Vocabulary);
         }
         public int ID { get; set; }
         public string CompetencyAssessmentName { get; set; }
         public int UserRole { get; set; }
+        public string VocabularySingular { get; set; }
+        public string VocabularyPlural { get; set; }
 
         public IEnumerable<Competency> Competencies;
     }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml
@@ -88,7 +88,7 @@
         <li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
             <div class="nhsuk-task-list__name-and-hint" aria-describedby="vocabulary-status">
                 <a class="nhsuk-link nhsuk-task-list__link" asp-action="EditVocabulary" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
-                    Select assessment vocabulary (@Model.Vocabulary)
+                    Select assessment vocabulary (@Model.VocabularySingular)
                 </a>
             </div>
             <div class="nhsuk-task-list__status" id="vocabulary-status">
@@ -120,7 +120,7 @@
             @if (Model.CompetencyAssessmentTaskStatus.FrameworkLinksTaskStatus == null)
             {
                 <div class="nhsuk-task-list__name-and-hint" aria-describedby="select-competencies-status">
-                    Select competencies to assess
+                    Select @Model.VocabularyPlural.ToLower() to assess
                 </div>
                 <div class="nhsuk-task-list__status nhsuk-task-list__status--cannot-start-yet" id="select-competencies-status">
                     Cannot start yet
@@ -130,7 +130,7 @@
             {
                 <div class="nhsuk-task-list__name-and-hint" aria-describedby="select-competencies-status">
                     <a class="nhsuk-link nhsuk-task-list__link" asp-action="SelectCompetencies" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
-                        Select competencies to assess
+                        Select @Model.VocabularyPlural.ToLower() to assess
                     </a>
                 </div>
                 <div class="nhsuk-task-list__status" id="select-competencies-status">
@@ -143,7 +143,7 @@
             @if (Model.CompetencyAssessmentTaskStatus.SelectCompetenciesTaskStatus == null)
             {
                 <div class="nhsuk-task-list__name-and-hint" aria-describedby="optional-competencies-status">
-                    Identify optional competencies
+                    Identify optional @Model.VocabularyPlural.ToLower()
                 </div>
                 <div class="nhsuk-task-list__status nhsuk-task-list__status--cannot-start-yet" id="optional-competencies-status">
                     Cannot start yet
@@ -153,7 +153,7 @@
             {
                 <div class="nhsuk-task-list__name-and-hint" aria-describedby="optional-competencies-status">
                     <a class="nhsuk-link nhsuk-task-list__link" asp-action="SelectOptionalCompetencies" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
-                        Identify optional competencies
+                        Identify optional @Model.VocabularyPlural.ToLower()
                     </a>
                 </div>
                 <div class="nhsuk-task-list__status" id="optional-competencies-status">
@@ -167,7 +167,7 @@
             @if (Model.CompetencyAssessmentTaskStatus.SelectCompetenciesTaskStatus == null)
             {
                 <div class="nhsuk-task-list__name-and-hint" aria-describedby="role-requirements-status">
-                    Set competency attainment requirements
+                    Set @Model.VocabularySingular.ToLower() attainment requirements
                 </div>
                 <div class="nhsuk-task-list__status nhsuk-task-list__status--cannot-start-yet" id="role-requirements-status">
                     Cannot start yet
@@ -177,7 +177,7 @@
             {
                 <div class="nhsuk-task-list__name-and-hint" aria-describedby="role-requirements-status">
                     <a class="nhsuk-link nhsuk-task-list__link" asp-action="SetRoleRequirements" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
-                        Set competency attainment requirements
+                        Set @Model.VocabularySingular.ToLower() attainment requirements
                     </a>
                 </div>
                 <div class="nhsuk-task-list__status" id="role-requirements-status">
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectCompetencies.cshtml
@@ -0,0 +1,24 @@
+﻿@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
+@model SelectCompetenciesViewModel;
+@{
+    ViewData["Title"] = "Select Framework Sources";
+    ViewData["Application"] = "Framework Service";
+}
+<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
+@section NavMenuItems {
+    <partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
+}
+
+@section NavBreadcrumbs {
+    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+        <div class="nhsuk-width-container">
+            <ol class="nhsuk-breadcrumb__list">
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item">Select @Model.VocabularyPlural</li>
+            </ol>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+        </div>
+    </nav>
+}
+<h1>Select @Model.VocabularyPlural.ToLower() for @Model.CompetencyAssessmentName</h1>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
@@ -4,7 +4,6 @@
     ViewData["Title"] = "Select Framework Sources";
     ViewData["Application"] = "Framework Service";
 }
-<link rel="stylesheet" href="@Url.Content("~/css/jodit.css")" asp-append-version="true">
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 @section NavMenuItems {
     <partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
@@ -16,7 +15,7 @@
             <ol class="nhsuk-breadcrumb__list">
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
-                <li class="nhsuk-breadcrumb__item">Introductory text</li>
+                <li class="nhsuk-breadcrumb__item">Select framework sources</li>
             </ol>
             <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using DigitalLearningSolutions.Data.Models.CompetencyAssessments;`
	`2`	`+using DigitalLearningSolutions.Web.Helpers;`
`2`	`3`
`3`	`4`	`namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments`
`4`	`5`	`{`
`@@ -13,12 +14,14 @@ CompetencyAssessmentTaskStatus competencyAssessmentTaskStatus`
`13`	`14`	`PublishStatusID = competencyAssessmentBase.PublishStatusID;`
`14`	`15`	`UserRole = competencyAssessmentBase.UserRole;`
`15`	`16`	`CompetencyAssessmentTaskStatus = competencyAssessmentTaskStatus;`
`16`		`- Vocabulary = competencyAssessmentBase.Vocabulary;`
	`17`	`+ VocabularySingular = FrameworkVocabularyHelper.VocabularySingular(competencyAssessmentBase.Vocabulary);`
	`18`	`+ VocabularyPlural = FrameworkVocabularyHelper.VocabularyPlural(competencyAssessmentBase.Vocabulary);`
`17`	`19`	`}`
`18`	`20`	`public string CompetencyAssessmentName { get; set; }`
`19`	`21`	`public int PublishStatusID { get; set; }`
`20`	`22`	`public int UserRole { get; set; }`
`21`		`- public string? Vocabulary { get; set; }`
	`23`	`+ public string VocabularySingular { get; set; }`
	`24`	`+ public string VocabularyPlural { get; set; }`
`22`	`25`	`public CompetencyAssessmentTaskStatus CompetencyAssessmentTaskStatus { get; set; }`
`23`	`26`	`}`
`24`	`27`	`}`