Skip to content

TD-4428 Additional optional competencies checkbox on the learner signoff request screen #2770

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
rshrirohit merged 3 commits into from
Aug 13, 2024
Merged

TD-4428 Additional optional competencies checkbox on the learner signoff request screen #2770

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
392eeed
TD-4428 Additional optional competencies checkbox on the learner sign…
sherif-olaboye Aug 7, 2024
154b21d
TD-4428 Additional optional competencies checkbox on the learner sign…
sherif-olaboye Aug 7, 2024
02d3ed9
TD-4428 changing the control name to the optional competencies
sherif-olaboye Aug 7, 2024
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
4 changes: 4 additions & 0 deletions DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,10 +1475,12 @@ public IActionResult RequestSignOff(int selfAssessmentId)
var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
var supervisors =
selfAssessmentService.GetSignOffSupervisorsForSelfAssessmentId(selfAssessmentId, delegateUserId);
var optionalCompetencies = selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId);
var model = new RequestSignOffViewModel
{
SelfAssessment = assessment,
Supervisors = supervisors,
NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
};
return View("SelfAssessments/RequestSignOff", model);
}
Expand All @@ -1493,10 +1495,12 @@ public IActionResult RequestSignOff(int selfAssessmentId, string vocabulary, Req
var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
var supervisors =
selfAssessmentService.GetSignOffSupervisorsForSelfAssessmentId(selfAssessmentId, delegateUserId);
var optionalCompetencies = selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId);
var newModel = new RequestSignOffViewModel
{
SelfAssessment = assessment,
Supervisors = supervisors,
NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
};
return View("SelfAssessments/RequestSignOff", newModel);
}
Expand Down
5 changes: 5 additions & 0 deletions ...earningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/RequestSignOffViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ public class RequestSignOffViewModel
[Required]
[Range(1, 1, ErrorMessage = "Please tick to confirm that you understand the request sign-off statement")]
public bool StatementChecked { get; set; }
[Required]
[Range(1, 1, ErrorMessage = "Please tick to confirm that you have include optional competencies that are appropriate to your role before requesting sign-off")]
public bool OptionalCompetenciesChecked { get; set; }
public int NumberOfSelfAssessedOptionalCompetencies { get; set; }

public string VocabPlural()
{
if (SelfAssessment != null)
Expand Down
11 changes: 11 additions & 0 deletions DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/RequestSignOff.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,17 @@
</label>
</div>
</nhs-form-group>
@if (Model.NumberOfSelfAssessedOptionalCompetencies >= Model.SelfAssessment.MinimumOptionalCompetencies)
{
<nhs-form-group nhs-validation-for="OptionalCompetenciesChecked">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="optional-ompetencies" name="OptionalCompetenciesChecked" asp-for="OptionalCompetenciesChecked" type="checkbox">
<label class="nhsuk-label nhsuk-checkboxes__label" for="optional-competencies">
I have reviewed the optional competencies available for this self assessment and included those that are appropriate to my role.
</label>
</div>
</nhs-form-group>
}
</fieldset>

<button class="nhsuk-button" type="submit">
Expand Down