Skip to content
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

HEEDLS-524 Refactor prompt management pages for consistent spacing #440

Merged
merged 4 commits into from
Jun 25, 2021
Merged

HEEDLS-524 Refactor prompt management pages for consistent spacing #440

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1877546
HEEDLS-524 Refactor prompt management pages for consistent spacing
AlexJacksonDS Jun 22, 2021
97e98b5
HEEDLS-524 Rename boolean to canAddNewPrompt
AlexJacksonDS Jun 23, 2021
c31dce0
HEEDLS-524 Negate canAddNewPrompt logic
AlexJacksonDS Jun 23, 2021
52ce57b
HEEDLS-524 Fix boolean condition
AlexJacksonDS Jun 23, 2021
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
80 changes: 30 additions & 50 deletions ...stem/CentreConfiguration/RegistrationPrompts/AddRegistrationPromptConfigureAnswers.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,70 +13,50 @@
}

@section NavMenuItems {
<partial name="~/Views/TrackingSystem/Shared/_NavMenuItems.cshtml"/>
}

@if (errorHasOccurred) {
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<vc:error-summary order-of-property-names="@new []{ nameof(EditRegistrationPromptViewModel.OptionsString), nameof(EditRegistrationPromptViewModel.Answer)}"/>
</div>
</div>
<partial name="~/Views/TrackingSystem/Shared/_NavMenuItems.cshtml" />
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred) {
<vc:error-summary order-of-property-names="@new []{ nameof(EditRegistrationPromptViewModel.OptionsString), nameof(EditRegistrationPromptViewModel.Answer)}" />
}

<h1 class="nhsuk-heading-xl">Configure answers</h1>
</div>
</div>

<form class="nhsuk-u-margin-bottom-8" method="post" novalidate asp-action="AddRegistrationPromptConfigureAnswers">
<div class="hidden-submit">
<button name="action" class="nhsuk-button" value="@RegistrationPromptsController.AddPromptAction">Add</button>
</div>
<form class="nhsuk-u-margin-bottom-3" method="post" novalidate asp-action="AddRegistrationPromptConfigureAnswers">
<div class="hidden-submit">
<button name="action" class="nhsuk-button" value="@RegistrationPromptsController.AddPromptAction">Add</button>
</div>

<input type="hidden" asp-for="OptionsString"/>
<input type="hidden" asp-for="OptionsString" />

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (string.IsNullOrEmpty(Model.OptionsString)) {
<partial name="_NoConfiguredAnswers"/>
<partial name="_NoConfiguredAnswers" />
} else {
<partial name="_RegistrationPromptAnswerTable" model="Model"/>
<partial name="_RegistrationPromptAnswerTable" model="Model" />
}
</div>
</div>

<div class="nhsuk-grid-row divider">
<div class="nhsuk-grid-column-one-half">
SteveJacksonSoft marked this conversation as resolved.
Show resolved Hide resolved
<vc:text-input asp-for="Answer"
label="Add a new answer?"
populate-with-current-value="true"
type="text"
spell-check="true"
autocomplete=""
hint-text=""
css-class="nhsuk-u-width-full nhsuk-u-font-weight-bold"/>
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@RegistrationPromptsController.AddPromptAction">Add</button>
</div>
</div>

<div class="nhsuk-grid-row divider">
<div class="nhsuk-grid-column-one-half">
<p class="nhsuk-label">Want to add answers in bulk?</p>
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@RegistrationPromptsController.BulkAction">Bulk add</button>
</div>
</div>
<div class="divider">
<vc:text-input asp-for="Answer"
label="Add a new answer?"
populate-with-current-value="true"
type="text"
spell-check="true"
autocomplete=""
hint-text=""
css-class="nhsuk-u-width-one-half nhsuk-u-font-weight-bold" />
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@RegistrationPromptsController.AddPromptAction">Add</button>
</div>

