TD-4884 Prevent supervisors from viewing/reviewing self assessments in a category that doesn't match their own

[sherif-olaboye]

JIRA link

https://hee-tis.atlassian.net/browse/TD-4884

Description

I added adminCategoryId to the method parameter and where the condition of GetSelfAssessmentsForSupervisorDelegateId method to limit supervisor view to the SelfAssessments that do not belong to the supervisor category
I added adminCategoryId to the method parameter and where the condition of GetSelfAssessmentByCandidateAssessmentId method to ensure that the supervisor can not view or review SelfAssessments that do not belong to the supervisor category

Screenshots

When the admin categoryId is null

When the admin categoryId is 34

---

Developer checks

(Leave tasks unticked if they haven't been appropriate for your ticket.)

I have:

• Run the formatter and made sure there are no IDE errors (see info on Text Editor settings to avoid whitespace changes)
• Written tests for the changes (accessibility tests, unit tests for controller, data services, services, view models, etc)
• Manually tested my work with and without JavaScript
• Tested any Views or partials created or changed with Wave Chrome plugin and addressed any valid accessibility issues
• Updated/added documentation in Confluence and/or GitHub Readme. List of documentation links added/changed:
  • doc_1_here
• Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing’s broken
• Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks.

[rshrirohit]

Can these merge conflicts be resolved, please?