Dls release v1.2.0

.github/dependabot.yml

@@ -4,23 +4,35 @@
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 
 version: 2
+registries:
+  tel-azure-package-source:
+    type: nuget-feed
+    url: "https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json"
+    username: "kevin.whittaker" 
+    password: ${{ secrets.AZURE_DEVOPS_PAT }}   
+  nuget-package-source:
+    type: nuget-feed
+    url: "https://api.nuget.org/v3/index.json" 
 updates:
   - package-ecosystem: "nuget" 
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
     open-pull-requests-limit: 10
+    registries:
+      - tel-azure-package-source
+      - nuget-package-source
     target-branch: "Automatic_version_update_dependabot"
     ignore:
       # Ignore updates to packages that start with 'Wildcards'
       - dependency-name: "Microsoft.FeatureManagement.AspNetCore*"
       # Ignore some updates to the package
       - dependency-name: "Microsoft.VisualStudio.Web.CodeGeneration.Design"
-        versions: [">7.0.0"]
+        versions: [">9.0.0"]
       - dependency-name: "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"
-        versions: [">7.0.0"]
+        versions: [">9.0.0"]
       - dependency-name: "Microsoft.AspNetCore.Mvc.Testing"
-        versions: [">7.0.0"]
+        versions: [">9.0.0"]
       - dependency-name: "Selenium.WebDriver.ChromeDriver"
         versions: ">=113.0.5672.1278" # Recommended version
       # For all packages, ignore all patch updates
@@ -34,7 +46,7 @@ updates:
       interval: "daily"
     target-branch: "Automatic_version_update_dependabot"
     #  - "dependencies"
-    open-pull-requests-limit: 7
+    open-pull-requests-limit: 10
     ignore:
       - dependency-name: "*"
         update-types: ["version-update:semver-major"]

.github/workflows/auto-merge.yml

@@ -69,7 +69,12 @@ jobs:
                     echo "Skipping 'auto-merge' workflow check to prevent self-referencing."
                     continue
                   fi
-
+
+                # If any check is still queued, set ALL_COMPLETED to false
+                if [[ "$status" == "QUEUED" ]]; then
+                  ALL_COMPLETED=false
+                fi
+
                 # If any check is still in progress, set ALL_COMPLETED to false
                 if [[ "$status" == "IN_PROGRESS" ]]; then
                   ALL_COMPLETED=false

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -537,16 +537,16 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
             if (candidateAssessmentId > 1 && supervisorDelegateId == 0)
             {
                 connection.Execute(
-                        @"UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
+                        @"UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic, EnrolledByAdminId = @enrolledByAdminId
                   WHERE ID = @candidateAssessmentId",
-                        new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic }
+                        new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic, enrolledByAdminId }
                     );
             }
             if (candidateAssessmentId > 1 && supervisorDelegateId != 0)
             {
                 string sqlQuery = $@"
                 BEGIN TRANSACTION
-                UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic
+                UPDATE CandidateAssessments SET RemovedDate = NULL, EnrolmentMethodId = @enrolmentMethodId, CompleteByDate = @completeByDateDynamic, EnrolledByAdminId = @enrolledByAdminId
                   WHERE ID = @candidateAssessmentId
 
                 UPDATE CandidateAssessmentSupervisors SET Removed = NULL
@@ -556,7 +556,7 @@ BEGIN TRANSACTION
                 COMMIT TRANSACTION";
 
                 connection.Execute(sqlQuery
-                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic, supervisorDelegateId });
+                , new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic, supervisorDelegateId, enrolledByAdminId });
             }
 
             if (supervisorId > 0)

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs

@@ -153,7 +153,7 @@ int delegateUserId
                     WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (sd.DelegateUserID = @delegateUserId) AND (ca.SelfAssessmentID = @selfAssessmentId)
                         AND (sd.SupervisorAdminID IS NOT NULL) AND (coalesce(sasr.SelfAssessmentReview, 1) = 1)
                         AND (cas.ID NOT IN (SELECT CandidateAssessmentSupervisorID FROM CandidateAssessmentSupervisorVerifications WHERE Verified IS NULL))
