TechnologyEnhancedLearning · kevwhitt-hee · Feb 11, 2025 · Jan 28, 2025 · Jan 30, 2025 · Jan 30, 2025
diff --git a/.github/workflows/build-and-deploy-production.yml b/.github/workflows/build-and-deploy-production.yml
@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/build-and-deploy-uat.yml b/.github/workflows/build-and-deploy-uat.yml
@@ -22,10 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -12,10 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: Add TechnologyEnhancedLearning as nuget package source
         run: dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text

diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
@@ -133,7 +133,8 @@ bool zeroBased
 
         int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false);
 
-        int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify);
+        int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID);
+
         int AddCustomFlagToFramework(int frameworkId, string flagName, string flagGroup, string flagTagClass);
         void UpdateFrameworkCustomFlag(int frameworkId, int id, string flagName, string flagGroup, string flagTagClass);
 
@@ -740,7 +741,7 @@ FROM FrameworkCollaborators fc
             );
         }
 
-        public int AddCollaboratorToFramework(int frameworkId, string? userEmail, bool canModify)
+        public int AddCollaboratorToFramework(int frameworkId, string? userEmail, bool canModify, int? centreID)
         {
             if (userEmail is null || userEmail.Length == 0)
             {
@@ -763,8 +764,8 @@ FROM    FrameworkCollaborators
             }
 
             var adminId = (int?)connection.ExecuteScalar(
-                @"SELECT AdminID FROM AdminUsers WHERE Email = @userEmail AND Active = 1",
-                new { userEmail }
+                @"SELECT AdminID FROM AdminUsers WHERE Email = @userEmail AND Active = 1 AND CentreID = @centreID",
+                new { userEmail, centreID }
             );
             if (adminId is null)
             {

diff --git a/...talLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs b/...talLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs
@@ -615,6 +615,41 @@ FROM SelfAssessmentResults
             );
         }
 
+        public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(
+          int delegateUserId,
+          int selfAssessmentId,
+          int competencyId
+      )
+        {
+            return connection.Query<SelfAssessmentResult>(
+                @"SELECT
+                         s.ID,
+                        s.SelfAssessmentID,
+                        s.CompetencyID,
+                        s.AssessmentQuestionID,
+                        s.Result,
+                        s.DateTime,
+                        s.SupportingComments,
+                        s.DelegateUserId
+                    FROM SelfAssessmentResults s inner join 
+				SelfAssessmentResultSupervisorVerifications sv ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0 
+                    WHERE s.CompetencyID = @competencyId
+                        AND s.SelfAssessmentID = @selfAssessmentId
+                        AND s.DelegateUserID = @delegateUserId",
+                new { selfAssessmentId, delegateUserId, competencyId }
+            );
+        }
+
+        public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id)
+        {
+
+            connection.Execute(@"UPDATE SelfAssessmentResults SET Result = NULL WHERE ID =  @id", new { id});
+
+            connection.Execute(
+                     @"delete from SelfAssessmentResultSupervisorVerifications WHERE SelfAssessmentResultId = @id", new { id });
+
+        }
+
         private static string PrintResult(
             int competencyId,
             int selfAssessmentId,

diff --git a/...earningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs b/...earningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs
@@ -173,6 +173,12 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
         bool IsCentreSelfAssessment(int selfAssessmentId, int centreId);
         bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId);
         int GetSelfAssessmentCategoryId(int selfAssessmentId);
+        void  RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
+        public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(
+        int delegateUserId,
+        int selfAssessmentId,
+        int competencyId
+    );
     }
     public partial class SelfAssessmentDataService : ISelfAssessmentDataService
     {

diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs
@@ -166,7 +166,7 @@ public IActionResult CreateNewFramework(string actionname, int frameworkId = 0)
                 var sessionNewFramework = multiPageFormService.GetMultiPageFormData<SessionNewFramework>(
                     MultiPageFormDataFeature.AddNewFramework,
                     TempData
-                ).GetAwaiter().GetResult(); 
+                ).GetAwaiter().GetResult();
                 multiPageFormService.SetMultiPageFormData(sessionNewFramework, MultiPageFormDataFeature.AddNewFramework, TempData);
                 detailFramework = sessionNewFramework.DetailFramework;
             }
@@ -252,7 +252,7 @@ public IActionResult SaveNewFramework(string frameworkname, string actionname)
             {
                 return StatusCode(500);
             }
