Merge pull request #2910 from TechnologyEnhancedLearning/Develop/feature/TD-4888-Limit-supervisors-AddNewSupervisor

TD-4888-Limit the supervisors that are available to add to self assessment from "Manage supervisors" to supervisors with a matching category

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -120,7 +120,7 @@ int candidateAssessmentSupervisorId
 
         SupervisorComment? GetSupervisorComments(int delegateUserId, int resultId);
 
-        IEnumerable<Administrator> GetValidSupervisorsForActivity(int centreId, int selfAssessmentId, int delegateUserId);
+        IEnumerable<Administrator> GetValidSupervisorsForActivity(int selfAssessmentId, int delegateUserId);
 
         Administrator GetSupervisorByAdminId(int supervisorAdminId);
 

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs

@@ -221,7 +221,6 @@ FROM   SelfAssessmentResultSupervisorVerifications AS sasv INNER JOIN
         }
 
         public IEnumerable<Administrator> GetValidSupervisorsForActivity(
-            int centreId,
             int selfAssessmentId,
             int delegateUserId
         )
@@ -259,7 +258,7 @@ INNER JOIN CandidateAssessments AS ca
                         )
                         AND (Supervisor = 1 OR NominatedSupervisor = 1) AND (Active = 1) AND (Email LIKE '%@%')
                         ORDER BY Forename, Surname",
-                new { centreId, selfAssessmentId, delegateUserId }
+                new { selfAssessmentId, delegateUserId }
             );
         }
 

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -694,7 +694,6 @@ public IActionResult StartAddNewSupervisor(int selfAssessmentId)
             );
 
             var distinctSupervisorCentres = selfAssessmentService.GetValidSupervisorsForActivity(
-               User.GetCentreIdKnownNotNull(),
                selfAssessmentId,
                User.GetUserIdKnownNotNull()
            ).Select(c => new { c.CentreID, c.CentreName }).Distinct().OrderBy(o => o.CentreName).ToList();
@@ -728,7 +727,6 @@ public IActionResult AddNewSupervisor(int selfAssessmentId,
                 TempData
             );
             var supervisors = selfAssessmentService.GetValidSupervisorsForActivity(
-                User.GetCentreIdKnownNotNull(),
                 selfAssessmentId,
                 User.GetUserIdKnownNotNull()
             ).ToList();
@@ -776,7 +774,6 @@ public IActionResult GetAllSupervisors(int selfAssessmentId)
                 TempData
             );
             var supervisors = selfAssessmentService.GetValidSupervisorsForActivity(
-                User.GetCentreIdKnownNotNull(),
                 selfAssessmentId,
                 User.GetUserIdKnownNotNull()
             );
@@ -873,7 +870,6 @@ public IActionResult SelectSupervisorCentre(int selfAssessmentId)
                 TempData
             );
             var distinctCentres = selfAssessmentService.GetValidSupervisorsForActivity(
-                User.GetCentreIdKnownNotNull(),
                 selfAssessmentId,
                 User.GetUserIdKnownNotNull()
             ).Select(c => new { c.CentreID, c.CentreName }).Distinct().OrderBy(o => o.CentreName).ToList();
@@ -911,7 +907,6 @@ public IActionResult SelectSupervisorCentre(SupervisorCentresViewModel model)
             if (!ModelState.IsValid)
             {
                 var distinctCentres = selfAssessmentService.GetValidSupervisorsForActivity(
-                User.GetCentreIdKnownNotNull(),
                 model.SelfAssessmentID,
                 User.GetUserIdKnownNotNull()
                 ).Select(c => new { c.CentreID, c.CentreName }).Distinct().OrderBy(o => o.CentreName).ToList();
@@ -1072,7 +1067,6 @@ public IActionResult AddSupervisorSummary(int selfAssessmentId)
             var roles = supervisorService.GetDelegateNominatableSupervisorRolesForSelfAssessment(selfAssessmentId);
             var supervisor = selfAssessmentService.GetSupervisorByAdminId(sessionAddSupervisor.SupervisorAdminId);
             var distinctCentres = selfAssessmentService.GetValidSupervisorsForActivity(
-                User.GetCentreIdKnownNotNull(),
                 selfAssessmentId,
                 User.GetUserIdKnownNotNull()
             ).Select(c => new { c.CentreID, c.CentreName }).Distinct().OrderBy(o => o.CentreName).ToList();
@@ -1756,7 +1750,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

@@ -87,7 +87,7 @@ int delegateUserId
 
         IEnumerable<SelfAssessmentSupervisor> GetOtherSupervisorsForCandidate(int selfAssessmentId, int delegateUserId);
 
-        IEnumerable<Administrator> GetValidSupervisorsForActivity(int centreId, int selfAssessmentId, int delegateUserId);
+        IEnumerable<Administrator> GetValidSupervisorsForActivity(int selfAssessmentId, int delegateUserId);
 
         Administrator GetSupervisorByAdminId(int supervisorAdminId);
 
@@ -253,12 +253,11 @@ int delegateUserId
         }
 
         public IEnumerable<Administrator> GetValidSupervisorsForActivity(
-            int centreId,
             int selfAssessmentId,
             int delegateUserId
         )
         {
-            return selfAssessmentDataService.GetValidSupervisorsForActivity(centreId, selfAssessmentId, delegateUserId).Where(c => !Guid.TryParse(c.Email, out _));
+            return selfAssessmentDataService.GetValidSupervisorsForActivity(selfAssessmentId, delegateUserId).Where(c => !Guid.TryParse(c.Email, out _));
         }
 
         public Administrator GetSupervisorByAdminId(int supervisorAdminId)