-                        AND au.Active = 1
+                        AND au.Active = 1 AND (au.Supervisor = 1 or au.NominatedSupervisor = 1)
                         AND (au.CategoryID = 0 OR au.CategoryID IN (select CategoryID from SelfAssessments where ID = @selfAssessmentId))
                 ORDER BY SupervisorName",
                 new { selfAssessmentId, delegateUserId }

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -126,13 +126,35 @@ public SupervisorDataService(IDbConnection connection, ILogger<SupervisorDataSer
         public DashboardData? GetDashboardDataForAdminId(int adminId)
         {
             return connection.Query<DashboardData>(
-                @"  SELECT (SELECT COUNT(sd.ID) AS StaffCount
-                        FROM SupervisorDelegates sd
-                        LEFT OUTER JOIN users u
-                            ON u.id = sd.DelegateUserID
-                            AND u.Active = 1
-                        WHERE  (sd.SupervisorAdminID = @adminId) 
-	                        AND (sd.Removed IS NULL)) AS StaffCount,
+                @"SELECT (SELECT COUNT(sd.ID) AS StaffCount
+                        FROM   CustomPrompts AS cp6 
+	                    RIGHT OUTER JOIN CustomPrompts AS cp5 
+	                    RIGHT OUTER JOIN DelegateAccounts AS da
+	                    RIGHT OUTER JOIN SupervisorDelegates AS sd 
+	                    INNER JOIN AdminUsers AS au 
+		                    ON sd.SupervisorAdminID = au.AdminID 
+	                    INNER JOIN Centres AS ct 
+		                    ON au.CentreID = ct.CentreID 
+	                    ON da.CentreID = ct.CentreID 
+		                    AND da.UserID = sd.DelegateUserID 
+	                    LEFT OUTER JOIN Users AS u 
+	                    LEFT OUTER JOIN JobGroups AS jg 
+		                    ON u.JobGroupID = jg.JobGroupID
+	                    ON da.UserID = u.ID 
+	                    LEFT OUTER JOIN CustomPrompts AS cp1 
+		                    ON ct.CustomField1PromptID = cp1.CustomPromptID 
+	                    LEFT OUTER JOIN CustomPrompts AS cp2 
+		                    ON ct.CustomField2PromptID = cp2.CustomPromptID 
+	                    LEFT OUTER JOIN CustomPrompts AS cp3 
+		                    ON ct.CustomField3PromptID = cp3.CustomPromptID 
+	                    LEFT OUTER JOIN CustomPrompts AS cp4 
+		                    ON ct.CustomField4PromptID = cp4.CustomPromptID 
+	                    ON cp5.CustomPromptID = ct.CustomField5PromptID 
+	                    ON cp6.CustomPromptID = ct.CustomField6PromptID 
+	                    LEFT OUTER JOIN AdminAccounts AS au2 
+		                    ON da.UserID = au2.UserID AND da.CentreID = au2.CentreID
+                    WHERE (sd.SupervisorAdminID = @adminId) AND (sd.Removed IS NULL) AND 
+                     (u.ID = da.UserID OR sd.DelegateUserID IS NULL)) AS StaffCount,
                          (SELECT COUNT(ID) AS StaffCount
                          FROM SupervisorDelegates AS SupervisorDelegates_1
                          WHERE (SupervisorAdminID = @adminId)

DigitalLearningSolutions.Data/Models/Frameworks/FrameworkCompetency.cs

@@ -14,6 +14,7 @@ public class FrameworkCompetency : BaseSearchableItem
         public int AssessmentQuestions { get; set; }
         public int CompetencyLearningResourcesCount { get; set; }
         public string? FrameworkName { get; set; }
+        public bool? AlwaysShowDescription { get; set; }
 
         public override string SearchableName
         {

DigitalLearningSolutions.Data/Models/Frameworks/Import/BulkCompetency.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DigitalLearningSolutions.Data.Models.Frameworks.Import
+{
+    public class BulkCompetency
+    {
+        public int? ID { get; set; }
+        public string? CompetencyGroup { get; set; }
+        public string? GroupDescription { get; set; }
+        public string? Competency { get; set; }
+        public string? CompetencyDescription { get; set; }
+        public bool? AlwaysShowDescription { get; set; }
+        public string? FlagsCsv { get; set; }
+    }
+}

DigitalLearningSolutions.Data/Models/Frameworks/Import/CompetencyTableRow.cs

@@ -1,53 +1,69 @@
 namespace DigitalLearningSolutions.Data.Models.Frameworks.Import
 {
     using ClosedXML.Excel;
-    using System;
-    using System.Collections.Generic;
-    using System.Text;
+
     public enum RowStatus
     {
         NotYetProcessed,
         Skipped,
-        CompetencyGroupInserted,
         CompetencyGroupAndCompetencyInserted,
-        CompetencyInserted
+        CompetencyInserted,
+        CompetencyUpdated,
+        CompetencyGroupInserted,
+        CompetencyGroupUpdated,
+        CompetencyGroupAndCompetencyUpdated,
+        InvalidAlwaysShowDescription,
+        InvalidId
     }
-    public class CompetencyTableRow
+    public class CompetencyTableRow : BulkCompetency
     {
         public CompetencyTableRow(IXLTable table, IXLRangeRow row)
         {
             string? FindFieldValue(string name)
             {
-                var colNumber = table.FindColumn(col => col.FirstCell().Value.ToString()?.ToLower() == name).ColumnNumber();
+                var colNumber = table.FindColumn(col => col.FirstCell().Value.ToString()?.ToLower() == name.ToLower()).ColumnNumber();
                 return row.Cell(colNumber).GetValue<string?>();
             }
 
             RowNumber = row.RowNumber();
-            CompetencyGroupName = FindFieldValue("competency group");
-            CompetencyName = FindFieldValue("competency name");
-            CompetencyDescription = FindFieldValue("competency description");
+            ID = row.Cell(1).GetValue<int?>();
+            CompetencyGroup = row.Cell(2).GetValue<string?>();
+            GroupDescription = row.Cell(3).GetValue<string?>();
+            Competency = row.Cell(4).GetValue<string?>();
+            CompetencyDescription = row.Cell(5).GetValue<string?>();
+            AlwaysShowDescriptionRaw = FindFieldValue("AlwaysShowDescription");
+            AlwaysShowDescription = bool.TryParse(AlwaysShowDescriptionRaw, out var hasPrn) ? hasPrn : (bool?)null;
+            FlagsCsv = FindFieldValue("FlagsCSV");
             RowStatus = RowStatus.NotYetProcessed;
         }
         public int RowNumber { get; set; }
-        public string? CompetencyGroupName { get; set; }
-        public string? CompetencyName { get; set; }
-        public string? CompetencyDescription { get; set; }
+        public int CompetencyOrderNumber { get; set; }
+        public string? AlwaysShowDescriptionRaw { get; set; }
         public ImportCompetenciesResult.ErrorReason? Error { get; set; }
         public RowStatus RowStatus { get; set; }
+        public bool Reordered { get; set; } = false;
         public bool Validate()
         {
-            if (string.IsNullOrEmpty(CompetencyName))
+            if (string.IsNullOrEmpty(Competency))
             {
                 Error = ImportCompetenciesResult.ErrorReason.MissingCompetencyName;
             }
-            else if (CompetencyGroupName?.Length > 255)
+            else if (CompetencyGroup?.Length > 255)
             {
                 Error = ImportCompetenciesResult.ErrorReason.TooLongCompetencyGroupName;
             }
-            else if (CompetencyName.Length > 500)
+            else if (Competency.Length > 500)
             {
                 Error = ImportCompetenciesResult.ErrorReason.TooLongCompetencyName;
             }
+            else if (!string.IsNullOrWhiteSpace(AlwaysShowDescriptionRaw) && !bool.TryParse(AlwaysShowDescriptionRaw, out _))
+            {
+                Error = ImportCompetenciesResult.ErrorReason.InvalidAlwaysShowDescription;
+            }
+            else if (RowStatus == RowStatus.InvalidId)
+            {
+                Error = ImportCompetenciesResult.ErrorReason.InvalidId;
+            }
 
             return !Error.HasValue;
         }

DigitalLearningSolutions.Data/Models/Frameworks/Import/ImportCompetenciesResult.cs

@@ -8,10 +8,11 @@ public class ImportCompetenciesResult
     {
         public enum ErrorReason
         {
+            InvalidId,
             MissingCompetencyName,
-            TooLongCompetencyGroupName,
             TooLongCompetencyName,
-            AlreadyExists
+            TooLongCompetencyGroupName,
+            InvalidAlwaysShowDescription
         }
         public ImportCompetenciesResult() { }
 
@@ -20,16 +21,39 @@ IReadOnlyCollection<CompetencyTableRow> competencyTableRows
         )
         {
             ProcessedCount = competencyTableRows.Count;
-            CompetenciesInsertedCount = competencyTableRows.Count(dr => dr.RowStatus == RowStatus.CompetencyInserted | dr.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted);
-            CompetencyGroupsInsertedCount = competencyTableRows.Count(dr => dr.RowStatus == RowStatus.CompetencyGroupInserted | dr.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted);
-            SkippedCount = competencyTableRows.Count(dr => dr.RowStatus == RowStatus.Skipped);
+            CompetencyAddedCount = competencyTableRows.Count(dr => dr.RowStatus == RowStatus.CompetencyInserted | dr.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted);
+            CompetencyUpdatedCount = competencyTableRows.Count(dr => dr.RowStatus == RowStatus.CompetencyUpdated | dr.RowStatus == RowStatus.CompetencyGroupAndCompetencyUpdated);
+            GroupAddedCount = competencyTableRows.Count(dr => dr.RowStatus == RowStatus.CompetencyGroupInserted | dr.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted);
+            SkippedCount = competencyTableRows.Count(dr => dr.RowStatus == RowStatus.Skipped && dr.Reordered == false);
+            CompetencyReorderedCount = competencyTableRows.Count(dr => dr.Reordered == true);
             Errors = competencyTableRows.Where(dr => dr.Error.HasValue).Select(dr => (dr.RowNumber, dr.Error!.Value));
+            FlagCount = competencyTableRows
+                .Where(row => !string.IsNullOrWhiteSpace(row.FlagsCsv))
+                .SelectMany(static row => row.FlagsCsv.Split(',', StringSplitOptions.RemoveEmptyEntries))
+                .Count();
+            DistinctFlagsCount = competencyTableRows
+                .Where(row => !string.IsNullOrWhiteSpace(row.FlagsCsv))
+                .SelectMany(row => row.FlagsCsv.Split(',', StringSplitOptions.RemoveEmptyEntries))
+                .Select(flag => flag.Trim())
+                .Distinct()
+                .Count();
+            CompetencyGroupCount = competencyTableRows
+                .Where(row => !string.IsNullOrWhiteSpace(row.CompetencyGroup))
+                .Select(static row => row.CompetencyGroup)
+                .Distinct()
+                .Count();
         }
 
         public IEnumerable<(int RowNumber, ErrorReason Reason)>? Errors { get; set; }
         public int ProcessedCount { get; set; }
-        public int CompetenciesInsertedCount { get; set; }
-        public int CompetencyGroupsInsertedCount { get; set; }
+        public int CompetencyAddedCount { get; set; }
+        public int CompetencyUpdatedCount { get; set; }
+        public int CompetencyReorderedCount { get; set; }
+        public int GroupAddedCount { get; set; }
+        public int GroupUpdatedCount { get; set; }
         public int SkippedCount { get; set; }
+        public int FlagCount { get; set; }
+        public int DistinctFlagsCount { get; set; }
+        public int CompetencyGroupCount { get; set; }
     }
 }

DigitalLearningSolutions.Data/Models/MultiPageFormData/AddNewCentreCourse/AddNewCentreCourseTempData.cs

@@ -17,7 +17,7 @@ public AddNewCentreCourseTempData()
         public CourseOptionsTempData? CourseOptionsData { get; set; }
         public CourseContentTempData? CourseContentData { get; set; }
         public List<SectionContentTempData>? SectionContentData { get; set; }
-
+        public bool EditCourseContent { get; set; }
         public void SetApplicationAndResetModels(ApplicationDetails application)
         {
             if (Application == application)

DigitalLearningSolutions.Web.Tests/Controllers/Frameworks/FrameworkControllerTests.cs

@@ -12,6 +12,8 @@
     using Microsoft.Extensions.Logging;
     using NUnit.Framework;
     using GDS.MultiPageFormData;
+    using DigitalLearningSolutions.Data.Utilities;
+    using Microsoft.AspNetCore.Hosting;
 
     public partial class FrameworkControllerTests
     {
@@ -28,6 +30,8 @@ public partial class FrameworkControllerTests
         private ILearningHubApiClient learningHubApiClient = null!;
         private ISearchSortFilterPaginateService searchSortFilterPaginateService = null!;
         private IMultiPageFormService multiPageFormService = null!;
+        private IClockUtility clockUtility = null!;
+        private IWebHostEnvironment webHostEnvironment = null!;
 
         [SetUp]
         public void SetUp()
@@ -42,7 +46,8 @@ public void SetUp()
             learningHubApiClient = A.Fake<ILearningHubApiClient>();
             searchSortFilterPaginateService = A.Fake<ISearchSortFilterPaginateService>();
             multiPageFormService = A.Fake<IMultiPageFormService>();
-
+            clockUtility = A.Fake<ClockUtility>();
+            webHostEnvironment = A.Fake<IWebHostEnvironment>();
             A.CallTo(() => config["CurrentSystemBaseUrl"]).Returns(BaseUrl);
 
             var user = new ClaimsPrincipal(
@@ -65,7 +70,9 @@ public void SetUp()
                 competencyLearningResourcesService,
                 learningHubApiClient,
                 searchSortFilterPaginateService,
-                multiPageFormService
+                multiPageFormService,
+                clockUtility,
+                webHostEnvironment
             )
             {
                 ControllerContext = new ControllerContext { HttpContext = new DefaultHttpContext { User = user } },

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/CourseSetup/CourseSetupControllerTests.cs

@@ -416,7 +416,7 @@ public void SetCourseContent_get_redirects_to_summary_if_application_has_no_sect
             ).Returns(new List<Section>());
 
             // When
-            var result = controller.SetCourseContent();
+            var result = controller.SetCourseContent(false);
 
             // Then
             result.Should().BeRedirectToActionResult().WithActionName("Summary");

DigitalLearningSolutions.Web.Tests/ServiceFilter/RedirectToErrorEmptySessionDataTests.cs

@@ -22,6 +22,8 @@
     using NUnit.Framework;
     using GDS.MultiPageFormData;
     using GDS.MultiPageFormData.Enums;
+    using DigitalLearningSolutions.Data.Utilities;
+    using Microsoft.AspNetCore.Hosting;
 
     public class RedirectToErrorEmptySessionDataTests
     {
@@ -41,7 +43,9 @@ public void Setup()
                         A.Fake<ICompetencyLearningResourcesService>(),
                         A.Fake<ILearningHubApiClient>(),
                         A.Fake<ISearchSortFilterPaginateService>(),
-                        A.Fake<IMultiPageFormService>()
+                        A.Fake<IMultiPageFormService>(),
+                        A.Fake<IClockUtility>(),
+                        A.Fake<IWebHostEnvironment>()
                     )
                     .WithDefaultContext().WithMockTempData();