Merge pull request #2919 from TechnologyEnhancedLearning/Develop/Features/TD-4973-LimitthelistofsupervisorsintheRequestproficiencyconfirmationviewtosupervisorswithamatchingcategory

rshrirohit · web-flow · commit 9c78d1b7134f · 2024-11-06T08:54:26.000Z
TD-4973 Limit the list of supervisors in the Request proficiency confirmation view to supervisors with a matching category
diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentSupervisorDataService.cs
@@ -57,7 +57,8 @@ LEFT OUTER JOIN AdminUsers AS au
                 ON sd.SupervisorAdminID = au.AdminID
             INNER JOIN DelegateAccounts da ON sd.DelegateUserID = da.UserID AND au.CentreID = da.CentreID AND da.Active=1
             LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr
-                ON cas.SelfAssessmentSupervisorRoleID = sasr.ID";
+                ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
+		   LEFT OUTER JOIN SelfAssessments sa ON sa.id  = ca.SelfAssessmentID AND sa.CategoryID = au.CategoryID";
 
         public SelfAssessmentSupervisor? GetSupervisorForSelfAssessmentId(int selfAssessmentId, int delegateUserId)
         {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ LEFT OUTER JOIN AdminUsers AS au`
`57`	`57`	`ON sd.SupervisorAdminID = au.AdminID`
`58`	`58`	`INNER JOIN DelegateAccounts da ON sd.DelegateUserID = da.UserID AND au.CentreID = da.CentreID AND da.Active=1`
`59`	`59`	`LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr`
`60`		`- ON cas.SelfAssessmentSupervisorRoleID = sasr.ID";`
	`60`	`+ ON cas.SelfAssessmentSupervisorRoleID = sasr.ID`
	`61`	`+ LEFT OUTER JOIN SelfAssessments sa ON sa.id = ca.SelfAssessmentID AND sa.CategoryID = au.CategoryID";`
`61`	`62`
`62`	`63`	`public SelfAssessmentSupervisor? GetSupervisorForSelfAssessmentId(int selfAssessmentId, int delegateUserId)`
`63`	`64`	`{`