<div class="divider">
<p class="nhsuk-label">Want to add answers in bulk?</p>
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@RegistrationPromptsController.BulkAction">Bulk add</button>
</div>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<button name="action" class="nhsuk-button" value="@RegistrationPromptsController.NextAction">Next</button>
</div>
</div>
</form>
</form>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<vc:back-link asp-controller="RegistrationPrompts" asp-action="AddRegistrationPromptSelectPrompt" link-text="Go back"/>
<vc:back-link asp-controller="RegistrationPrompts" asp-action="AddRegistrationPromptSelectPrompt" link-text="Go back" />
</div>
</div>
30 changes: 9 additions & 21 deletions ...ngSystem/CentreConfiguration/RegistrationPrompts/AddRegistrationPromptSelectPrompt.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,26 @@
}

@section NavMenuItems {
<partial name="~/Views/TrackingSystem/Shared/_NavMenuItems.cshtml"/>
}

@if (errorHasOccurred) {
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<vc:error-summary order-of-property-names="@new []{ nameof(AddRegistrationPromptSelectPromptViewModel.CustomPromptId)}"/>
</div>
</div>
<partial name="~/Views/TrackingSystem/Shared/_NavMenuItems.cshtml" />
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred) {
<vc:error-summary order-of-property-names="@new []{ nameof(AddRegistrationPromptSelectPromptViewModel.CustomPromptId)}" />
}

<h1 class="nhsuk-heading-xl">Add delegate registration prompt</h1>
</div>
</div>

<form class="nhsuk-u-margin-bottom-8" method="post" novalidate asp-action="AddRegistrationPromptSelectPrompt">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<form class="nhsuk-u-margin-bottom-3" method="post" novalidate asp-action="AddRegistrationPromptSelectPrompt">
<vc:select-list asp-for="CustomPromptId"
label="Prompt name"
value="@Model.CustomPromptId?.ToString()"
hint-text=""
deselectable="false"
css-class="nhsuk-u-width-one-half"
default-option="Select a prompt name"
select-list-options="@ViewBag.CustomPromptNameOptions"/>
select-list-options="@ViewBag.CustomPromptNameOptions" />

<p class="nhsuk-body-m">
Tick the box below if all users that register with your centre are required to fill in this field.
Expand All @@ -55,12 +47,8 @@
</div>

<button class="nhsuk-button">Next</button>
</div>
</div>
</form>
</form>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<vc:back-link asp-controller="RegistrationPrompts" asp-action="Index" link-text="Cancel"/>
<vc:back-link asp-controller="RegistrationPrompts" asp-action="Index" link-text="Cancel" />
</div>
</div>
2 changes: 1 addition & 1 deletion ...ackingSystem/CentreConfiguration/RegistrationPrompts/BulkRegistrationPromptAnswers.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<h1 class="nhsuk-heading-xl">Configure answers in bulk</h1>

<form class="nhsuk-u-margin-bottom-8" method="post" novalidate asp-action="@(Model.IsAddPromptJourney ? "AddRegistrationPromptBulkPost" : "EditRegistrationPromptBulkPost")">
<form class="nhsuk-u-margin-bottom-3" method="post" novalidate asp-action="@(Model.IsAddPromptJourney ? "AddRegistrationPromptBulkPost" : "EditRegistrationPromptBulkPost")">

<input type="hidden" asp-for="IsAddPromptJourney" />
<input type="hidden" asp-for="PromptNumber" />
Expand Down
16 changes: 6 additions & 10 deletions ...iews/TrackingSystem/CentreConfiguration/RegistrationPrompts/EditRegistrationPrompt.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,17 @@
<partial name="~/Views/TrackingSystem/Shared/_NavMenuItems.cshtml" />
}

