Skip to content

HEEDLS-796 : Update "All Delegates - Remove course" styling fixes #994

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 2 commits into from
Mar 8, 2022
Merged

HEEDLS-796 : Update "All Delegates - Remove course" styling fixes #994

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
3ab04e7
fixed remove enrolment styling & title
Mar 7, 2022
ff4d20c
fix error message & confirmation alert
Mar 8, 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
2 changes: 1 addition & 1 deletion ...lutions.Web/ViewModels/TrackingSystem/Delegates/ViewDelegate/RemoveFromCourseViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
{
validationResults.Add(
new ValidationResult(
"Please confirm with the checkbox that you wish to remove this delegate from this course",
"Confirm you wish to remove this delegate from this course",
new[]
{
nameof(Confirm)
Expand Down
58 changes: 37 additions & 21 deletions ...gSolutions.Web/Views/TrackingSystem/Delegates/ViewDelegate/ConfirmRemoveFromCourse.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

@{
var errorHasOccurred = !ViewData.ModelState.IsValid;
ViewData["Title"] = errorHasOccurred ? $"Error: Remove delegate enrolment from {Model.CourseName}" : $"Remove delegate enrolment from {Model.CourseName}";
ViewData["Title"] = errorHasOccurred ? "Error: Remove enrolment" : "Remove enrolment";
var cancelLinkRouteData = new Dictionary<string, string> { { "delegateId", Model.DelegateId.ToString() } };
}

Expand All @@ -14,25 +14,41 @@
@if (errorHasOccurred) {
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.Confirm) })" />
}
<h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-8 word-break">Remove enrolment</h1>
<h2 class="nhsuk-heading-l word-break">Delegate: @Model.Name</h2>
<h2 class="nhsuk-heading-l word-break">Activity: @Model.CourseName</h2>
<div class="nhsuk-form-group">
<form asp-action="ExecuteRemoveFromCourse" asp-route-delegateId="@Model.DelegateId" asp-route-customisationId="@Model.CustomisationId">
<fieldset class="nhsuk-fieldset" aria-describedby="example-hint">
<div class="nhsuk-checkboxes">
<div class="nhsuk-checkboxes__item">
<input type="hidden" name="name" value="@Model.Name" />
<input type="hidden" name="courseName" value="@Model.CourseName" />
<vc:single-checkbox asp-for="@nameof(Model.Confirm)"
label="I am sure that I wish to remove this enrolment"
hint-text="This action will remove the activity from the delegate’s Current Activities list and archive their progress." />
</div>
</div>
<button class="nhsuk-button delete-button nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-6" role="button" type="submit">Remove enrolment</button>
</fieldset>
</form>
<vc:cancel-link asp-controller="ViewDelegate" asp-action="Index" asp-all-route-data="@cancelLinkRouteData" />
</div>
<h1 class="nhsuk-heading-xl">Remove enrolment</h1>
</div>
</div>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-one-quarter nhsuk-heading-l nhsuk-u-font-weight-bold">
Delegate:
</div>
<div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal word-break">
@Model.Name
</div>
</div>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-one-quarter nhsuk-heading-l nhsuk-u-font-weight-bold">
Activity:
</div>
<div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal word-break">
@Model.CourseName
</div>
</div>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<form class="nhsuk-u-margin-bottom-3" asp-action="ExecuteRemoveFromCourse" asp-route-delegateId="@Model.DelegateId" asp-route-customisationId="@Model.CustomisationId">
<input type="hidden" name="name" value="@Model.Name" />
<input type="hidden" name="courseName" value="@Model.CourseName" />

<vc:single-checkbox asp-for="@nameof(Model.Confirm)"
label="I am sure that I wish to remove this enrolment"
hint-text="This action will remove the activity from the delegate’s Current Activities list and archive their progress." />

<button class="nhsuk-button delete-button" role="button" type="submit">Remove enrolment</button>
</form>

<vc:cancel-link asp-controller="ViewDelegate" asp-action="Index" asp-all-route-data="@cancelLinkRouteData" />
</div>
</div>