-            var sessionNewFramework = multiPageFormService.GetMultiPageFormData<SessionNewFramework>(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult();  
+            var sessionNewFramework = multiPageFormService.GetMultiPageFormData<SessionNewFramework>(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult();
             multiPageFormService.SetMultiPageFormData(
                 sessionNewFramework,
                 MultiPageFormDataFeature.AddNewFramework,
@@ -641,7 +641,8 @@ public IActionResult AddCollaborators(string actionname, int frameworkId, bool e
         [Route("/Frameworks/Collaborators/{actionname}/{frameworkId}/")]
         public IActionResult AddCollaborator(string actionname, string userEmail, bool canModify, int frameworkId)
         {
-            var collaboratorId = frameworkService.AddCollaboratorToFramework(frameworkId, userEmail, canModify);
+            int? centreID = GetCentreId();
+            var collaboratorId = frameworkService.AddCollaboratorToFramework(frameworkId, userEmail, canModify, centreID);
             if (collaboratorId > 0)
             {
                 frameworkNotificationService.SendFrameworkCollaboratorInvite(collaboratorId, GetAdminId());

diff --git a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs
@@ -1532,6 +1532,22 @@ ManageOptionalCompetenciesViewModel model
                     );
                 }
             }
+            var optionalCompetency =
+            (selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId)).Where(x => !x.IncludedInSelfAssessment);
+            if (optionalCompetency.Any())
+            {
+                foreach (var optinal in optionalCompetency)
+                {
+                    var selfAssessmentResults = selfAssessmentService.GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, optinal.Id);
+                    if (selfAssessmentResults.Any())
+                    {
+                        foreach (var item in selfAssessmentResults)
+                        {
+                            selfAssessmentService.RemoveReviewCandidateAssessmentOptionalCompetencies(item.Id);
+                        }
+                    }
+                }
+            }
             if (model.GroupOptionalCompetenciesChecked != null)
             {
                 var optionalCompetencies =
@@ -1549,7 +1565,7 @@ ManageOptionalCompetenciesViewModel model
                 }
 
             }
-
+           
             return RedirectToAction("SelfAssessmentOverview", new { selfAssessmentId, vocabulary });
         }
 