@if (errorHasOccurred) {
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<vc:error-summary order-of-property-names="@new []{ nameof(EditRegistrationPromptViewModel.OptionsString), nameof(EditRegistrationPromptViewModel.Answer)}" />
</div>
</div>
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred) {
<vc:error-summary order-of-property-names="@new []{ nameof(EditRegistrationPromptViewModel.OptionsString), nameof(EditRegistrationPromptViewModel.Answer)}" />
}

<h1 class="nhsuk-heading-xl">Edit delegate registration prompt</h1>
</div>
</div>

<form class="nhsuk-u-margin-bottom-8" method="post" novalidate asp-action="EditRegistrationPrompt">
<form method="post" novalidate asp-action="EditRegistrationPrompt">
<div class="hidden-submit">
<button name="action" class="nhsuk-button" value="@RegistrationPromptsController.AddPromptAction">Add</button>
</div>
Expand Down Expand Up @@ -93,7 +89,7 @@
</div>
</div>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-row nhsuk-u-margin-bottom-3">
<div class="nhsuk-grid-column-full">
<button name="action" class="nhsuk-button" value="@RegistrationPromptsController.SaveAction">Save</button>
</div>
Expand Down
94 changes: 21 additions & 73 deletions ...ngSolutions.Web/Views/TrackingSystem/CentreConfiguration/RegistrationPrompts/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,100 +8,48 @@
ViewData["Application"] = "Tracking System";
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/TrackingSystem/Centre/Dashboard";
ViewData["HeaderPathName"] = "Tracking System";
var hasSixPrompts = Model.CustomFields.Count == 6;
}

@section NavMenuItems {
<partial name="~/Views/TrackingSystem/Shared/_NavMenuItems.cshtml"/>
<partial name="~/Views/TrackingSystem/Shared/_NavMenuItems.cshtml" />
}

