Merge pull request #3402 from TechnologyEnhancedLearning/revert-3393-Develop/Features/TD-4624-Addregexvalidationofprofessionalregistrationnumberfieldthroughouttheapplication

Revert "TD- 4624 addregexvalidationofprofessionalregistrationnumberfieldthroughouttheapplication"

Author: rshrirohit

DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml

@@ -32,15 +32,8 @@
     nameof(Model.Answer5),
     nameof(Model.Answer6),
     };
-     var professionalRegistrationNumberError = ViewData.ModelState["ProfessionalRegistrationNumber"]?.Errors.FirstOrDefault();
-            if (professionalRegistrationNumberError == null)
-            {
+
       <vc:error-summary order-of-property-names="@orderOfPropertyNames" />
-        }
-            if (professionalRegistrationNumberError != null)
-            {
-                <partial name="_ProfessionalRegistrationNumberError" model=@(professionalRegistrationNumberError.ErrorMessage) />
-            }
     }
 
     <h1 class="nhsuk-heading-xl" id="app-page-heading">Edit details</h1>

DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml

@@ -11,28 +11,18 @@
 <div class="nhsuk-grid-row">
   <div class="nhsuk-grid-column-full">
     @if (errorHasOccurred)
-        {
-
-            var professionalRegistrationNumberError = ViewData.ModelState["ProfessionalRegistrationNumber"]?.Errors.FirstOrDefault();
-            if (professionalRegistrationNumberError == null)
-            {
-                <vc:error-summary order-of-property-names="@(new[] {
-                                                                             nameof(Model.JobGroup),
-                                                                             nameof(Model.HasProfessionalRegistrationNumber),
-                                                                             nameof(Model.ProfessionalRegistrationNumber),
-                                                                             nameof(Model.Answer1),
-                                                                             nameof(Model.Answer2),
-                                                                             nameof(Model.Answer3),
-                                                                             nameof(Model.Answer4),
-                                                                             nameof(Model.Answer5),
-                                                                             nameof(Model.Answer6) })" />
-                }
-            if (professionalRegistrationNumberError != null)
-            {
-                <partial name="_ProfessionalRegistrationNumberError" model=@(professionalRegistrationNumberError.ErrorMessage) />
-                
-            }
-        }
+    {
+      <vc:error-summary order-of-property-names="@(new[] {
+                                                   nameof(Model.JobGroup),
+                                                   nameof(Model.HasProfessionalRegistrationNumber),
+                                                   nameof(Model.ProfessionalRegistrationNumber),
+                                                   nameof(Model.Answer1),
+                                                   nameof(Model.Answer2),
+                                                   nameof(Model.Answer3),
+                                                   nameof(Model.Answer4),
+                                                   nameof(Model.Answer5),
+                                                   nameof(Model.Answer6) })" />
+    }
 
     <h1 class="nhsuk-heading-xl">Learner information</h1>
 

DigitalLearningSolutions.Web/Views/Shared/_ProfessionalRegistrationNumberError.cshtml

@@ -34,7 +34,19 @@
             }
             if (professionalRegistrationNumberError != null)
             {
-                <partial name="_ProfessionalRegistrationNumberError" model=@(professionalRegistrationNumberError.ErrorMessage) />
+                <div class="nhsuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1">
+                    <h2 class="nhsuk-error-summary__title" id="error-summary-title">
+                        There is a problem
+                    </h2>
+                    <div class="nhsuk-error-summary__body">
+                        <span class="nhsuk-error-message" id="ProfessionalRegistrationNumber-error">
+                            <span class="nhsuk-u-visually-hidden">Error:</span> <span class="nhsuk-error-message" id="ProfessionalRegistrationNumber-error">
+                                <span class="nhsuk-u-visually-hidden">Error:</span>
+                                @Html.Raw(professionalRegistrationNumberError.ErrorMessage)
+                            </span>
+                        </span>
+                    </div>
+                </div>
             }
     }