Skip to content

TD-4697-'Cancel' link redirected to proficiencies page. #2858

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
Parent: Release 2024.38
merged 2 commits into from
Oct 2, 2024
Merged

TD-4697-'Cancel' link redirected to proficiencies page. #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28b9a8
TD-4697-'Cancel' link redirected to proficiency page and implemented …
Auldrin-Possa Sep 30, 2024
a60421e
Call to AddOptionalCompetencies for self assessments with LinearNavig…
Auldrin-Possa Oct 1, 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
8 changes: 4 additions & 4 deletions ...LearningSolutions.Web/Views/LearningPortal/SelfAssessments/AddOptionalCompetencies.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
<h1 id="page-heading" class="nhsuk-heading-xl">Add optional @Model.VocabPlural().ToLower() to your assessment?</h1>
</div>
<div class="nhsuk-grid-column-two-thirds">
<p class="nhsuk-u-padding-top-5">During your assessment you will need to add one or more optional proficiencies to your assessment to be certified within your role</p>
<p class="nhsuk-u-padding-top-5">During your assessment you will need to add one or more optional @Model.VocabPlural().ToLower() to your assessment to be certified within your role</p>
<details class="nhsuk-details">
<summary class="nhsuk-details__summary nhsuk-u-padding-10">
<span class="nhsuk-u-margin-bottom-0">
<span class="nhsuk-details__summary-text">What are optional proficiencies?</span>
<span class="nhsuk-details__summary-text">What are optional @Model.VocabPlural().ToLower()?</span>
</span>
</summary>
<div class="nhsuk-details__text nhsuk-u-margin-left-6 nhsuk-u-margin-top-2">
<p>Optional proficiencies refer to specific skills or competencies that are not part of the core requirements but may be added based on your role, specialisation, or the needs of your workplace.</p>
<p>Optional @Model.VocabPlural().ToLower() refer to specific skills or competencies that are not part of the core requirements but may be added based on your role, specialisation, or the needs of your workplace.</p>
</div>
</details>
<p class="nhsuk-u-padding-bottom-5">These proficiencies might be different depending on your role or organization so you may need to discuss this with your educator or manager</p>
<p class="nhsuk-u-padding-bottom-5">These @Model.VocabPlural().ToLower() might be different depending on your role or organization so you may need to discuss this with your educator or manager</p>

<button class="nhsuk-button" type="submit">Add optional @Model.VocabPlural().ToLower() to assessment</button>
<a class="nhsuk-button nhsuk-button--secondary trigger-loader" role="button" asp-action="SelfAssessmentOverview" asp-route-vocabulary="@Model.VocabPlural()" asp-route-selfAssessmentId="@Model.SelfAssessment.Id">Remind me later</a>
Expand Down
30 changes: 8 additions & 22 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 @@ -124,28 +124,14 @@ else
</form>

<div class="nhsuk-back-link">
@if (ViewBag.FromAddOptionalPage != null)
{
<a class="nhsuk-back-link__link"
asp-action="AddOptionalCompetencies"
asp-route-selfAssessmentId="@Model.SelfAssessment.Id" asp-route-vocabulary="@Model.VocabPlural()">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
</svg>
Cancel
</a>
}
else
{
<a class="nhsuk-back-link__link"
asp-action="SelfAssessmentOverview"
asp-route-selfAssessmentId="@Model.SelfAssessment.Id" asp-route-vocabulary="@Model.VocabPlural()">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
</svg>
Cancel
</a>
}
<a class="nhsuk-back-link__link"
asp-action="SelfAssessmentOverview"
asp-route-selfAssessmentId="@Model.SelfAssessment.Id" asp-route-vocabulary="@Model.VocabPlural()">
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
</svg>
Cancel
</a>
</div>

@section scripts {
Expand Down
2 changes: 1 addition & 1 deletion ...arningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ else

@if (Model.LinearNavigation)
{
<a role="button" class="nhsuk-button @(Model.UserBookmark != null || bookmarkIsRelevant ? "nhsuk-button--secondary" : "") trigger-loader" asp-action="SelfAssessmentOverview" asp-route-selfAssessmentId="@Model.Id" asp-route-vocabulary="@Model.VocabPlural">View @Model.VocabPlural</a>
<a role="button" class="nhsuk-button @(Model.UserBookmark != null || bookmarkIsRelevant ? "nhsuk-button--secondary" : "") trigger-loader" asp-action="AddOptionalCompetencies" asp-route-selfAssessmentId="@Model.Id" asp-route-vocabulary="@Model.VocabPlural">View @Model.VocabPlural</a>
@if (Model.UserBookmark != null)
{
if (bookmarkIsRelevant)
Expand Down
Loading