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

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs

@@ -288,7 +288,7 @@ public IEnumerable<Competency> GetResultSupervisorVerifications(int selfAssessme
                         INNER JOIN DelegateAccounts DA1 ON CA.DelegateUserID = DA1.UserID AND au.CentreID = DA1.CentreID AND DA1.Active=1
                     WHERE (LAR.Verified IS NULL) 
 	                    AND ((LAR.Result IS NOT NULL) OR (LAR.SupportingComments IS NOT NULL)) 
-	                    AND (LAR.Requested IS NOT NULL)
+	                    AND (LAR.Requested IS NOT NULL) AND (au.CategoryID = 0 OR au.CategoryID = (select CategoryID from SelfAssessments where ID = @selfAssessmentId))
                     ORDER BY SupervisorVerificationRequested DESC, C.Name",
                 (competency, assessmentQuestion) =>
                 {

DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs

@@ -279,7 +279,10 @@ bool isCentreManager
                             IsContentCreator = @isContentCreator,
                             IsContentManager = @isContentManager,
                             ImportOnly = @importOnly,
-                            CategoryID = @categoryId,
+                            CategoryID = CASE 
+                        WHEN @categoryID = 0 THEN NULL 
+                        ELSE @categoryID 
+                        END,
                             IsCentreManager = @isCentreManager
                         WHERE ID = @adminId",
                 new