Merge remote-tracking branch 'origin/DLS-Release-v1.1.1' into Develop/Fixes/TD-4893-Delegateactivities-viewcoursedelegatesresultedin500errorwhencourseadminfieldappliedfiltersgotdeleted

Author: sherif-olaboye

.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:

.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:

.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

DigitalLearningSolutions.Data.Migrations/202410071401_UpdateCandidateAssessmentSupervisorsTabl.cs

@@ -189,14 +189,10 @@ public IActionResult AddEditFrameworkCompetency(int frameworkId, FrameworkCompet
                     FrameworkGroupId = frameworkCompetencyGroupId,
                     FrameworkCompetencyId = frameworkCompetencyId,
                     FrameworkConfig = detailFramework?.FrameworkConfig,
-                    Competency = new FrameworkCompetency()
-                    {
-                        Name = frameworkCompetency.Name,
-                        Description = frameworkCompetency.Description
-                    },
+                    Competency = frameworkCompetency,
                     MatchingSearchResults = matchingSearchResults.Count,
                     SameCompetency = similarItems,
-                    selectedFlagIds = selectedFlagIds.Any() ? selectedFlagIds.Select(a => a.ToString()).Aggregate((b, c) => b + "," + c) : string.Empty,
+                    selectedFlagIds = selectedFlagIds != null ? selectedFlagIds.Select(a => a.ToString()).Aggregate((b, c) => b + "," + c) : string.Empty
                 };
                 return View("Developer/SimilarCompetency", model);
             }

DigitalLearningSolutions.Web/Controllers/FrameworksController/Competencies.cs

@@ -47,6 +47,6 @@ public SupervisorDelegateViewModel() { }
         [DefaultValue(false)]
         public bool ConfirmedRemove { get; set; }
         public int SelfAssessmentCategory { get; set; }
-        public IEnumerable<SelectListItem> SelfAssessmentCategories { get; set; }
+        public IEnumerable<SelectListItem>? SelfAssessmentCategories { get; set; }
     }
 }

DigitalLearningSolutions.Web/ViewModels/Supervisor/SupervisorDelegateViewModel.cs

@@ -19,14 +19,14 @@
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-controller="Supervisor" asp-action="MyStaffList">My Staff</a></li>
                 <li class="nhsuk-breadcrumb__item">
                     <a class="nhsuk-breadcrumb__link trigger-loader" asp-controller="Supervisor"
-                   asp-action="DelegateProfileAssessments"
-                   asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]">@Model.SupervisorDelegate.FirstName @Model.SupervisorDelegate.LastName</a>
+                       asp-action="DelegateProfileAssessments"
+                       asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]">@Model.SupervisorDelegate.FirstName @Model.SupervisorDelegate.LastName</a>
                 </li>
                 <li class="nhsuk-breadcrumb__item">
                     <a class="nhsuk-breadcrumb__link trigger-loader" asp-controller="Supervisor"
-                   asp-action="ReviewDelegateSelfAssessment"
-                   asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]"
-                   asp-route-candidateAssessmentId="@Model.DelegateSelfAssessment.ID">
+                       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)
                     </a>
                 </li>
@@ -37,9 +37,9 @@
         </div>
         <p class="nhsuk-breadcrumb__back">
             <a class="nhsuk-breadcrumb__backlink" asp-controller="Supervisor"
-           asp-action="ReviewDelegateSelfAssessment"
-           asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]"
-           asp-route-candidateAssessmentId="@Model.DelegateSelfAssessment.ID">
+               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)
             </a>
         </p>
@@ -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;
         <div class="nhsuk-summary-list__row">
             <dt class="nhsuk-summary-list__key">
                 @(((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")
             </dt>
             <dd class="nhsuk-summary-list__value">
                 @Html.Raw(Model.Competency.AssessmentQuestions.First().SupportingComments)