Merge pull request #3010 from TechnologyEnhancedLearning/DLS-Release-v1.1.0

Dls release v1.1.0 to UAT

Author: kevwhitt-hee

.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

@@ -197,7 +197,7 @@ public int RegisterAdmin(
                 isSupervisor = registrationModel.IsSupervisor,
                 isNominatedSupervisor = registrationModel.IsNominatedSupervisor,
             };
-
+            
             var adminUserId = connection.QuerySingle<int>(
                 @"INSERT INTO AdminAccounts
                     (
@@ -219,7 +219,10 @@ OUTPUT Inserted.ID
                     (
                         @userId,
                         @centreId,
-                        @categoryId,
+                        CASE 
+                        WHEN @categoryID = 0 THEN NULL 
+                        ELSE @categoryID 
+                        END,
                         @isCentreAdmin,
                         @isCentreManager,
                         @active,

DigitalLearningSolutions.Data/DataServices/RegistrationDataService.cs

@@ -95,7 +95,8 @@ 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.ResultsReview, 1) = 1)
-                        AND au.Active = 1 
+                        AND au.Active = 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/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs

@@ -1314,7 +1314,7 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super
                     supervisorDelegateDetail.DelegateUserID,
                     (int)User.GetCentreId()
                 );
-                supervisorDelegate.SelfAssessmentCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? adminUser.CategoryId.Value : supervisorDelegate.SelfAssessmentCategory;
+                supervisorDelegate.SelfAssessmentCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? (adminUser.CategoryId.HasValue ? adminUser.CategoryId.Value : 0) : supervisorDelegate.SelfAssessmentCategory;
                 var centreName = adminUser.CentreName;
 
                 var adminRoles = new AdminRoles(false, false, true, false, false, false, false, false);