Skip to content

TD-4333 Making course admin fields optional again #2877

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

TD-4333 Making course admin fields optional again #2877

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
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Data/Helpers/NewlineSeparatedStringListHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static string RemoveStringFromNewlineSeparatedList(string list, int index
public static string AddStringToNewlineSeparatedList(string? list, string newItem)
{
var options = list != null ? SplitNewlineSeparatedList(list) : new List<string>();
options.Add(newItem.Trim());
options.Add(newItem?.Trim());
return JoinNewlineSeparatedList(options);
}

Expand Down
1 change: 0 additions & 1 deletion ...LearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/AdminFieldAnswersViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public AdminFieldAnswersViewModel(

public List<string> Options => NewlineSeparatedStringListHelper.SplitNewlineSeparatedList(OptionsString);

[Required(ErrorMessage = "Enter a response")]
[MaxLength(100, ErrorMessage = "Response must be 100 characters or fewer")]
public string? Answer { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion ...alLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/AddAdminField.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
autocomplete=""
hint-text=""
css-class="nhsuk-u-width-full"
required="true" />
required="false" />
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.AddPromptAction">Add</button>
</div>
</div>
Expand Down
101 changes: 51 additions & 50 deletions ...lLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AdminFields/EditAdminField.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,66 @@
<link rel="stylesheet" href="@Url.Content("~/css/shared/cardWithButtons.css")" asp-append-version="true">

@{
var errorHasOccurred = !ViewData.ModelState.IsValid;
ViewData["Title"] = errorHasOccurred ? "Error: Edit course admin field" : "Edit course admin field";
var cancelLinkData = Html.GetRouteValues();
var errorHasOccurred = !ViewData.ModelState.IsValid;
ViewData["Title"] = errorHasOccurred ? "Error: Edit course admin field" : "Edit course admin field";
var cancelLinkData = Html.GetRouteValues();
}

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

<form method="post" novalidate asp-action="EditAdminField">
<div class="hidden-submit">
<button name="action" class="nhsuk-button" value="@AdminFieldsController.AddPromptAction" aria-hidden="true" tabindex="-1">Add</button>
</div>
<form method="post" novalidate asp-action="EditAdminField">
<div class="hidden-submit">
<button name="action" class="nhsuk-button" value="@AdminFieldsController.AddPromptAction" aria-hidden="true" tabindex="-1">Add</button>
</div>

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

<vc:field-name-value-display display-name="Field" field-value="@Model.Prompt" />
<vc:field-name-value-display display-name="Field" field-value="@Model.Prompt" />

@if (string.IsNullOrEmpty(Model.OptionsString))
{
<partial name="_NoConfiguredAnswers" />
}
else
{
<partial name="_AdminFieldAnswerTable" model="Model" />
}
@if (string.IsNullOrEmpty(Model.OptionsString))
{
<partial name="_NoConfiguredAnswers" />
}
else
{
<partial name="_AdminFieldAnswerTable" model="Model" />
}

<div class="nhsuk-grid-row divider">
<div class="nhsuk-grid-column-one-half">
<vc:text-input asp-for="@nameof(Model.Answer)"
label="Add a new response"
populate-with-current-value="true"
type="text"
spell-check="true"
autocomplete=""
hint-text=""
css-class="nhsuk-u-width-full"
required="true" />
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.AddPromptAction">Add</button>
</div>
</div>
<div class="nhsuk-grid-row divider">
<div class="nhsuk-grid-column-one-half">
<vc:text-input asp-for="@nameof(Model.Answer)"
label="Add a new response"
populate-with-current-value="true"
type="text"
spell-check="true"
autocomplete=""
hint-text=""
css-class="nhsuk-u-width-full"
required="false" />
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.AddPromptAction">Add</button>
</div>
</div>

<div class="nhsuk-grid-row divider">
<div class="nhsuk-grid-column-one-half">
<p class="nhsuk-label">Want to edit responses in bulk?</p>
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.BulkAction">Bulk edit</button>
</div>
</div>
<div class="nhsuk-grid-row divider">
<div class="nhsuk-grid-column-one-half">
<p class="nhsuk-label">Want to edit responses in bulk?</p>
<button name="action" class="nhsuk-button nhsuk-button--secondary" value="@AdminFieldsController.BulkAction">Bulk edit</button>
</div>
</div>

<div class="nhsuk-u-margin-bottom-3">
<button name="action" class="nhsuk-button" value="@AdminFieldsController.SaveAction">Save</button>
</div>
</form>
<div class="nhsuk-u-margin-bottom-3">
<button name="action" class="nhsuk-button" value="@AdminFieldsController.SaveAction">Save</button>
</div>
</form>

<vc:cancel-link asp-controller="AdminFields" asp-action="Index" asp-all-route-data="@cancelLinkData" />
</div>
<vc:cancel-link asp-controller="AdminFields" asp-action="Index" asp-all-route-data="@cancelLinkData" />
</div>
</div>
Loading