Develop/features/dlsv2 437 add result review request links to supervisor to do list

[daniel-manta-hee]

JIRA link

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

Description

Added new query in Supervisor service for retrieving requested reviews which would work in the same way as the existing signoff requested to do list. Updated the controller method and the view.

Screenshots

---

Developer checks

Checked that this code returns one record for competency with pending review.

DECLARE @adminId INT = 1
SELECT sa.id AS SelfAssessmentId, co.ID as CompetencyId, sar.ID AS RecordId, ca.ID, sd.ID AS SupervisorDelegateId, c.FirstName + ' ' + c.LastName AS DelegateName, sa.Name AS ProfileName, sasv.Requested, 0 AS SignOffRequest, 1 AS ResultsReviewRequest
    FROM   CandidateAssessmentSupervisors AS cas INNER JOIN
    CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
    Candidates AS c ON ca.CandidateID = c.CandidateID INNER JOIN
    SelfAssessments AS sa ON ca.SelfAssessmentID = sa.ID INNER JOIN
    SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID INNER JOIN
    SelfAssessmentResults AS sar ON sar.SelfAssessmentID = sa.ID INNER JOIN
    Competencies AS co ON sar.CompetencyID = co.ID INNER JOIN					
    SelfAssessmentResultSupervisorVerifications AS sasv ON sasv.SelfAssessmentResultId = sar.ID AND sasv.CandidateAssessmentSupervisorID = cas.ID AND sar.DateTime = (
		SELECT MAX(sar2.DateTime)
		FROM SelfAssessmentResults AS sar2
		WHERE sar2.SelfAssessmentID = sar.SelfAssessmentID AND sar2.CompetencyID = co.ID
	)
WHERE (sd.SupervisorAdminID = @adminId) AND (sasv.Verified IS NULL)

Grouped by SelfAssessment in order to get only one record per self assessment.

DECLARE @adminId INT = 1
SELECT ca.ID, sd.ID AS SupervisorDelegateId, c.FirstName + ' ' + c.LastName AS DelegateName, sa.Name AS ProfileName, MAX(sasv.Requested) AS Requested, 0 AS SignOffRequest, 1 AS ResultsReviewRequest
      FROM   CandidateAssessmentSupervisors AS cas INNER JOIN
      CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
      Candidates AS c ON ca.CandidateID = c.CandidateID INNER JOIN
      SelfAssessments AS sa ON ca.SelfAssessmentID = sa.ID INNER JOIN
      SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID INNER JOIN
SelfAssessmentResults AS sar ON sar.SelfAssessmentID = sa.ID INNER JOIN
Competencies AS co ON sar.CompetencyID = co.ID INNER JOIN					
      SelfAssessmentResultSupervisorVerifications AS sasv ON sasv.SelfAssessmentResultId = sar.ID AND sasv.CandidateAssessmentSupervisorID = cas.ID AND sar.DateTime = (
SELECT MAX(sar2.DateTime)
FROM SelfAssessmentResults AS sar2
WHERE sar2.SelfAssessmentID = sar.SelfAssessmentID AND sar2.CompetencyID = co.ID
)
  WHERE (sd.SupervisorAdminID = @adminId) AND (sasv.Verified IS NULL)
GROUP BY sa.ID, ca.ID, sd.ID, c.FirstName, c.LastName, sa.Name

[kevwhitt-hee]

Could we use the same action and routing as the "Review and sign-off" link above, here. The link is broken for me with the current action and route data and should go to the same place.

[kevwhitt-hee]

A couple of changes requested to the Index.cshtml - see comments.

[daniel-manta-hee]

Yes, text break comes from class nhsuk-contents-list__link on the link. I believe we could just remove that class from the html tag. It only seems to be doing the "display: inline-block;".

________________________________ From: kevwhitt-hee ***@***.***> Sent: 02 December 2021 14:37 To: TechnologyEnhancedLearning/DLSV2 ***@***.***> Cc: Daniel Manta ***@***.***>; Author ***@***.***> Subject: Re: [TechnologyEnhancedLearning/DLSV2] Develop/features/dlsv2 437 add result review request links to supervisor to do list (PR #793) @kevwhitt-hee requested changes on this pull request. A couple of changes requested to the Index.cshtml - see comments.

________________________________ In DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml<#793 (comment)>:

</li>

} - </ul> + else if(toDoItem.ResultsReviewRequest) + { + <li class="nhsuk-contents-list__item"> + <a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="VerifyDelegateSelfAssessment" ***@***.***" ***@***.***"> + Verify self-assessment results for @toDoItem.DelegateName's @toDoItem.ProfileName + </a>. Requested @toDoItem.Requested.ToShortDateString() The ". Requested @toDoItem.Requested..." text falls onto a new blank line if the '' text is long: [image]<https://user-images.githubusercontent.com/67740339/144442405-18f7963e-d91d-456e-b807-600b00fd21c2.png> Could we fix this to keep it in-line using CSS or move the Requested date inside the link, if not? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#793 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AWNSWU66QU5BWTULGV4QHODUO6AA3ANCNFSM5JHGPDFA>. Triage notifications on the go with GitHub Mobile for iOS<https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android<https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. This message may contain confidential information. If you are not the intended recipient, please inform the sender that you have received the message in error before deleting it. If the email was not meant for you, please do not disclose, copy or distribute the information it contains or take any action based on its contents, apart from notifying the sender you have received it in error. Any other action is prohibited and may be unlawful. Disclaimer The information contained in this communication from the sender is confidential. It is intended solely for use by the recipient and others authorized to receive it. If you are not the recipient, you are hereby notified that any disclosure, copying, distribution or taking action in relation of the contents of this information is strictly prohibited and may be unlawful. This email has been scanned for viruses and malware, and may have been automatically archived by Mimecast Ltd, an innovator in Software as a Service (SaaS) for business. Providing a safer and more useful place for your human generated data. Specializing in; Security, archiving and compliance. To find out more visit the Mimecast website.

[kevwhitt-hee]

Yes. Let's remove the "nhsuk-contents-list__link" from both links, please. I've tested this in browser dev mode and it looks much better,

[kevwhitt-hee]

Further testing suggests there is a problem with this query. I requested verification for 1 result in a second self assessment. This appeared on my supervisor To Do list three times:

[kevwhitt-hee]

The return from this query has the following return on my Dev DB for adminId = 1:

Note the different IDs (CandidateAssessment.IDs?) in the first column. Suggesting a problem with a join.

[kevwhitt-hee]

Working perfectly now.