Merge pull request #3101 from TechnologyEnhancedLearning/DLS-Release-v1.2.0

Dls release v1.2.0

Author: kevwhitt-hee

.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/FrameworkDataService.cs

@@ -1854,7 +1854,7 @@ public int GetAdminUserRoleForFrameworkId(int adminId, int frameworkId)
                 @"SELECT CASE WHEN FW.OwnerAdminID = @adminId THEN 3 WHEN fwc.CanModify = 1 THEN 2 WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole
                 FROM Frameworks AS FW LEFT OUTER JOIN
                 FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId
-                WHERE FW.ID = @frameworkId",
+                WHERE FW.ID = @frameworkId and FWC.IsDeleted=0",
                 new { adminId, frameworkId }
             );
         }

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/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/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/Controllers/SupervisorController/Supervisor.cs

@@ -60,10 +60,6 @@ public IActionResult MyStaffList(
             var loggedInAdminUser = userService.GetAdminUserById(adminId);
             var centreRegistrationPrompts = centreRegistrationPromptsService.GetCentreRegistrationPromptsByCentreId(centreId);
             var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId, loggedInAdminUser.CategoryId);
-            if (!supervisorDelegateDetails.Any())
-            {
-                supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(adminId);
-            }
             var isSupervisor = User.GetCustomClaimAsBool(CustomClaimTypes.IsSupervisor) ?? false;
             var allSupervisorDelegateDetailViewModels = supervisorDelegateDetails.Select(
                 supervisor =>
@@ -1215,7 +1211,7 @@ public IActionResult SignOffProfileAssessment(
             SignOffProfileAssessmentViewModel model
         )
         {
-            if ((!ModelState.IsValid) && (model.NumberOfSelfAssessedOptionalCompetencies > 0) && (!model.OptionalCompetenciesChecked))
+            if ((!ModelState.IsValid) && (model.NumberOfSelfAssessedOptionalCompetencies > 0) && (!model.OptionalCompetenciesChecked) && model.SignedOff)
             {
                 SelfAssessmentResultSummary? selfAssessmentSummary =
                     supervisorService.GetSelfAssessmentResultSummary(candidateAssessmentId, supervisorDelegateId);
@@ -1231,7 +1227,10 @@ SignOffProfileAssessmentViewModel model
                     CandidateAssessmentSupervisorVerificationId =
                         selfAssessmentSummary.CandidateAssessmentSupervisorVerificationId,
                     CandidateAssessmentSupervisorVerificationSummaries = verificationsSummary,
-                    NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
+                    NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment),
+                    SupervisorComments = model.SupervisorComments,
+                    SignedOff = model.SignedOff,
+                    IsSignOffverified = model.SignedOff
                 };
                 return View("SignOffProfileAssessment", newModel);
             }

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs

@@ -15,6 +15,7 @@
     using System.Threading.Tasks;
     using Microsoft.Extensions.Configuration;
     using DigitalLearningSolutions.Data.Extensions;
+    using DigitalLearningSolutions.Web.Services;
 
     [FeatureGate(FeatureFlags.RefactoredTrackingSystem)]
     [Authorize(Policy = CustomPolicies.UserCentreAdmin)]
@@ -30,11 +31,13 @@ public class SelfAssessmentReportsController : Controller
         private readonly string tableauSiteName;
         private readonly string workbookName;
         private readonly string viewName;
+        private readonly ISelfAssessmentService selfAssessmentService;
         public SelfAssessmentReportsController(
             ISelfAssessmentReportService selfAssessmentReportService,
             ITableauConnectionHelperService tableauConnectionHelper,
             IClockUtility clockUtility,
-            IConfiguration config
+            IConfiguration config,
+            ISelfAssessmentService selfAssessmentService
         )
         {
             this.selfAssessmentReportService = selfAssessmentReportService;
@@ -44,12 +47,14 @@ IConfiguration config
             tableauSiteName = config.GetTableauSiteName();
             workbookName = config.GetTableauWorkbookName();
             viewName = config.GetTableauViewName();
+            this.selfAssessmentService = selfAssessmentService;
         }
         public IActionResult Index()
         {
             var centreId = User.GetCentreId();
-            var categoryId = User.GetAdminCategoryId();
-            var model = new SelfAssessmentReportsViewModel(selfAssessmentReportService.GetSelfAssessmentsForReportList((int)centreId, categoryId));
+            var adminCategoryId = User.GetAdminCategoryId();
+            var categoryId = this.selfAssessmentService.GetSelfAssessmentCategoryId(1);
+            var model = new SelfAssessmentReportsViewModel(selfAssessmentReportService.GetSelfAssessmentsForReportList((int)centreId, adminCategoryId), adminCategoryId, categoryId);
             return View(model);
         }
         [HttpGet]