Skip to content

TD-4560 Change the Manage optional competencies view to allow selection of competencies by group #2863

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 8, 2024
Merged

TD-4560 Change the Manage optional competencies view to allow selection of competencies by group #2863

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
3 changes: 2 additions & 1 deletion ...talLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ public IEnumerable<Competency> GetCandidateAssessmentOptionalCompetencies(int se
CG.ID AS CompetencyGroupID,
'Capability' AS Vocabulary,
SAS.Optional,
COALESCE (CAOC.IncludedInSelfAssessment, 0) AS IncludedInSelfAssessment
COALESCE (CAOC.IncludedInSelfAssessment, 0) AS IncludedInSelfAssessment,
SAS.GroupOptionalCompetencies
FROM Competencies AS C
INNER JOIN CandidateAssessments AS CA
ON CA.SelfAssessmentID = @selfAssessmentId AND CA.DelegateUserID = @delegateUserId AND CA.RemovedDate IS NULL
Expand Down
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Data/Models/SelfAssessments/Competency.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class Competency
public string CompetencyGroupDescription { get; set; } = string.Empty;
public string? Vocabulary { get; set; }
public bool Optional { get; set; }
public bool GroupOptionalCompetencies { get; set; }
public bool AlwaysShowDescription { get; set; }
public bool IncludedInSelfAssessment { get; set; }
public DateTime? Verified { get; set; }
Expand Down
52 changes: 39 additions & 13 deletions ...rningSolutions.Web/Views/LearningPortal/SelfAssessments/ManageOptionalCompetencies.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,47 @@ else
<div class="nhsuk-checkboxes">
@foreach (var competency in competencyGroup)
{
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input select-all-checkbox" data-group="@competencyGroup.Key" id="[email protected]" name="IncludedSelfAssessmentStructureIds" checked="@(Model.IncludedSelfAssessmentStructureIds != null ? Model.IncludedSelfAssessmentStructureIds.Contains((int)competency.SelfAssessmentStructureId) : false)" type="checkbox" value="@competency.SelfAssessmentStructureId">
<label class="nhsuk-label nhsuk-checkboxes__label" for="[email protected]">
@foreach (var flag in competency.CompetencyFlags)
{
<span class="nhsuk-u-padding-right-2 @(ViewData["cssClass"]?.ToString())">
<strong class="nhsuk-tag @flag.FlagTagClass">
@flag.FlagName
</strong>
@if (competency.GroupOptionalCompetencies)
{
<div class="nhsuk-checkboxes__item">

<input data-group="@competencyGroup.Key" class="nhsuk-checkboxes__input select-all-checkbox" id="[email protected]" name="resultChecked" type="checkbox" value="@competency.SelfAssessmentStructureId">
<label class="nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16" for="[email protected]">
<h3 class="nhsuk-details__summary-text nhsuk-u-margin-bottom-0"> @competencyGroup.Key</h3>
</label>
</div>

<details class="nhsuk-details">
<summary class="nhsuk-details__summary nhsuk-u-padding-0">
<span class="nhsuk-u-margin-bottom-0">
<span class="nhsuk-details__summary-text"> &nbsp;&nbsp; What&rsquo;s included in the @competency.CompetencyGroup </span>
</span>
}
</summary>

@competency.Name
</label>
</div>
<div class="nhsuk-details__text nhsuk-u-margin-left-6 nhsuk-u-margin-top-2">
@(Html.Raw(@competency.Name))
</div>
</details>
<br />
}
else
{
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input select-all-checkbox" data-group="@competencyGroup.Key" id="[email protected]" name="IncludedSelfAssessmentStructureIds" checked="@(Model.IncludedSelfAssessmentStructureIds != null ? Model.IncludedSelfAssessmentStructureIds.Contains((int)competency.SelfAssessmentStructureId) : false)" type="checkbox" value="@competency.SelfAssessmentStructureId">
<label class="nhsuk-label nhsuk-checkboxes__label" for="[email protected]">
@foreach (var flag in competency.CompetencyFlags)
{
<span class="nhsuk-u-padding-right-2 @(ViewData["cssClass"]?.ToString())">
<strong class="nhsuk-tag @flag.FlagTagClass">
@flag.FlagName
</strong>
</span>
}

@competency.Name
</label>
</div>
}
}
</div>
</fieldset>
Expand Down
Loading