@section NavBreadcrumbs {
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link" asp-controller="CentreConfiguration" asp-action="Index">Centre configuration</a></li>
<li class="nhsuk-breadcrumb__item">
<a class="nhsuk-breadcrumb__link" asp-controller="CentreConfiguration" asp-action="Index">Centre configuration</a>
</li>
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-controller="CentreConfiguration" asp-action="Index">Back to centre configuration</a></p>
<p class="nhsuk-breadcrumb__back">
<a class="nhsuk-breadcrumb__backlink" asp-controller="CentreConfiguration" asp-action="Index">Back to centre configuration</a>
</p>
</div>
</nav>
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<h1 class="nhsuk-heading-xl">Manage delegate registration prompts</h1>
</div>
</div>

@foreach (var customField in Model.CustomFields) {
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<details class="nhsuk-details nhsuk-expander">
<summary class="nhsuk-details__summary">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-three-quarters nhsuk-u-three-quarters-tablet">
<span class="nhsuk-details__summary-text">
@customField.CustomPromptName
</span>
</div>
<div class="nhsuk-grid-column-one-quarter nhsuk-u-one-quarter-tablet right-align-tag-column">
<span class="nhsuk-u-visually-hidden">This prompt is:</span>
<strong class="nhsuk-u-font-size-19 right-align-tag nhsuk-tag @(customField.Mandatory ? "" : "nhsuk-tag--grey")">
@(customField.Mandatory ? "Mandatory" : "Optional")
</strong>
</div>
</div>
</summary>
<div class="nhsuk-details__text">
<div class="nhsuk-grid-row nhsuk-u-margin-bottom-3">
<div class="nhsuk-grid-column-full">
@if (customField.Options.Count != 0) {
<p class="nhsuk-u-font-weight-bold">Answers delegate can choose from:</p>
<ul>
@foreach (var answer in customField.Options)
{
<li class="word-break">@answer</li>
}
</ul>
} else {
<p>This is a free text field. Delegates can input any text.</p>
}
</div>
</div>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<a class="nhsuk-button left-button-mobile-margin-bottom nhsuk-u-margin-right-2 nhsuk-u-margin-bottom-1" role="button" asp-controller="RegistrationPrompts" asp-action="EditRegistrationPromptStart" asp-route-promptNumber="@customField.CustomFieldId">
Edit
</a>
<a class="nhsuk-button delete-button nhsuk-button--secondary nhsuk-u-margin-bottom-1" role="button" asp-controller="RegistrationPrompts" asp-action="RemoveRegistrationPrompt" asp-route-promptNumber="@customField.CustomFieldId">
Remove
</a>
</div>
</div>
</div>
</details>
</div>
</div>
}
<div class="@(hasSixPrompts ? "nhsuk-u-margin-bottom-7" : "nhsuk-u-margin-bottom-3")">
stellake marked this conversation as resolved.
Show resolved Hide resolved
@foreach (var customField in Model.CustomFields) {
<partial name="_CustomPromptExpander" model="customField" />
}

@if (Model.CustomFields.Count == 0) {
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<p class="nhsuk-body-l">
Your centre does not have any delegate registration prompts.
</p>
</div>
</div>
}
@if (Model.CustomFields.Count == 0) {
<p class="nhsuk-body-l">
Your centre does not have any delegate registration prompts.
</p>
}

@if (Model.CustomFields.Count < 6) {
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<a class="nhsuk-button" asp-action="AddRegistrationPromptNew">Add a new prompt</a>
@if (!hasSixPrompts) {
<a class="nhsuk-button" asp-action="AddRegistrationPromptNew">Add a new prompt</a>
}
</div>
</div>
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<vc:back-link asp-controller="CentreConfiguration" asp-action="Index" link-text="Go back"/>
<vc:back-link asp-controller="CentreConfiguration" asp-action="Index" link-text="Go back" />
</div>
</div>
32 changes: 10 additions & 22 deletions ...ws/TrackingSystem/CentreConfiguration/RegistrationPrompts/RemoveRegistrationPrompt.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,12 @@
<partial name="~/Views/TrackingSystem/Shared/_NavMenuItems.cshtml" />
}

@if (errorHasOccurred) {
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<vc:error-summary order-of-property-names="@new []{ nameof(RemoveRegistrationPromptViewModel.Confirm) }" />
</div>
</div>
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred) {
<vc:error-summary order-of-property-names="@new []{ nameof(RemoveRegistrationPromptViewModel.Confirm) }" />
}

<h1 class="nhsuk-heading-xl">Remove delegate registration prompt</h1>
</div>
</div>
Expand All @@ -44,18 +40,14 @@
</div>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full nhsuk-body-m">
<div class="nhsuk-grid-column-full">
@if (Model.DelegateCount == 1) {
<p>@Model.DelegateCount user has responded to this prompt. Deleting the prompt will permanently delete their response.</p>
<p class="nhsuk-body-m">@Model.DelegateCount user has responded to this prompt. Deleting the prompt will permanently delete their response.</p>
} else {
<p>@Model.DelegateCount users have responded to this prompt. Deleting the prompt will permanently delete all of their responses.</p>
<p class="nhsuk-body-m">@Model.DelegateCount users have responded to this prompt. Deleting the prompt will permanently delete all of their responses.</p>
}
</div>
</div>

<form class="nhsuk-u-margin-bottom-8" method="post" asp-action="RemoveRegistrationPrompt">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">

<form class="nhsuk-u-margin-bottom-5" method="post" asp-action="RemoveRegistrationPrompt">
<div class="nhsuk-form-group @confirmFormErrorClass">
<fieldset class="nhsuk-fieldset" aria-describedby="confirm-error">
@if (confirmError) {
Expand All @@ -79,12 +71,8 @@
</div>
<input type="hidden" asp-for="DelegateCount" />
<button class="nhsuk-button delete-button nhsuk-button--secondary" type="submit">Delete prompt</button>
</div>
</div>
</form>
</form>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<vc:back-link asp-controller="RegistrationPrompts" asp-action="Index" link-text="Cancel" />
</div>
</div>
Loading