Squashed commit of the following:

commit 8fcc378
Merge: b31b0f1 7a1b148
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 07:33:34 2024 +0000

    Merge pull request #3011 from TechnologyEnhancedLearning/Automatic_version_update_dependabot

    Automatic version update dependabot to dev branch

commit b31b0f1
Merge: a375ec9 fbeaa0a
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 07:22:11 2024 +0000

    Merge pull request #2981 from TechnologyEnhancedLearning/Develop/Features/TD-4889-WhenasupervisorpromotesalearnertotheNominatedsupervisorrole,assignthemtothesamecategoryasthesupervisors

    TD-4889 Resolving internal server error when nominating delegate to supervisor

commit a375ec9
Merge: 49d6df1 0a24e3a
Author: kevwhitt-hee <[email protected]>
Date:   Tue Dec 3 07:20:27 2024 +0000

    Merge pull request #2980 from TechnologyEnhancedLearning/Develop/Features/TD-4973-LimitthelistofsupervisorsintheRequestproficiencyconfirmationviewtosupervisorswithamatchingcategories

    TD-4973 Limit the list of supervisors in the Request proficiency confirmation view to supervisors with a matching category

commit fbeaa0a
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 27 17:00:29 2024 +0000

    TD-4889 Resolving internal server error when nominating delegate to supervisor

commit 3c09df3
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 27 16:35:24 2024 +0000

    TD-4889 Resolving internal server error when nominating delegate to supervisor

commit 0a24e3a
Author: Sherif Olaboye <[email protected]>
Date:   Wed Nov 27 10:40:01 2024 +0000

    TD-4973 Limit the list of supervisors in the Request proficiency confirmation view to supervisors with a matching category

commit 49d6df1
Merge: d9c9b6b ec7910b
Author: kevwhitt-hee <[email protected]>
Date:   Wed Nov 27 08:55:26 2024 +0000

    Merge branch 'master' into DLS-Release-v1.1.0

commit d9c9b6b
Author: kevwhitt-hee <[email protected]>
Date:   Wed Nov 27 08:21:19 2024 +0000

    Removes migration causing an error in production data during deployment

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/RegistrationDataService.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/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.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.Web/Controllers/SupervisorController/Supervisor.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);