Skip to content

Conversation

@daniel-manta-hee
Copy link
Contributor

JIRA link

https://hee-dls.atlassian.net/browse/DLSV2-512

Description

Updated Supervisor\Shared_StaffDetails.cshtml that is being called from Supervisor\Shared_StaffMemberCard.cshtml for displaying supervisor details. Only supervisors with CandidateID not null would be displaying DLS role.

Screenshots

image


Developer checks

  • Checked DLS role is displayed for Supervisor, Nominated supervisor and Lerner.
  • Checked that MyStaffList and AllStaffList display DLS role in supervisor details.

@daniel-manta-hee daniel-manta-hee changed the title DLSV2-512 Make supervisor role visible on MyStaffList DLSV2-512 Make supervisor role visible on MyStaffList and AllStaffList Mar 3, 2022
Copy link
Contributor

@kevwhitt-hee kevwhitt-hee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment, we need to get supervisor role for the staff members on the list rather than the supervisor viewing the list

&& loggedInAdminUser.CentreId == supervisor.CentreId
&& loggedInAdminUser.EmailAddress == supervisor.SupervisorEmail
&& loggedInAdminUser.Active;
return activeAdminRecordAtSameCenter && loggedInAdminUser.IsSupervisor ? DlsRole.Supervisor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is getting the role (supervisor, nominated supervisor, learner) of the logged in user (the supervisor accessing the staff list interface) rather than each of the members of staff on the staff list. To get this, we will need to change the data service and model that retrieves the supervisorDelegateDetails to find matching AdminUser records for the delegate by outer joining Candidates to AdminUsers on email address, centre and active = 1 and then checking for the supervisor roles in the matched admin records.

@kevwhitt-hee kevwhitt-hee self-requested a review March 8, 2022 16:38
Copy link
Contributor

@kevwhitt-hee kevwhitt-hee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good once conflicts are resolved.

@kevwhitt-hee kevwhitt-hee merged commit 4ca616f into master Mar 9, 2022
@kevwhitt-hee kevwhitt-hee deleted the Develop/Features/DLSV2-512-MakeSupervisorStatusVisible branch March 9, 2022 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants