Skip to content

DLSV2-474 Add warning if sign-off took place prior to changed self-assessment results #1029

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 3 commits into from
Mar 22, 2022
Merged

DLSV2-474 Add warning if sign-off took place prior to changed self-assessment results #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6838e9
DLSV2-474 Add a warning to the sign-off area if sign-off took place p…
daniel-manta-hee Mar 22, 2022
a79a1eb
DLSV2-474 Merged from master: fixed conflict in selfassessmentovervie…
daniel-manta-hee Mar 22, 2022
2402c53
DLSV2-474 Set default value when sign-offs collection is empty, so ma…
daniel-manta-hee Mar 22, 2022
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
3 changes: 3 additions & 0 deletions ...talLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public partial class SelfAssessmentDataService
s.CompetencyID,
s.AssessmentQuestionID,
s.ID AS ResultID,
s.DateTime AS ResultDateTime,
s.Result,
s.SupportingComments,
sv.ID AS SelfAssessmentResultSupervisorVerificationId,
Expand Down Expand Up @@ -52,6 +53,7 @@ LEFT OUTER JOIN CompetencyAssessmentQuestionRoleRequirements rr
s.AssessmentQuestionID,
s.ID AS ResultID,
s.Result,
s.ResultDateTime,
s.SupportingComments,
sv.ID AS SelfAssessmentResultSupervisorVerificationId,
sv.Requested,
Expand Down Expand Up @@ -119,6 +121,7 @@ ELSE 0
CAQ.Required,
LAR.ResultId,
LAR.Result,
LAR.ResultDateTime,
LAR.SupportingComments,
LAR.SelfAssessmentResultSupervisorVerificationId,
LAR.Requested,
Expand Down
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Data/Models/SelfAssessments/AssessmentQuestion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public class AssessmentQuestion
public string? MinValueDescription { get; set; }
public int? ResultId { get; set; }
public int? Result { get; set; }
public DateTime ResultDateTime { get; set; }
public string? ScoringInstructions { get; set; }
public int MinValue { get; set; }
public int MaxValue { get; set; }
Expand Down
30 changes: 27 additions & 3 deletions ...lLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,21 @@
@model SelfAssessmentOverviewViewModel

@{
Layout = "SelfAssessments/_Layout";
ViewData["Title"] = "Self Assessment";
ViewData["SelfAssessmentTitle"] = Model.SelfAssessment.Name;
var selfAssessedTotal = 0;
var verifiedTotal = 0;
var questionsTotal = 0;
var latestSignoff = Model.SupervisorSignOffs
.Select(s => s.Verified)
.DefaultIfEmpty(DateTime.MinValue)
.Max();
var latestResult = Model.CompetencyGroups
.SelectMany(g => g.SelectMany(c => c.AssessmentQuestions))
.Select(q => q.ResultDateTime)
.DefaultIfEmpty(DateTime.MinValue)
.Max();
Layout = "SelfAssessments/_Layout";
ViewData["Title"] = "Self Assessment";
ViewData["SelfAssessmentTitle"] = Model.SelfAssessment.Name;
}
@section breadcrumbs {
<li class="nhsuk-breadcrumb__item">
Expand Down Expand Up @@ -139,6 +148,21 @@
{
<p class="nhsuk-body-l">You have not yet requested @Model.SelfAssessment.SignOffRoleName sign-off for this self assessment.</p>
}
else if (latestResult > latestSignoff)
{
<div class="nhsuk-warning-callout">
<h3 class="nhsuk-warning-callout__label">
<span role="text">
<span class="nhsuk-u-visually-hidden">New self assessment results</span>
New self assessment results
</span>
</h3>
<p>
You have submitted new self assessment results since this self assessment was signed off.
Please resubmit your self assessment for sign off once these results are confirmed.
</p>
</div>
}
<a class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-bottom-2"
asp-action="RequestSignOff"
asp-route-vocabulary="@Model.SelfAssessment.Vocabulary"
Expand Down