Merge remote-tracking branch 'origin/RC' into TD-5236

Author: OluwatobiAwe

LearningHub.Nhs.WebUI/Controllers/AccountController.cs

@@ -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, "[:!@#$%^&*()}{|\":?><\\[\\]\\;'/.,~\\\"\"\\'\\\\/]", " ");
@@ -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;
@@ -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)
@@ -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, "[:!@#$%^&*()}{|\":?><\\[\\]\\;'/.,~\\\"\"\\'\\\\/]", " ");
@@ -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)
@@ -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)
@@ -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)
             {
@@ -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();
@@ -852,6 +859,7 @@ public async Task<IActionResult> CreateAccountWorkStartDate(AccountCreationViewM
         {
             int specialtyId;
             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();
@@ -871,7 +879,7 @@ public async Task<IActionResult> CreateAccountWorkStartDate(AccountCreationViewM
                         this.ModelState.AddModelError("PrimarySpecialtyId", CommonValidationErrorMessages.SpecialtyNotApplicable);
                     }
 
-                    return this.View("CreateAccountPrimarySpecialtySelection", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation, SpecialtyList = shortlist.Item2, OptionalSpecialtyItem = optionalSpecialty.FirstOrDefault(x => x.Name.ToLower() == "not applicable"), AccountCreationPaging = new AccountCreationPagingModel { TotalItems = shortlist.Item1, PageSize = UserRegistrationContentPageSize, HasItems = shortlist.Item1 > 0, CurrentPage = 1 } });
+                    return this.View("CreateAccountPrimarySpecialtySelection", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText, GradeId = accountCreation.GradeId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation, SpecialtyList = shortlist.Item2, OptionalSpecialtyItem = optionalSpecialty.FirstOrDefault(x => x.Name.ToLower() == "not applicable"), AccountCreationPaging = new AccountCreationPagingModel { TotalItems = shortlist.Item1, PageSize = UserRegistrationContentPageSize, HasItems = shortlist.Item1 > 0, CurrentPage = 1 } });
                 }
 
                 accountCreation.PrimarySpecialtyId = accountCreationViewModel.PrimarySpecialtyId;
@@ -899,6 +907,7 @@ public async Task<IActionResult> CreateAccountWorkStartDate(AccountCreationViewM
         [TypeFilter(typeof(RedirectMissingMultiPageFormData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddRegistrationPrompt) })]
         public async Task<IActionResult> CreateAccountStartDate(AccountCreationDateViewModel accountCreationDateViewModel)
         {
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (!this.ModelState.IsValid)
             {
                 return this.View("CreateAccountWorkStartDate", accountCreationDateViewModel);
@@ -953,6 +962,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 });
@@ -972,6 +982,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))
@@ -1014,7 +1025,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);
@@ -1051,7 +1062,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);

LearningHub.Nhs.WebUI/Helpers/AccountCreationFormHelper.cs

@@ -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 },
+            };
+        }
+    }
+}

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

@@ -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>

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

@@ -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>

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

@@ -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>

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

@@ -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">
@@ -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"