Skip to content

programmatically associating error summary with form field #799

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
Jan 8, 2025
Merged

programmatically associating error summary with form field #799

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
4505abe
update view component package
OluwatobiAwe Jan 8, 2025
d907585
Code changes for TD-4180
OluwatobiAwe Jan 8, 2025
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
15 changes: 12 additions & 3 deletions LearningHub.Nhs.WebUI/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ public async Task<IActionResult> CreateAccountCountrySearch()
public async Task<IActionResult> CreateAccountCountrySelection(AccountCreationViewModel accountCreationViewModel)
{
var accountDetails = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (!string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
{
string filterText = Regex.Replace(accountCreationViewModel.FilterText, "[:!@#$%^&*()}{|\":?><\\[\\]\\;'/.,~\\\"\"\\'\\\\/]", " ");
Expand Down Expand Up @@ -469,6 +470,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
{
var countryCheck = int.TryParse(accountCreationViewModel.CountryId, out int countryId);
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (accountCreationViewModel.CountryId != null)
{
accountCreation.CountryId = accountCreationViewModel.CountryId;
Expand Down Expand Up @@ -535,7 +537,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
public async Task<IActionResult> CreateAccountSubmitRegionSelection(AccountCreationViewModel accountCreationViewModel)
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);

AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (string.IsNullOrWhiteSpace(accountCreationViewModel.RegionId))
{
if (accountCreation.CountryId == "1" || accountCreation.CountryId == null)
Expand Down Expand Up @@ -593,6 +595,7 @@ public async Task<IActionResult> CreateAccountSearchRole(AccountCreationViewMode
public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewModel accountCreationViewModel)
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (!string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
{
string filterText = Regex.Replace(accountCreationViewModel.FilterText, "[:!@#$%^&*()}{|\":?><\\[\\]\\;'/.,~\\\"\"\\'\\\\/]", " ");
Expand Down Expand Up @@ -649,6 +652,7 @@ public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewMod
public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreationViewModel accountCreationViewModel)
{
var roleCheck = int.TryParse(accountCreationViewModel.CurrentRole, out int roleId);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);

if (string.IsNullOrWhiteSpace(accountCreationViewModel.CurrentRole) || !roleCheck)
Expand Down Expand Up @@ -681,6 +685,7 @@ public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreat
public async Task<IActionResult> CreateAccountGradeSelection(AccountCreationViewModel accountCreationViewModel)
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
int gradePageSize = UserRegistrationContentPageSize + 5;
var roleCheck = int.TryParse(accountCreation.CurrentRole, out int roleId);
if (!roleCheck || roleId == 0)
Expand Down Expand Up @@ -745,6 +750,7 @@ public async Task<IActionResult> CreateAccountGradeSelection(AccountCreationView
public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationViewModel accountCreationViewModel)
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
var gradeCheck = int.TryParse(accountCreationViewModel.GradeId, out int gradeId);
if (string.IsNullOrWhiteSpace(accountCreationViewModel.GradeId) || !gradeCheck)
{
Expand Down Expand Up @@ -777,6 +783,7 @@ public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationVi
public async Task<IActionResult> CreateAccountPrimarySpecialtySelection(AccountCreationViewModel accountCreationViewModel)
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (accountCreationViewModel.PrimarySpecialtyId?.ToLower() == "not applicable")
{
var specialties = await this.specialtyService.GetSpecialtiesAsync();
Expand Down Expand Up @@ -953,6 +960,7 @@ public async Task<IActionResult> CreateAccountStartDate(bool? returnToConfirmati
public async Task<IActionResult> CreateAccountWorkPlaceSearch()
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (!string.IsNullOrWhiteSpace(accountCreation.LocationId) && !this.CheckConfirmationUpdate())
{
return this.RedirectToAction("CreateAccountWorkPlace", new AccountCreationViewModel { LocationId = accountCreation.LocationId });
Expand All @@ -972,6 +980,7 @@ public async Task<IActionResult> CreateAccountWorkPlaceSearch()
public async Task<IActionResult> CreateAccountWorkPlace(AccountCreationViewModel accountCreationViewModel)
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
{
if (!string.IsNullOrWhiteSpace(accountCreation.LocationId))
Expand Down Expand Up @@ -1014,7 +1023,7 @@ public async Task<IActionResult> CreateAccountWorkPlace(AccountCreationViewModel
public async Task<IActionResult> CreateAccountConfirmation(AccountCreationViewModel accountCreationViewModel)
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);

AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (accountCreation.AccountCreationType == AccountCreationTypeEnum.FullAccess)
{
var placeOfWorkCheck = int.TryParse(accountCreationViewModel.LocationId, out int locationId);
Expand Down Expand Up @@ -1051,7 +1060,7 @@ public async Task<IActionResult> CreateAccountConfirmation()
{
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
this.ViewBag.AccountCreationType = accountCreation.AccountCreationType;

AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
if (accountCreation.CountryId == "1" && (string.IsNullOrWhiteSpace(accountCreation.RegionId) || accountCreation.RegionId == "0"))
{
this.ModelState.AddModelError(string.Empty, CommonValidationErrorMessages.RegionRequiredSummary);
Expand Down
28 changes: 28 additions & 0 deletions LearningHub.Nhs.WebUI/Helpers/AccountCreationFormHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
namespace LearningHub.Nhs.WebUI.Helpers
{
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc.ViewFeatures;

/// <summary>
/// Defines the <see cref="AccountCreationFormHelper" />.
/// </summary>
public static class AccountCreationFormHelper
{
/// <summary>
/// The PopulateGroupedFormControlMetadata.
/// </summary>
/// <param name="viewData">viewData.</param>
public static void PopulateGroupedFormControlMetadata(ViewDataDictionary viewData)
{
viewData["GroupedFormControlMetadata"] = new Dictionary<string, bool>
{
{ "CountryId", true },
{ "RegionId", true },
{ "CurrentRole", true },
{ "PrimarySpecialtyId", true },
{ "GradeId", true },
{ "LocationId", true },
};
}
}
}
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
<PackageReference Include="MK.IO" Version="1.5.0" />
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.27" />
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.28" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialty.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<div class="nhsuk-radios">

<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input" id="PrimarySpecialtyId" name="PrimarySpecialtyId" type="radio" value="Not applicable">
<input class="nhsuk-radios__input" id="PrimarySpecialtyId-0" name="PrimarySpecialtyId" type="radio" value="Not applicable">
<label class="nhsuk-label nhsuk-radios__label" for="PrimarySpecialtyId">
Not applicable
</label>
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<div class="nhsuk-radios">

<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input" id="PrimarySpecialtyId" name="PrimarySpecialtyId" type="radio" value="Not applicable">
<input class="nhsuk-radios__input" id="PrimarySpecialtyId-0" name="PrimarySpecialtyId" type="radio" value="Not applicable">
<label class="nhsuk-label nhsuk-radios__label" for="FilterText">
Not applicable
</label>
Expand Down
4 changes: 2 additions & 2 deletions LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
@foreach (var (radio, index) in Model.Radios.Select((r, i) => (r, i)))
{
counter = index;
var radioId = $"{radio.Value}-{index}";
var radioId = $"{Model.AspFor}-{index}";
if (!string.IsNullOrWhiteSpace(Model.Class))
{
<div class="@Model.Class">
Expand Down Expand Up @@ -106,7 +106,7 @@
@if (Model.OptionalRadio != null)
{
<div class="nhsuk-radios__divider nhsuk-u-padding-left-2">or</div>
var radioId = $"{Model.OptionalRadio.Value}-{++counter}";
var radioId = $"{Model.AspFor}-{++counter}";
<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input"
id="@radioId"
Expand Down
Loading