TD-4887- added param 'adminCategaoryId' to GetOtherSupervisorsForCandidate(+) to retrieve Quick Add supervisor based on logged n admin category

Author: Auldrin-Possa

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -93,7 +93,7 @@ int competencyId
         // SelfAssessmentSupervisorDataService
         SelfAssessmentSupervisor? GetSupervisorForSelfAssessmentId(int selfAssessmentId, int delegateUserId);
 
-        IEnumerable<SelfAssessmentSupervisor> GetOtherSupervisorsForCandidate(int selfAssessmentId, int delegateUserId);
+        IEnumerable<SelfAssessmentSupervisor> GetOtherSupervisorsForCandidate(int selfAssessmentId, int delegateUserId, int? adminCategoryId);
 
         IEnumerable<SelfAssessmentSupervisor> GetAllSupervisorsForSelfAssessmentId(
             int selfAssessmentId,

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs

@@ -100,7 +100,8 @@ int delegateUserId
 
         public IEnumerable<SelfAssessmentSupervisor> GetOtherSupervisorsForCandidate(
             int selfAssessmentId,
-            int delegateUserId
+            int delegateUserId,
+            int? adminCategoryId
         )
         {
             return connection.Query<SelfAssessmentSupervisor>(
@@ -117,13 +118,15 @@ int delegateUserId
                 FROM SupervisorDelegates AS sd
                 INNER JOIN CandidateAssessmentSupervisors AS cas ON sd.ID = cas.SupervisorDelegateId
                 INNER JOIN CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID
+                INNER JOIN SelfAssessments AS sa ON ca.SelfAssessmentID = sa.ID
                 INNER JOIN AdminUsers AS au ON sd.SupervisorAdminID = au.AdminID AND au.Active = 1
                 INNER JOIN DelegateAccounts da ON sd.DelegateUserID = da.UserID and au.CentreID = da.CentreID and da.Active=1
                 WHERE (sd.Removed IS NULL) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID IS NOT NULL) AND (sd.DelegateUserID = @delegateUserId)
 		            AND (au.Supervisor = 1 OR au.NominatedSupervisor = 1) AND (au.Active = 1)
 		            AND (ca.SelfAssessmentID <> @selfAssessmentId)
+                    AND (ISNULL(@adminCategoryId, 0) = 0 OR sa.CategoryID = @adminCategoryId)
                 ORDER BY SupervisorName",
-                new { selfAssessmentId, delegateUserId }
+                new { selfAssessmentId, delegateUserId, adminCategoryId }
             );
         }
 

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -619,13 +619,16 @@ public IActionResult ManageSupervisors(int selfAssessmentId)
                 return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
             }
 
+            var adminId = User.GetAdminIdKnownNotNull();
+            var loggedInAdminUser = userService.GetAdminUserById(adminId);
+
             var supervisors = selfAssessmentService.GetAllSupervisorsForSelfAssessmentId(selfAssessmentId, delegateUserId)
                 .ToList();
             var suggestedSupervisors = new List<SelfAssessmentSupervisor>();
             if (assessment.HasDelegateNominatedRoles)
             {
                 suggestedSupervisors = selfAssessmentService
-                    .GetOtherSupervisorsForCandidate(selfAssessmentId, delegateUserId)
+                    .GetOtherSupervisorsForCandidate(selfAssessmentId, delegateUserId, loggedInAdminUser.CategoryId)
                     .Where(item => supervisors.All(s => !item.SupervisorAdminID.Equals(s.SupervisorAdminID)))
                     .ToList();
             }
@@ -1756,7 +1759,7 @@ public async Task<IActionResult> DownloadCertificate(int candidateAssessmentId)
             {
                 return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
             }
-                if (userId != competencymaindata.LearnerId) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
+            if (userId != competencymaindata.LearnerId) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
             var delegateUserId = competencymaindata.LearnerId;
             var competencycount = selfAssessmentService.GetCompetencyCountSelfAssessmentCertificate(candidateAssessmentId);
             var accessors = selfAssessmentService.GetAccessor(competencymaindata.SelfAssessmentID, competencymaindata.LearnerId);

DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs

@@ -85,7 +85,7 @@ IEnumerable<SelfAssessmentSupervisor> GetAllSupervisorsForSelfAssessmentId(
             int delegateUserId
         );
 
-        IEnumerable<SelfAssessmentSupervisor> GetOtherSupervisorsForCandidate(int selfAssessmentId, int delegateUserId);
+        IEnumerable<SelfAssessmentSupervisor> GetOtherSupervisorsForCandidate(int selfAssessmentId, int delegateUserId, int? adminCategoryId);
 
         IEnumerable<Administrator> GetValidSupervisorsForActivity(int centreId, int selfAssessmentId, int delegateUserId);
 
@@ -246,10 +246,11 @@ int delegateUserId
 
         public IEnumerable<SelfAssessmentSupervisor> GetOtherSupervisorsForCandidate(
             int selfAssessmentId,
-            int delegateUserId
+            int delegateUserId,
+            int? adminCategoryId
         )
         {
-            return selfAssessmentDataService.GetOtherSupervisorsForCandidate(selfAssessmentId, delegateUserId);
+            return selfAssessmentDataService.GetOtherSupervisorsForCandidate(selfAssessmentId, delegateUserId, adminCategoryId);
         }
 
         public IEnumerable<Administrator> GetValidSupervisorsForActivity(