Skip to content

Commit e68042d

Browse files
OluwatobiAweOluwatobiAwe
authored
Merge pull request #799 from TechnologyEnhancedLearning/Develop/Fixes/TD-4180
programmatically associating error summary with form field
2 parents 2759511 + d907585 commit e68042d

File tree

6 files changed

+45
-8
lines changed

6 files changed

+45
-8
lines changed

‎LearningHub.Nhs.WebUI/Controllers/AccountController.cs‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ public async Task<IActionResult> CreateAccountCountrySearch()
429429
public async Task<IActionResult> CreateAccountCountrySelection(AccountCreationViewModel accountCreationViewModel)
430430
{
431431
var accountDetails = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
432+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
432433
if (!string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
433434
{
434435
string filterText = Regex.Replace(accountCreationViewModel.FilterText, "[:!@#$%^&*()}{|\":?><\\[\\]\\;'/.,~\\\"\"\\'\\\\/]", " ");
@@ -469,6 +470,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
469470
{
470471
var countryCheck = int.TryParse(accountCreationViewModel.CountryId, out int countryId);
471472
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
473+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
472474
if (accountCreationViewModel.CountryId != null)
473475
{
474476
accountCreation.CountryId = accountCreationViewModel.CountryId;
@@ -535,7 +537,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
535537
public async Task<IActionResult> CreateAccountSubmitRegionSelection(AccountCreationViewModel accountCreationViewModel)
536538
{
537539
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
538-
540+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
539541
if (string.IsNullOrWhiteSpace(accountCreationViewModel.RegionId))
540542
{
541543
if (accountCreation.CountryId == "1" || accountCreation.CountryId == null)
@@ -593,6 +595,7 @@ public async Task<IActionResult> CreateAccountSearchRole(AccountCreationViewMode
593595
public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewModel accountCreationViewModel)
594596
{
595597
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
598+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
596599
if (!string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
597600
{
598601
string filterText = Regex.Replace(accountCreationViewModel.FilterText, "[:!@#$%^&*()}{|\":?><\\[\\]\\;'/.,~\\\"\"\\'\\\\/]", " ");
@@ -649,6 +652,7 @@ public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewMod
649652
public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreationViewModel accountCreationViewModel)
650653
{
651654
var roleCheck = int.TryParse(accountCreationViewModel.CurrentRole, out int roleId);
655+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
652656
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
653657

654658
if (string.IsNullOrWhiteSpace(accountCreationViewModel.CurrentRole) || !roleCheck)
@@ -681,6 +685,7 @@ public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreat
681685
public async Task<IActionResult> CreateAccountGradeSelection(AccountCreationViewModel accountCreationViewModel)
682686
{
683687
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
688+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
684689
int gradePageSize = UserRegistrationContentPageSize + 5;
685690
var roleCheck = int.TryParse(accountCreation.CurrentRole, out int roleId);
686691
if (!roleCheck || roleId == 0)
@@ -745,6 +750,7 @@ public async Task<IActionResult> CreateAccountGradeSelection(AccountCreationView
745750
public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationViewModel accountCreationViewModel)
746751
{
747752
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
753+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
748754
var gradeCheck = int.TryParse(accountCreationViewModel.GradeId, out int gradeId);
749755
if (string.IsNullOrWhiteSpace(accountCreationViewModel.GradeId) || !gradeCheck)
750756
{
@@ -777,6 +783,7 @@ public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationVi
777783
public async Task<IActionResult> CreateAccountPrimarySpecialtySelection(AccountCreationViewModel accountCreationViewModel)
778784
{
779785
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
786+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
780787
if (accountCreationViewModel.PrimarySpecialtyId?.ToLower() == "not applicable")
781788
{
782789
var specialties = await this.specialtyService.GetSpecialtiesAsync();
@@ -953,6 +960,7 @@ public async Task<IActionResult> CreateAccountStartDate(bool? returnToConfirmati
953960
public async Task<IActionResult> CreateAccountWorkPlaceSearch()
954961
{
955962
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
963+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
956964
if (!string.IsNullOrWhiteSpace(accountCreation.LocationId) && !this.CheckConfirmationUpdate())
957965
{
958966
return this.RedirectToAction("CreateAccountWorkPlace", new AccountCreationViewModel { LocationId = accountCreation.LocationId });
@@ -972,6 +980,7 @@ public async Task<IActionResult> CreateAccountWorkPlaceSearch()
972980
public async Task<IActionResult> CreateAccountWorkPlace(AccountCreationViewModel accountCreationViewModel)
973981
{
974982
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
983+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
975984
if (string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
976985
{
977986
if (!string.IsNullOrWhiteSpace(accountCreation.LocationId))
@@ -1014,7 +1023,7 @@ public async Task<IActionResult> CreateAccountWorkPlace(AccountCreationViewModel
10141023
public async Task<IActionResult> CreateAccountConfirmation(AccountCreationViewModel accountCreationViewModel)
10151024
{
10161025
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
1017-
1026+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
10181027
if (accountCreation.AccountCreationType == AccountCreationTypeEnum.FullAccess)
10191028
{
10201029
var placeOfWorkCheck = int.TryParse(accountCreationViewModel.LocationId, out int locationId);
@@ -1051,7 +1060,7 @@ public async Task<IActionResult> CreateAccountConfirmation()
10511060
{
10521061
var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
10531062
this.ViewBag.AccountCreationType = accountCreation.AccountCreationType;
1054-
1063+
AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
10551064
if (accountCreation.CountryId == "1" && (string.IsNullOrWhiteSpace(accountCreation.RegionId) || accountCreation.RegionId == "0"))
10561065
{
10571066
this.ModelState.AddModelError(string.Empty, CommonValidationErrorMessages.RegionRequiredSummary);

‎LearningHub.Nhs.WebUI/Helpers/AccountCreationFormHelper.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
namespace LearningHub.Nhs.WebUI.Helpers
2+
{
3+
using System.Collections.Generic;
4+
using Microsoft.AspNetCore.Mvc.ViewFeatures;
5+
6+
/// <summary>
7+
/// Defines the <see cref="AccountCreationFormHelper" />.
8+
/// </summary>
9+
public static class AccountCreationFormHelper
10+
{
11+
/// <summary>
12+
/// The PopulateGroupedFormControlMetadata.
13+
/// </summary>
14+
/// <param name="viewData">viewData.</param>
15+
public static void PopulateGroupedFormControlMetadata(ViewDataDictionary viewData)
16+
{
17+
viewData["GroupedFormControlMetadata"] = new Dictionary<string, bool>
18+
{
19+
{ "CountryId", true },
20+
{ "RegionId", true },
21+
{ "CurrentRole", true },
22+
{ "PrimarySpecialtyId", true },
23+
{ "GradeId", true },
24+
{ "LocationId", true },
25+
};
26+
}
27+
}
28+
}

‎LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
129129
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
130130
<PackageReference Include="MK.IO" Version="1.5.0" />
131-
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.27" />
131+
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.28" />
132132
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
133133
<PrivateAssets>all</PrivateAssets>
134134
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialty.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<div class="nhsuk-radios">
6363

6464
<div class="nhsuk-radios__item">
65-
<input class="nhsuk-radios__input" id="PrimarySpecialtyId" name="PrimarySpecialtyId" type="radio" value="Not applicable">
65+
<input class="nhsuk-radios__input" id="PrimarySpecialtyId-0" name="PrimarySpecialtyId" type="radio" value="Not applicable">
6666
<label class="nhsuk-label nhsuk-radios__label" for="PrimarySpecialtyId">
6767
Not applicable
6868
</label>

‎LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
<div class="nhsuk-radios">
145145

146146
<div class="nhsuk-radios__item">
147-
<input class="nhsuk-radios__input" id="PrimarySpecialtyId" name="PrimarySpecialtyId" type="radio" value="Not applicable">
147+
<input class="nhsuk-radios__input" id="PrimarySpecialtyId-0" name="PrimarySpecialtyId" type="radio" value="Not applicable">
148148
<label class="nhsuk-label nhsuk-radios__label" for="FilterText">
149149
Not applicable
150150
</label>

‎LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
@foreach (var (radio, index) in Model.Radios.Select((r, i) => (r, i)))
5353
{
5454
counter = index;
55-
var radioId = $"{radio.Value}-{index}";
55+
var radioId = $"{Model.AspFor}-{index}";
5656
if (!string.IsNullOrWhiteSpace(Model.Class))
5757
{
5858
<div class="@Model.Class">
@@ -106,7 +106,7 @@
106106
@if (Model.OptionalRadio != null)
107107
{
108108
<div class="nhsuk-radios__divider nhsuk-u-padding-left-2">or</div>
109-
var radioId = $"{Model.OptionalRadio.Value}-{++counter}";
109+
var radioId = $"{Model.AspFor}-{++counter}";
110110
<div class="nhsuk-radios__item">
111111
<input class="nhsuk-radios__input"
112112
id="@radioId"

0 commit comments

Comments
 (0)