TD-5563 Implementing the missing requirement

sherif-olaboye · sherif-olaboye · commit 8d3841613d92 · 2025-09-29T11:02:09.000+01:00
diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs
@@ -34,6 +34,7 @@ public interface ICompetencyAssessmentDataService
         IEnumerable<LinkedFramework> GetLinkedFrameworksForCompetencyAssessment(int competencyAssessmentId);
         int[] GetLinkedFrameworkCompetencyIds(int competencyAssessmentId, int frameworkId);
         CompetencyAssessmentFeatures? GetCompetencyAssessmentFeaturesTaskStatus(int competencyAssessmentId);
+        int? GetSelfAssessmentStructure(int competencyAssessmentId);
 
         //UPDATE DATA
         bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName);
@@ -877,5 +878,13 @@ public bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkId
             }
             return true;
         }
+
+        public int? GetSelfAssessmentStructure(int competencyAssessmentId)
+        {
+            return connection.QueryFirstOrDefault<int>(
+               @"SELECT 1 from dbo.SelfAssessmentStructure where selfassessmentid  = @competencyAssessmentId",
+               new { competencyAssessmentId }
+               );
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
@@ -680,7 +680,7 @@ public IActionResult CompetencyAssessmentFeatures(CompetencyAssessmentFeaturesVi
         [Route("/CompetencyAssessments/Framework/{frameworkId}/{competencyAssessmentId}/Summary")]
         public IActionResult CompetencyAssessmentSummary(int competencyAssessmentId, int? frameworkId = null)
         {
-            
+            if (competencyAssessmentService.GetSelfAssessmentStructure(competencyAssessmentId) != 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });
             if (competencyAssessmentId == 0)  return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
             var data = GetcompetencyAssessmentFeaturesData();
             if (data == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 500 });
@@ -692,6 +692,7 @@ public IActionResult CompetencyAssessmentSummary(int competencyAssessmentId, int
         public IActionResult CompetencyAssessmentSummary(CompetencyAssessmentFeaturesViewModel competency)
         {
             var data = GetcompetencyAssessmentFeaturesData();
+            if (competencyAssessmentService.GetSelfAssessmentStructure(data.ID) != 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });
             if (data.ID == 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
             var features = competencyAssessmentService.UpdateCompetencyAssessmentFeaturesTaskStatus(data.ID,
                data.DescriptionStatus,
@@ -707,30 +708,31 @@ public IActionResult CompetencyAssessmentSummary(CompetencyAssessmentFeaturesVie
             TempData.Clear();
             return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = competency.ID, competency.FrameworkId });
         }
-        [Route("/CompetencyAssessments/{competencyAssessmentId}/Frameworks/{frameworkId}/Change")]
-        public IActionResult ConfirmChangePrimaryFramework(int frameworkId, int competencyAssessmentId)
+        [Route("/CompetencyAssessments/{competencyAssessmentId}/Frameworks/{frameworkId}/Make")]
+        public IActionResult ConfirmMaKePrimaryFramework(int frameworkId, int competencyAssessmentId)
         {
                 var adminId = GetAdminID();
                 var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId);
                 var framework = frameworkService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
-                var model = new ConfirmChangePrimaryFrameworkViewModel(competencyAssessmentBase, framework);
-                return View("ConfirmChangePrimaryFramework", model);
+                var model = new ConfirmMakePrimaryFrameworkViewModel(competencyAssessmentBase, framework);
+                return View("ConfirmMaKePrimaryFramework", model);
         }
         [HttpPost]
-        [Route("/CompetencyAssessments/{competencyAssessmentId}/Frameworks/{frameworkId}/Change")]
-        public IActionResult ConfirmChangePrimaryFramework(ConfirmChangePrimaryFrameworkViewModel model)
+        [Route("/CompetencyAssessments/{competencyAssessmentId}/Frameworks/{frameworkId}/Make")]
+        public IActionResult ConfirmMaKePrimaryFramework(ConfirmMakePrimaryFrameworkViewModel model)
         {
             if (!ModelState.IsValid)
             {
-                return View("ConfirmChangePrimaryFramework", model);
+                return View("ConfirmMaKePrimaryFramework", model);
             }
             competencyAssessmentService.UpdatePrimaryFrameworkCompetencies(model.CompetencyAssessmentId, model.FrameworkId);
-            var baseModel = new CompetencyAssessmentFeaturesViewModel(model.CompetencyAssessmentId,
-                    model.FrameworkName,
-                    model.UserRole,
-                    model.FrameworkId);
-            SetcompetencyAssessmentFeaturesData(baseModel);
-            return RedirectToAction("CompetencyAssessmentFeatures", new { model.CompetencyAssessmentId, model.FrameworkId });
+            var features = competencyAssessmentService.UpdateCompetencyAssessmentFeaturesTaskStatus(model.CompetencyAssessmentId,
+                model.DescriptionStatus,
+                model.ProviderandCategoryStatus,
+                model.VocabularyStatus,
+                 model.WorkingGroupStatus,
+             model.AllframeworkCompetenciesStatus);
+            return RedirectToAction("ManageCompetencyAssessment", new { model.CompetencyAssessmentId, model.FrameworkId });
         }
         private void SetcompetencyAssessmentFeaturesData(CompetencyAssessmentFeaturesViewModel data)
         {
diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs
@@ -31,6 +31,7 @@ public interface ICompetencyAssessmentService
 
         int[] GetLinkedFrameworkCompetencyIds(int competencyAssessmentId, int frameworkId);
         CompetencyAssessmentFeatures? GetCompetencyAssessmentFeaturesTaskStatus(int competencyAssessmentId);
+        int? GetSelfAssessmentStructure(int competencyAssessmentId);
 
         //UPDATE DATA
         bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName);
@@ -291,5 +292,9 @@ public  bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkI
         {
             return competencyAssessmentDataService.UpdatePrimaryFrameworkCompetencies(assessmentId, frameworkId);
         }
+       public int? GetSelfAssessmentStructure(int competencyAssessmentId)
+        {
+            return competencyAssessmentDataService.GetSelfAssessmentStructure(competencyAssessmentId);
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ConfirmMakePrimaryFrameworkViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ConfirmMakePrimaryFrameworkViewModel.cs
@@ -0,0 +1,33 @@
+﻿using DigitalLearningSolutions.Data.Models.CompetencyAssessments;
+using DigitalLearningSolutions.Data.Models.Frameworks;
+using DigitalLearningSolutions.Web.Attributes;
+
+namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
+{
+    public class ConfirmMakePrimaryFrameworkViewModel
+    {
+        public ConfirmMakePrimaryFrameworkViewModel()
+        {}
+        public ConfirmMakePrimaryFrameworkViewModel(CompetencyAssessmentBase competencyAssessmentBase, DetailFramework framework)
+        {
+            CompetencyAssessmentId = competencyAssessmentBase.ID;
+            AssessmentName = competencyAssessmentBase.CompetencyAssessmentName;
+            FrameworkName = framework.FrameworkName;
+            FrameworkId = framework.ID;
+            Vocabulary = competencyAssessmentBase.Vocabulary;
+        }
+        public int CompetencyAssessmentId { get; set; }
+        public int UserRole { get; set; }
+        public string? AssessmentName { get; set; }
+        public string? FrameworkName { get; set; }
+        public int FrameworkId { get; set; }
+        public string? Vocabulary { get; set; }
+        [BooleanMustBeTrue(ErrorMessage = "You need to confirm that you want to make this the primary framework")]
+        public bool Confirm { get; set; }
+        public bool DescriptionStatus { get; set; }
+        public bool ProviderandCategoryStatus { get; set; }
+        public bool VocabularyStatus { get; set; }
+        public bool WorkingGroupStatus { get; set; }
+        public bool AllframeworkCompetenciesStatus { get; set; }
+    }
+}
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmMakePrimaryFramework.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmMakePrimaryFramework.cshtml
@@ -0,0 +1,59 @@
+﻿@using DigitalLearningSolutions.Web.Helpers
+@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
+@model ConfirmMakePrimaryFrameworkViewModel;
+@{
+    var errorHasOccurred = !ViewData.ModelState.IsValid;
+    ViewData["Title"] = "Competency Assessments - Change primary framework";
+}
+<div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-full">
+        @if (errorHasOccurred)
+        {
+            <vc:error-summary order-of-property-names="@(new[] { nameof(Model.Confirm) })" />
+        }
+
+        <h1 class="nhsuk-heading-xl">Make @Model.FrameworkName primary framework</h1>
+        <h2>Which features of the framework do you want to copy into this @Model.FrameworkName framework?</h2>
+    </div>
+</div>
+<div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-full">
+        <form class="nhsuk-u-margin-bottom-3" method="post" asp-action="ConfirmMakePrimaryFramework">
+            <nhs-form-group>
+                <vc:single-checkbox asp-for="@nameof(Model.DescriptionStatus)" label="Description" hint-text="The framework description will be copied into the competency assessment description."></vc:single-checkbox>
+            </nhs-form-group>
+            <nhs-form-group>
+                <vc:single-checkbox asp-for="@nameof(Model.ProviderandCategoryStatus)" label="Provider and category" hint-text="The framework branding (provider and category) will be copied."></vc:single-checkbox>
+            </nhs-form-group>
+            <nhs-form-group>
+                <vc:single-checkbox asp-for="@nameof(Model.VocabularyStatus)" label="Vocabulary" hint-text="The framework vocabulary (such as proficiency, competency, or capability) will be copied."></vc:single-checkbox>
+            </nhs-form-group>
+            <nhs-form-group>
+                <vc:single-checkbox asp-for="@nameof(Model.WorkingGroupStatus)" label="Working group" hint-text="Contributors and reviewers from the framework will be copied."></vc:single-checkbox>
+            </nhs-form-group>
+            <nhs-form-group>
+                <vc:single-checkbox asp-for="@nameof(Model.AllframeworkCompetenciesStatus)" label="All framework competencies" hint-text="All competencies in the framework will be copied."></vc:single-checkbox>
+            </nhs-form-group>
+            <input type="hidden" asp-for="CompetencyAssessmentId" />
+            <input type="hidden" asp-for="FrameworkId" />
+            <input type="hidden" asp-for="FrameworkName" />
+            <input type="hidden" asp-for="AssessmentName" />
+            <input type="hidden" asp-for="UserRole" />
+            <input type="hidden" asp-for="Vocabulary" />
+      
+            <vc:single-checkbox asp-for="@nameof(Model.Confirm)"
+                                label="I am sure that I wish to make @Model.FrameworkName the primary framework"
+                                hint-text="" />
+
+            <button class="nhsuk-button" type="submit">Make primary framework</button>
+        </form>
+        <div class="nhsuk-back-link">
+            <a class="nhsuk-back-link__link" asp-action="SelectFrameworkSources" asp-route-actionName="Summary" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
+                <svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                    <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
+                </svg>
+                Cancel
+            </a>
+        </div>
+    </div>
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
@@ -72,7 +72,7 @@
                             </a>
                         </li>
                         <li class="nhsuk-summary-list__actions-list-item">
-                            <a asp-action="ConfirmChangePrimaryFramework"
+                            <a asp-action="ConfirmMaKePrimaryFramework"
                                asp-route-frameworkId="@Model.AdditionalFrameworks.ElementAt(i).ID"
                                asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
                                 Make primary <span class="nhsuk-u-visually-hidden">@Model.AdditionalFrameworks.ElementAt(i).FrameworkName</span>

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public interface ICompetencyAssessmentDataService`
`34`	`34`	`IEnumerable<LinkedFramework> GetLinkedFrameworksForCompetencyAssessment(int competencyAssessmentId);`
`35`	`35`	`int[] GetLinkedFrameworkCompetencyIds(int competencyAssessmentId, int frameworkId);`
`36`	`36`	`CompetencyAssessmentFeatures? GetCompetencyAssessmentFeaturesTaskStatus(int competencyAssessmentId);`
	`37`	`+ int? GetSelfAssessmentStructure(int competencyAssessmentId);`
`37`	`38`
`38`	`39`	`//UPDATE DATA`
`39`	`40`	`bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName);`
`@@ -877,5 +878,13 @@ public bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkId`
`877`	`878`	`}`
`878`	`879`	`return true;`
`879`	`880`	`}`
	`881`	`+`
	`882`	`+ public int? GetSelfAssessmentStructure(int competencyAssessmentId)`
	`883`	`+ {`
	`884`	`+ return connection.QueryFirstOrDefault<int>(`
	`885`	`+ @"SELECT 1 from dbo.SelfAssessmentStructure where selfassessmentid = @competencyAssessmentId",`
	`886`	`+ new { competencyAssessmentId }`
	`887`	`+ );`
	`888`	`+ }`
`880`	`889`	`}`
`881`	`890`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public interface ICompetencyAssessmentService`
`31`	`31`
`32`	`32`	`int[] GetLinkedFrameworkCompetencyIds(int competencyAssessmentId, int frameworkId);`
`33`	`33`	`CompetencyAssessmentFeatures? GetCompetencyAssessmentFeaturesTaskStatus(int competencyAssessmentId);`
	`34`	`+ int? GetSelfAssessmentStructure(int competencyAssessmentId);`
`34`	`35`
`35`	`36`	`//UPDATE DATA`
`36`	`37`	`bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName);`
`@@ -291,5 +292,9 @@ public bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkI`
`291`	`292`	`{`
`292`	`293`	`return competencyAssessmentDataService.UpdatePrimaryFrameworkCompetencies(assessmentId, frameworkId);`
`293`	`294`	`}`
	`295`	`+ public int? GetSelfAssessmentStructure(int competencyAssessmentId)`
	`296`	`+ {`
	`297`	`+ return competencyAssessmentDataService.GetSelfAssessmentStructure(competencyAssessmentId);`
	`298`	`+ }`
`294`	`299`	`}`
`295`	`300`	`}`