Skip to content

TD-6313-Sql queries have been modified to return sign-off value based on on the current status of the self-assessment. #3400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2025
Merged

TD-6313-Sql queries have been modified to return sign-off value based on on the current status of the self-assessment. #3400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...earningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,12 @@ FROM SelfAssessments
COALESCE(ucd.Email, u.PrimaryEmail) AS DelegateEmail,
da.Active AS IsDelegateActive,
sa.Name AS [Name],
MAX(casv.Verified) as SignedOff,
CASE
WHEN MAX(sar.[DateTime]) >= MAX(casv.Verified) THEN NULL
ELSE (
MAX(casv.Verified)
)
END AS SignedOff,
sa.SupervisorSelfAssessmentReview,
sa.SupervisorResultsReview";

Expand All @@ -311,6 +316,8 @@ LEFT OUTER JOIN Users AS uEnrolledBy WITH (NOLOCK) ON uEnrolledBy.ID = aaEnrolle
LEFT JOIN dbo.CandidateAssessmentSupervisors AS cas WITH (NOLOCK) ON ca.ID = cas.CandidateAssessmentID
LEFT JOIN dbo.CandidateAssessmentSupervisorVerifications AS casv WITH (NOLOCK) ON cas.ID = casv.CandidateAssessmentSupervisorID AND
(casv.Verified IS NOT NULL AND casv.SignedOff = 1)
LEFT JOIN SelfAssessmentResults AS sar ON ca.SelfAssessmentID = sar.SelfAssessmentID AND
ca.DelegateUserID = sar.DelegateUserID

WHERE sa.ID = @selfAssessmentId
AND da.CentreID = @centreID AND csa.CentreID = @centreID
Expand Down Expand Up @@ -349,7 +356,8 @@ LEFT JOIN dbo.CandidateAssessmentSupervisorVerifications AS casv WITH (NOLOCK) O

if (signedOff != null)
{
groupBy += (bool)signedOff ? " HAVING MAX(casv.Verified) IS NOT NULL " : " HAVING MAX(casv.Verified) IS NULL ";
groupBy += (bool)signedOff ? " HAVING MAX(sar.[DateTime]) < MAX(casv.Verified) AND MAX(casv.Verified) IS NOT NULL " :
" HAVING MAX(sar.[DateTime]) >= MAX(casv.Verified) OR MAX(casv.Verified) IS NULL ";
}

string orderBy;
Expand Down
45 changes: 31 additions & 14 deletions DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,33 @@ INNER JOIN AdminAccounts AS aa
";

private const string delegateSelfAssessmentFields = "ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate";
private const string signedOffFields = @"(SELECT TOP (1) casv.Verified
FROM CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
CandidateAssessmentSupervisors AS cas ON casv.CandidateAssessmentSupervisorID = cas.ID
WHERE(cas.CandidateAssessmentID = ca.ID) AND(casv.Requested IS NOT NULL) AND(casv.Verified IS NOT NULL)
ORDER BY casv.Requested DESC) AS SignedOffDate,
(SELECT TOP(1) casv.SignedOff
FROM CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
CandidateAssessmentSupervisors AS cas ON casv.CandidateAssessmentSupervisorID = cas.ID
WHERE(cas.CandidateAssessmentID = ca.ID) AND(casv.Requested IS NOT NULL) AND(casv.Verified IS NOT NULL)
ORDER BY casv.Requested DESC) AS SignedOff,";
private const string signedOffFields = @"(SELECT CASE
WHEN MAX(sar.[DateTime]) >= MAX(casv.Verified) THEN NULL
ELSE MAX(casv.Verified)
END AS Verified
FROM CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
CandidateAssessmentSupervisors AS cas ON casv.CandidateAssessmentSupervisorID = cas.ID INNER JOIN
CandidateAssessments AS ca1 ON cas.CandidateAssessmentID = ca1.ID LEFT JOIN
SelfAssessmentResults AS sar ON ca1.SelfAssessmentID = sar.SelfAssessmentID AND ca1.DelegateUserID = sar.DelegateUserID
WHERE(cas.CandidateAssessmentID = ca.ID) AND(casv.Requested IS NOT NULL) AND(casv.Verified IS NOT NULL)
GROUP BY ca1.ID ) AS SignedOffDate,

(SELECT CASE
WHEN MAX(sar.[DateTime]) >= MAX(casv.Verified) THEN NULL
ELSE (
SELECT TOP(1) casv.SignedOff
FROM CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
CandidateAssessmentSupervisors AS cas ON casv.CandidateAssessmentSupervisorID = cas.ID
WHERE(cas.CandidateAssessmentID = ca.ID) AND(casv.Requested IS NOT NULL) AND(casv.Verified IS NOT NULL)
ORDER BY casv.Verified DESC
)
END AS SignedOff
FROM CandidateAssessmentSupervisorVerifications AS casv INNER JOIN
CandidateAssessmentSupervisors AS cas ON casv.CandidateAssessmentSupervisorID = cas.ID INNER JOIN
CandidateAssessments AS ca1 ON cas.CandidateAssessmentID = ca1.ID LEFT JOIN
SelfAssessmentResults AS sar ON ca1.SelfAssessmentID = sar.SelfAssessmentID AND ca1.DelegateUserID = sar.DelegateUserID
WHERE(cas.CandidateAssessmentID = ca.ID) AND(casv.Requested IS NOT NULL) AND(casv.Verified IS NOT NULL)
GROUP BY ca1.ID) AS SignedOff,";