diff --git a/DigitalLearningSolutions.Web/Scripts/index.d.ts b/DigitalLearningSolutions.Web/Scripts/index.d.ts
@@ -1,23 +1,23 @@
-declare module 'nhsuk-frontend/packages/components/header/header' {
+declare module 'nhse-tel-frontend/packages/components/header/header' {
   export default function Header(): void;
 }
 
-declare module 'nhsuk-frontend/packages/components/skip-link/skip-link' {
+declare module 'nhse-tel-frontend/packages/components/skip-link/skip-link' {
   export default function SkipLink(): void;
 }
 
-declare module 'nhsuk-frontend/packages/components/details/details' {
+declare module 'nhse-tel-frontend/packages/components/details/details' {
   export default function Details(): void;
 }
 
-declare module 'nhsuk-frontend/packages/components/radios/radios' {
+declare module 'nhse-tel-frontend/packages/components/radios/radios' {
   export default function Radios(): void;
 }
 
-declare module 'nhsuk-frontend/packages/components/checkboxes/checkboxes' {
+declare module 'nhse-tel-frontend/packages/components/checkboxes/checkboxes' {
   export default function Checkboxes(): void;
 }
 
-declare module 'nhsuk-frontend/packages/components/card/card' {
+declare module 'nhse-tel-frontend/packages/components/card/card' {
   export default function Card(): void;
 }
diff --git a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts
@@ -1,12 +1,12 @@
 // Components
-import Header from 'nhsuk-frontend/packages/components/header/header';
-import SkipLink from 'nhsuk-frontend/packages/components/skip-link/skip-link';
-import Details from 'nhsuk-frontend/packages/components/details/details';
-import Radios from 'nhsuk-frontend/packages/components/radios/radios';
-import Checkboxes from 'nhsuk-frontend/packages/components/checkboxes/checkboxes';
+import Header from 'nhse-tel-frontend/packages/components/header/header';
+import SkipLink from 'nhse-tel-frontend/packages/components/skip-link/skip-link';
+import Details from 'nhse-tel-frontend/packages/components/details/details';
+import Radios from 'nhse-tel-frontend/packages/components/radios/radios';
+import Checkboxes from 'nhse-tel-frontend/packages/components/checkboxes/checkboxes';
 
 // Polyfills
-import 'nhsuk-frontend/packages/polyfills';
+import 'nhse-tel-frontend/packages/polyfills';
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';
 

diff --git a/...lLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts b/...lLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts
@@ -1,4 +1,4 @@
-import Details from 'nhsuk-frontend/packages/components/details/details';
+import Details from 'nhse-tel-frontend/packages/components/details/details';
 import _ from 'lodash';
 import {
   setUpFilter, filterSearchableElements, IAppliedFilterTag,

diff --git a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts
@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import Details from 'nhsuk-frontend/packages/components/details/details';
+import Details from 'nhse-tel-frontend/packages/components/details/details';
 import {
   ISearchableData,
   ISearchableElement,

diff --git a/DigitalLearningSolutions.Web/Services/FrameworkService.cs b/DigitalLearningSolutions.Web/Services/FrameworkService.cs
@@ -127,7 +127,8 @@ bool zeroBased
 
         int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId);
 
-        int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify);
+        int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID);
+
         int AddCustomFlagToFramework(int frameworkId, string flagName, string flagGroup, string flagTagClass);
         void UpdateFrameworkCustomFlag(int frameworkId, int id, string flagName, string flagGroup, string flagTagClass);
 
@@ -267,9 +268,9 @@ public FrameworkService(IFrameworkDataService frameworkDataService)
             this.frameworkDataService = frameworkDataService;
         }
 
-        public int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify)
+        public int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID)
         {
-            return frameworkDataService.AddCollaboratorToFramework(frameworkId, userEmail, canModify);
+            return frameworkDataService.AddCollaboratorToFramework(frameworkId, userEmail, canModify, centreID);
         }
 
         public void AddCompetencyAssessmentQuestion(int frameworkCompetencyId, int assessmentQuestionId, int adminId)

diff --git a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs
@@ -150,7 +150,17 @@ public int GetSelfAssessmentActivityDelegatesExportCount(string searchString, st
         bool IsCentreSelfAssessment(int selfAssessmentId, int centreId);
         bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId);
         public int GetSelfAssessmentCategoryId(int selfAssessmentId);
-
+        IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultsForDelegateSelfAssessmentCompetency(
+           int delegateUserId,
+           int selfAssessmentId,
+           int competencyId
+       );
+        public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(
+        int delegateUserId,
+        int selfAssessmentId,
+        int competencyId
+    );
+       void RemoveReviewCandidateAssessmentOptionalCompetencies(int id);
     }
 
     public class SelfAssessmentService : ISelfAssessmentService
@@ -575,5 +585,25 @@ public int GetSelfAssessmentCategoryId(int selfAssessmentId)
         {
             return selfAssessmentDataService.GetSelfAssessmentCategoryId(selfAssessmentId);
         }
+        public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultsForDelegateSelfAssessmentCompetency(
+           int delegateUserId,
+           int selfAssessmentId,
+           int competencyId
+       )
+        {
+            return selfAssessmentDataService.GetSelfAssessmentResultsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, competencyId);
+        }
+        public IEnumerable<SelfAssessmentResult> GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(
+        int delegateUserId,
+        int selfAssessmentId,
+        int competencyId
+    )
+        {
+            return selfAssessmentDataService.GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency(delegateUserId, selfAssessmentId, competencyId);
+        }
+        public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id)
+        {
+             selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id);
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 
 .nhsuk-card.comment {
   border-width: medium;

diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 @use "../shared/headingButtons" as *;
 @use "../shared/searchableElements/searchableElements" as *;
 $nhs-dark-grey: #425563;

diff --git a/DigitalLearningSolutions.Web/Styles/home/Policies.scss b/DigitalLearningSolutions.Web/Styles/home/Policies.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 
 .custom-ordered-list {
   list-style: none;

diff --git a/DigitalLearningSolutions.Web/Styles/home/brands.scss b/DigitalLearningSolutions.Web/Styles/home/brands.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 @use "../shared/cardWithButtons";
 @use "../shared/searchableElements/searchableElements";
 

diff --git a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 
 .learning-content-item {
   margin-bottom: 72px;

diff --git a/DigitalLearningSolutions.Web/Styles/home/products.scss b/DigitalLearningSolutions.Web/Styles/home/products.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 
 .product {
   margin-bottom: 72px;

diff --git a/DigitalLearningSolutions.Web/Styles/home/welcome.scss b/DigitalLearningSolutions.Web/Styles/home/welcome.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 
 .welcome-page-button-container {
   margin-bottom: 32px;

diff --git a/DigitalLearningSolutions.Web/Styles/index.scss b/DigitalLearningSolutions.Web/Styles/index.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 
 $iframe-padding-bottom: nhsuk-spacing(8) * 2;
 

diff --git a/DigitalLearningSolutions.Web/Styles/layout.scss b/DigitalLearningSolutions.Web/Styles/layout.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 @use "shared/breakpoints" as *;
 
 html {

diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss
@@ -1,5 +1,5 @@
-@use "nhsuk-frontend/packages/core/all" as *;
-@import "nhsuk-frontend/packages/components/tag/_tag";
+@use "nhse-tel-frontend/packages/core/all" as *;
+@import "nhse-tel-frontend/packages/components/tag/_tag";
 
 .learning-menu-card {
   border: none;

diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 
 .float-right-additional-information {
   @include mq($until: desktop) {

diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss
@@ -1,4 +1,4 @@
-@use "nhsuk-frontend/packages/core/all" as *;
+@use "nhse-tel-frontend/packages/core/all" as *;
 
 .objectives-card {
   @include nhsuk-typography-responsive(19);

diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss
@@ -4,7 +4,7 @@
 // Author: Darlan Rod https://github.com/darlanrod
 // Version 1.5.2
 // MIT License
-@use "nhsuk-frontend/packages/core/settings/colours" as *;
+@use "nhse-tel-frontend/packages/core/settings/colours" as *;
 
 $track-color: $color_nhsuk-grey-3 !default;
 $thumb-color: $color_nhsuk-grey-2 !default;