Skip to content

DLSV2-619 Tweaks to wording following feedback #1374

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
Aug 26, 2022
Merged

DLSV2-619 Tweaks to wording following feedback #1374

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
0a1e604
DLSV2-619 Tweaks to wording following feedback
kevwhitt-hee Aug 26, 2022
6e411a1
IDE Formatter changes
kevwhitt-hee Aug 26, 2022
68d9791
DLSV2-619 Hides button for not registered staff
kevwhitt-hee Aug 26, 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 DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
@Model.DashboardData.StaffCount Staff @if (Model.DashboardData.StaffUnregisteredCount > 0)
{
<span class="nhsuk-u-secondary-text-color nhsuk-u-font-weight-normal">
(@Model.DashboardData.StaffUnregisteredCount unregistered)
(@Model.DashboardData.StaffUnregisteredCount not registered)
</span>
}
</p>
Expand Down
82 changes: 41 additions & 41 deletions DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,53 @@
@model SupervisorDelegateViewModel;
@inject IConfiguration Configuration;
@{
var errorHasOccurred = !ViewData.ModelState.IsValid;
ViewData["Application"] = "Supervisor";
ViewData["Title"] = (errorHasOccurred ? "Error: " : "") + "My Staff - Nominate Supervisor";
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/Supervisor/MyStaff";
ViewData["HeaderPathName"] = "My Staff";
var errorHasOccurred = !ViewData.ModelState.IsValid;
ViewData["Application"] = "Supervisor";
ViewData["Title"] = (errorHasOccurred ? "Error: " : "") + "Confirm Nominate supervisor";
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/Supervisor/MyStaff";
ViewData["HeaderPathName"] = "My Staff";
}

@section NavMenuItems {
<partial name="Shared/_NavMenuItems" />
<partial name="Shared/_NavMenuItems" />
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred)
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
}
<h1 id="page-heading">Confirm Nominate Supervisor</h1>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-one-quarter nhsuk-heading-l">
<div class="nhsuk-u-font-weight-bold">
Staff member:
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred)
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
}
<h1 id="page-heading">@ViewData["Title"]</h1>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-one-quarter nhsuk-heading-l">
<div class="nhsuk-u-font-weight-bold">
Staff member:
</div>
</div>
<div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal">
@Model.FirstName @Model.LastName (@Model.DelegateEmail)
</div>
</div>
</div>
<div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal">
@Model.FirstName @Model.LastName (@Model.DelegateEmail)
</div>
</div>
<p class="nhsuk-body-m">By nominating this member of staff as a supervisor, you are confirming there competence to assess the capability of others.</p>
<p>Once the nominated supervisor role has been assigned, it can only be removed by a Centre Manager or Clinical Centre Manager.</p>
<form method="post" asp-controller="Supervisor">
<div class="nhsuk-checkboxes__item">
<vc:single-checkbox asp-for="@nameof(Model.ActionConfirmed)"
label="I am sure that I wish to nominate @Model.FirstName @Model.LastName as a supervisor"
hint-text="This action will grant the staff member nominated supervisor role and I understand that this role can only be removed by a Centre Manager or Clinical Centre Manager." />
</div>
<button type="submit" class="nhsuk-button nhsuk-u-margin-top-4" asp-action="ConfirmNominateSupervisor">
Confirm
</button>
@Html.HiddenFor(m => m.Id)
@Html.HiddenFor(m => m.FirstName)
@Html.HiddenFor(m => m.LastName)
@Html.HiddenFor(m => m.DelegateEmail)
@Html.HiddenFor(m => m.CandidateAssessmentCount)
@Html.HiddenFor(m => m.ReturnPageQuery)
</form>
<p class="nhsuk-body-m">By promoting this member of staff to the Nominated supervisor role, you are confirming there competence to assess the capability of others.</p>
<p>Once the Nominated supervisor role has been assigned, it can only be removed by a Centre Manager or Clinical Centre Manager.</p>
<form method="post" asp-controller="Supervisor">
<div class="nhsuk-checkboxes__item">
<vc:single-checkbox asp-for="@nameof(Model.ActionConfirmed)"
label="I am sure that I wish to promote @Model.FirstName @Model.LastName to the Nominated supervisor role"
hint-text="I understand that the Nominated Supervisor role can only be removed by a Centre Manager or Clinical Centre Manager." />
</div>
<button type="submit" class="nhsuk-button nhsuk-u-margin-top-4" asp-action="ConfirmNominateSupervisor">
Confirm
</button>
@Html.HiddenFor(m => m.Id)
@Html.HiddenFor(m => m.FirstName)
@Html.HiddenFor(m => m.LastName)
@Html.HiddenFor(m => m.DelegateEmail)
@Html.HiddenFor(m => m.CandidateAssessmentCount)
@Html.HiddenFor(m => m.ReturnPageQuery)
</form>

<vc:cancel-link-with-return-page-query asp-controller="Supervisor" asp-action="MyStaffList" return-page-query="@Model.ReturnPageQuery" />
</div>
<vc:cancel-link-with-return-page-query asp-controller="Supervisor" asp-action="MyStaffList" return-page-query="@Model.ReturnPageQuery" />
</div>
</div>
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@
<partial name="Shared/_StaffDetails" model="Model.SupervisorDelegateDetail" view-data="@(new ViewDataDictionary(ViewData){{"isSupervisor", Model.IsUserSupervisor}})" />
}
</div>
@if (Model.SupervisorDelegateDetail.DlsRole == DlsRole.Learner && Model.IsUserSupervisor)
@if (Model.SupervisorDelegateDetail.DlsRole == DlsRole.Learner && Model.IsUserSupervisor && Model.SupervisorDelegateDetail.CandidateID != null)
{
<a class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-top-4 button-small"
data-return-page-enabled="true"
asp-action="NominateSupervisor"
asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID"
asp-route-returnPageQuery="@Model.ReturnPageQuery">
Nominate supervisor
Promote to Nominated supervisor
</a>
}
@if (Model.SupervisorDelegateDetail.CandidateAssessmentCount == 0)
Expand Down