public SupervisorDataService(IDbConnection connection, ILogger<SupervisorDataService> logger)
{
Expand Down Expand Up @@ -583,7 +600,7 @@ public bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateU
public IEnumerable<DelegateSelfAssessment> GetSelfAssessmentsForSupervisorDelegateId(int supervisorDelegateId, int? adminIdCategoryId)
{
return connection.Query<DelegateSelfAssessment>(
@$"SELECT {delegateSelfAssessmentFields}, COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.CompetencyAssessment, sg.SubGroup, pg.ProfessionalGroup,CONVERT(BIT, IIF(cas.CandidateAssessmentID IS NULL, 0, 1)) AS IsAssignedToSupervisor,ca.DelegateUserID,
@$"SELECT {delegateSelfAssessmentFields}, COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.RoleProfile, sg.SubGroup, pg.ProfessionalGroup,CONVERT(BIT, IIF(cas.CandidateAssessmentID IS NULL, 0, 1)) AS IsAssignedToSupervisor,ca.DelegateUserID,
(SELECT COUNT(*) AS Expr1
FROM CandidateAssessmentSupervisorVerifications AS casv
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
Expand Down Expand Up @@ -785,7 +802,7 @@ FROM NRPProfessionalGroups
(SELECT SubGroup
FROM NRPSubGroups
WHERE (ID = rp.NRPSubGroupID)) AS NRPSubGroup,
(SELECT CompetencyAssessment
(SELECT RoleProfile
FROM NRPRoles
WHERE (ID = rp.NRPRoleID)) AS NRPRole, 0 AS SelfAssessmentReviewID
FROM SelfAssessments AS rp INNER JOIN
Expand Down Expand Up @@ -816,7 +833,7 @@ FROM NRPProfessionalGroups
(SELECT SubGroup
FROM NRPSubGroups
WHERE (ID = rp.NRPSubGroupID)) AS NRPSubGroup,
(SELECT CompetencyAssessment
(SELECT RoleProfile
FROM NRPRoles
WHERE (ID = rp.NRPRoleID)) AS NRPRole, 0 AS SelfAssessmentReviewID
FROM SelfAssessments AS rp
Expand Down Expand Up @@ -1147,7 +1164,7 @@ FROM CandidateAssessmentSupervisors
{
return connection.Query<SelfAssessmentResultSummary>(
@"SELECT ca.ID, ca.SelfAssessmentID, sa.Name AS RoleName, sa.ReviewerCommentsLabel, COALESCE (sasr.SelfAssessmentReview, 1) AS SelfAssessmentReview, COALESCE (sasr.ResultsReview, 1) AS SupervisorResultsReview, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate,
ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, npg.ProfessionalGroup, nsg.SubGroup, nr.CompetencyAssessment, casv.ID AS CandidateAssessmentSupervisorVerificationId,
ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, npg.ProfessionalGroup, nsg.SubGroup, nr.RoleProfile, casv.ID AS CandidateAssessmentSupervisorVerificationId,
(SELECT COUNT(sas1.CompetencyID) AS CompetencyAssessmentQuestionCount
FROM SelfAssessmentStructure AS sas1 INNER JOIN
CandidateAssessments AS ca1 ON sas1.SelfAssessmentID = ca1.SelfAssessmentID INNER JOIN
Expand Down
1 change: 1 addition & 0 deletions ...LearningSolutions.Web/Controllers/TrackingSystem/Delegates/ActivityDelegatesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ public IActionResult Index(
saDelegate.LastAccessed = DateHelper.GetLocalDateTime(saDelegate.LastAccessed);
saDelegate.SubmittedDate = DateHelper.GetLocalDateTime(saDelegate.SubmittedDate);
saDelegate.RemovedDate = DateHelper.GetLocalDateTime(saDelegate.RemovedDate);
saDelegate.SignedOff = saDelegate.SignedOff is null ? null : DateHelper.GetLocalDateTime(saDelegate.SignedOff.Value);
}
}

Expand Down
3 changes: 2 additions & 1 deletion ...lLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@
view-data="@(new ViewDataDictionary(ViewData) { { "IsSupervisorResultsReviewed", Model.SelfAssessment.IsSupervisorResultsReviewed } })" />
<h2>@Model.SelfAssessment.SignOffRoleName Sign-off</h2>
<partial name="../../Supervisor/Shared/_SupervisorSignOffSummary.cshtml" model="Model.SupervisorSignOffs"
view-data="@(new ViewDataDictionary(ViewData) { { "IsAllCompetencyConfirmed", competencySummaries.Sum(c => (int)c["questionsCount"]) == competencySummaries.Sum(c => (int)c["verifiedCount"]) }})" />
view-data="@(new ViewDataDictionary(ViewData) { { "IsAllCompetencyConfirmed", competencySummaries.Sum(c => (int)c["questionsCount"]) == competencySummaries.Sum(c => (int)c["verifiedCount"]) },
{ "IsOngoingSelfAssessment", latestResult > latestSignoff }})" />
@if (Model.AllQuestionsVerifiedOrNotRequired)
{
@if (!Model.SupervisorSignOffs.Any())
Expand Down
11 changes: 6 additions & 5 deletions DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@
@if (!string.IsNullOrWhiteSpace(competency.Description) && !competency.AlwaysShowDescription)
{
<details class="nhsuk-details">
<summary class="nhsuk-details__summary">
<span class="nhsuk-details__summary-text">
@competency.Name
</span>
<summary class="nhsuk-details__summary">
<span class="nhsuk-details__summary-text">
@competency.Name
</span>
</summary>
<div class="nhsuk-details__text">
@(Html.Raw(@competency.Description))
Expand Down Expand Up @@ -225,7 +225,8 @@
{
<div class="nhsuk-u-margin-top-4">
<h3>Self Assessment Sign-off Status</h3>
<partial name="Shared/_SupervisorSignOffSummary" model="@Model.SupervisorSignOffs" view-data="@(new ViewDataDictionary(ViewData) { { "IsAllCompetencyConfirmed", true }})" />
<partial name="Shared/_SupervisorSignOffSummary" model="@Model.SupervisorSignOffs" view-data="@(new ViewDataDictionary(ViewData) { { "IsAllCompetencyConfirmed", true },
{ "IsOngoingSelfAssessment", !Model.DelegateSelfAssessment.SignedOff }})" />
</div>
}
@if (Model.CompetencyGroups.Any())
Expand Down
17 changes: 13 additions & 4 deletions DigitalLearningSolutions.Web/Views/Supervisor/Shared/_SupervisorSignOffSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

@if (Model.Any())
{
var notValidated = Model.FirstOrDefault().Verified != null && Model.FirstOrDefault().SignedOff && (bool)ViewData["IsOngoingSelfAssessment"];
<dl class="nhsuk-summary-list">
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
@Model.FirstOrDefault().SupervisorRoleName
</dt>
<dd class="nhsuk-summary-list__value">
@Model.FirstOrDefault().SupervisorName (@Model.FirstOrDefault().SupervisorEmail)
@(notValidated ? "" : $"{Model.FirstOrDefault().SupervisorName} ({Model.FirstOrDefault().SupervisorEmail})")
@if (Model.FirstOrDefault().Removed != null)
{
<span class="nhsuk-tag nhsuk-tag--red">Removed @Model.FirstOrDefault().Removed.Value.ToShortDateString()</span>
Expand All @@ -34,6 +35,10 @@
{
<span class="nhsuk-tag">Requested @Model.FirstOrDefault().Requested.Value.ToShortDateString()</span>
}
else if (notValidated)
{
<span class="nhsuk-tag nhsuk-tag--red">Not validated</span>
}
else if (Model.FirstOrDefault().SignedOff && Model.FirstOrDefault().Verified != null)
{
<span class="nhsuk-tag nhsuk-tag--green">Signed off @Model.FirstOrDefault().Verified.Value.ToShortDateString()</span>
Expand All @@ -44,7 +49,7 @@
}
</dd>
<dd class="nhsuk-summary-list__actions">
@if (Model.FirstOrDefault().Verified == null && Model.FirstOrDefault().Removed == null)
@if (!notValidated && Model.FirstOrDefault().Verified == null && Model.FirstOrDefault().Removed == null)
{
@if (Model.FirstOrDefault().EmailSent == null || Model.FirstOrDefault().EmailSent.Value.ToShortDateString() != ClockUtility.UtcNow.ToShortDateString())
{
Expand All @@ -54,7 +59,8 @@
}
}

@if (Context.Request.Path.Value!.Contains("SelfAssessment")) {
@if (Context.Request.Path.Value!.Contains("SelfAssessment"))
{
<a asp-action="WithdrawSupervisorSignOffRequest" [email protected]["selfAssessmentId"]
asp-route-candidateAssessmentSupervisorVerificationId="@Model.FirstOrDefault().ID" asp-route-vocabulary="Proficiencies" asp-route-source="SupervisorSignOffSummary">Withdraw</a>
}
Expand All @@ -66,7 +72,10 @@
Comments
</dt>
<dd class="nhsuk-summary-list__value">
@Model.FirstOrDefault().Comments
@if (!notValidated)
{
@Model.FirstOrDefault().Comments
}
</dd>
@if ((Model.Count() - 1) > 0)
{
Expand Down
Loading