Merge pull request #3368 from TechnologyEnhancedLearning/DLS-Release-v1.2.3

Dls release v1.2.3 to UAT

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs

@@ -21,7 +21,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 
 namespace DigitalLearningSolutions.Web.Controllers.SuperAdmin.Centres
 {
@@ -331,8 +330,7 @@ public IActionResult ManageCentreManager(EditCentreManagerDetailsViewModel editC
         {
             editCentreManagerDetailsViewModel.FirstName = editCentreManagerDetailsViewModel.FirstName == null ? string.Empty : editCentreManagerDetailsViewModel.FirstName.Trim();
             editCentreManagerDetailsViewModel.LastName = editCentreManagerDetailsViewModel.LastName == null ? string.Empty : editCentreManagerDetailsViewModel.LastName.Trim();
-            editCentreManagerDetailsViewModel.Telephone = editCentreManagerDetailsViewModel.Telephone != null   ? Regex.Replace(editCentreManagerDetailsViewModel.Telephone, @"\s+", "")
-                : string.Empty; ;
+            editCentreManagerDetailsViewModel.Telephone = editCentreManagerDetailsViewModel.Telephone?.Trim() ?? string.Empty;
             if (!ModelState.IsValid)
             {
                 return View(editCentreManagerDetailsViewModel);

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -37,11 +37,13 @@ public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook
             var newCompetencyIds = competencyRows.Select(row => row.ID ?? 0).ToList();
             var existingIds = frameworkService.GetFrameworkCompetencyOrder(frameworkId, newCompetencyIds);
             var existingGroups = frameworkService
-                .GetFrameworkCompetencyGroups(frameworkId)
+                .GetFrameworkCompetencyGroups(frameworkId).Where(x => x.FrameworkCompetencies.Any()).ToList()
                 .Select(row => row.Name)
                 .Distinct()
                 .ToList();
-            var newGroups = competencyRows.Select(row => row.CompetencyGroup ?? "").Distinct().ToList();
+            var newGroups = competencyRows.Select(row => row.CompetencyGroup)
+                .Where(g => !string.IsNullOrEmpty(g))
+                .Distinct().ToList();
             foreach (var competencyRow in competencyRows)
             {
                 PreProcessCompetencyRow(competencyRow, newCompetencyIds, existingIds, existingGroups, newGroups);

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/CompetencySelfAssessmentCertificate.cshtml

@@ -76,20 +76,21 @@
             <h1>Certificate</h1>
 
             <h2>@Model.CompetencySelfAssessmentCertificates.SelfAssessment - @Model.CompetencySelfAssessmentCertificates.LearnerName </h2>
-            @if (Model.Vocabulary == "Proficiencies")
+
+            @if (Model.Vocabulary == "ProfileAssessment")
             {
                 <a class="nhsuk-button "
-                   asp-controller="LearningPortal"
+                   asp-controller="Supervisor"
                    asp-route-candidateAssessmentId="@Model.CompetencySelfAssessmentCertificates.CandidateAssessmentID"
                    asp-action="DownloadCertificate"
                    role="button">
                     Download certificate
                 </a>
             }
-            @if (Model.Vocabulary == "ProfileAssessment")
+            else
             {
                 <a class="nhsuk-button "
-                   asp-controller="Supervisor"
+                   asp-controller="LearningPortal"
                    asp-route-candidateAssessmentId="@Model.CompetencySelfAssessmentCertificates.CandidateAssessmentID"
                    asp-action="DownloadCertificate"
                    role="button">