Merge branch 'DLS-Release-v1.2.3' into UAT

rshrirohit · rshrirohit · commit 0395325b1e80 · 2025-10-23T15:56:33.000+01:00
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/Register/RegisterDelegateByCentreControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/Register/RegisterDelegateByCentreControllerTests.cs
@@ -176,7 +176,7 @@ public void LearnerInformationPost_updates_tempdata_correctly()
             const string answer4 = "answer4";
             const string answer5 = "answer5";
             const string answer6 = "answer6";
-            const string professionalRegistrationNumber = "PR123456";
+            const string professionalRegistrationNumber = "PRN1234";
             var model = new LearnerInformationViewModel
             {
                 JobGroup = jobGroupId,
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/EditDelegateControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/EditDelegateControllerTests.cs
@@ -175,7 +175,7 @@ public void Index_post_returns_view_with_model_error_with_invalid_prn()
                 result.As<ViewResult>().Model.Should().BeOfType<EditDelegateViewModel>();
                 AssertModelStateErrorIsExpected(
                     result,
-                   ErrorMessagesTestHelper.InvalidFormatError
+                    "Invalid professional registration number format - Only alphanumeric characters (a-z, A-Z and 0-9) and hyphens (-) allowed"
                 );
                 A.CallTo(() => userService.GetDelegateById(A<int>._)).MustNotHaveHappened();
             }
diff --git a/DigitalLearningSolutions.Web.Tests/Helpers/ProfessionalRegistrationNumberHelperTests.cs b/DigitalLearningSolutions.Web.Tests/Helpers/ProfessionalRegistrationNumberHelperTests.cs
@@ -1,12 +1,11 @@
 ﻿namespace DigitalLearningSolutions.Web.Tests.Helpers
 {
+    using System.Linq;
     using DigitalLearningSolutions.Web.Helpers;
-    using DigitalLearningSolutions.Web.Tests.TestHelpers;
     using FluentAssertions;
     using FluentAssertions.Execution;
     using Microsoft.AspNetCore.Mvc.ModelBinding;
     using NUnit.Framework;
-    using System.Linq;
 
     public class ProfessionalRegistrationNumberHelperTests
     {
@@ -71,7 +70,7 @@ public void ValidateProfessionalRegistrationNumber_does_not_set_errors_when_vali
         {
             // Given
             var state = new ModelStateDictionary();
-            const string validPrn = "AB123456";
+            const string validPrn = "abc-123";
 
             // When
             ProfessionalRegistrationNumberHelper.ValidateProfessionalRegistrationNumber(
@@ -105,11 +104,22 @@ public void ValidateProfessionalRegistrationNumber_sets_error_when_hasPrn_is_not
             }
         }
 
-        [TestCase(null, ErrorMessagesTestHelper.MissingNumberError)]
-        [TestCase("", ErrorMessagesTestHelper.MissingNumberError)]
-        [TestCase("01234_", ErrorMessagesTestHelper.InvalidFormatError)]
-        [TestCase("01234 ", ErrorMessagesTestHelper.InvalidFormatError)]
-        [TestCase("01234$", ErrorMessagesTestHelper.InvalidFormatError)]
+        [TestCase(null, "Enter a professional registration number")]
+        [TestCase("", "Enter a professional registration number")]
+        [TestCase("123", "Professional registration number must be between 5 and 20 characters")]
+        [TestCase("0123456789-0123456789", "Professional registration number must be between 5 and 20 characters")]
+        [TestCase(
+            "01234_",
+            "Invalid professional registration number format - Only alphanumeric characters (a-z, A-Z and 0-9) and hyphens (-) allowed"
+        )]
+        [TestCase(
+            "01234 ",
+            "Invalid professional registration number format - Only alphanumeric characters (a-z, A-Z and 0-9) and hyphens (-) allowed"
+        )]
+        [TestCase(
+            "01234$",
+            "Invalid professional registration number format - Only alphanumeric characters (a-z, A-Z and 0-9) and hyphens (-) allowed"
+        )]
         public void ValidateProfessionalRegistrationNumber_sets_error_when_prn_is_invalid(
             string prn,
             string expectedError
diff --git a/DigitalLearningSolutions.Web.Tests/TestHelpers/ErrorMessagesTestHelper.cs b/DigitalLearningSolutions.Web.Tests/TestHelpers/ErrorMessagesTestHelper.cs
diff --git a/DigitalLearningSolutions.Web/Helpers/ProfessionalRegistrationNumberHelper.cs b/DigitalLearningSolutions.Web/Helpers/ProfessionalRegistrationNumberHelper.cs
@@ -1,9 +1,7 @@
 ﻿namespace DigitalLearningSolutions.Web.Helpers
 {
-
-    using Microsoft.AspNetCore.Mvc.ModelBinding;
-    using System.Text;
     using System.Text.RegularExpressions;
+    using Microsoft.AspNetCore.Mvc.ModelBinding;
 
     public class ProfessionalRegistrationNumberHelper
     {
@@ -41,29 +39,24 @@ public static void ValidateProfessionalRegistrationNumber(
                 modelState.AddModelError("ProfessionalRegistrationNumber", "Enter a professional registration number");
                 return;
             }
-            const string pattern = @"^(\d{7}|[A-Za-z]{1,2}\d{6}|\d{4,8}|P?\d{5,6}|[C|P]\d{6}|[A-Za-z]?\d{5,6}|L\d{4,6}|\d{2}-[A-Za-z\d]{4,5})$";
+
+            if (prn.Length < 5 || prn.Length > 20)
+            {
+                modelState.AddModelError(
+                    "ProfessionalRegistrationNumber",
+                    "Professional registration number must be between 5 and 20 characters"
+                );
+            }
+
+            const string pattern = @"^[a-z\d-]+$";
             var rg = new Regex(pattern, RegexOptions.IgnoreCase);
             if (!rg.Match(prn).Success)
             {
                 modelState.AddModelError(
                     "ProfessionalRegistrationNumber",
-                 GetProfessionalRegistrationNumberErrorMessage()
+                    "Invalid professional registration number format - Only alphanumeric characters (a-z, A-Z and 0-9) and hyphens (-) allowed"
                 );
             }
         }
-        public static string GetProfessionalRegistrationNumberErrorMessage()
-        {
-            return @"The format you entered isn’t recognised. Please check and try again.
-            <br>Valid formats include:
-            <ul>
-                <li>7 digits - example, 1234567</li>
-                <li>1–2 letters followed by 6 digits - example, AB123456</li>
-                <li>‘P’ followed by 5–6 digits - example, P12345, P123456</li>
-                <li>‘C’ or ‘P’ followed by 6 digits - example, C123456, P123456</li>
-                <li>Optional letter followed by 5–6 digits - example, A12345, B123456</li>
-                <li>‘L’ followed by 4–6 digits - example, L1234, L123456</li>
-                <li>2 digits, hyphen, then 4–5 alphanumeric characters - example, 12-AB123</li>
-            </ul>";
-        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml b/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>
diff --git a/DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml b/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>
 
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_EditRegistrationNumber.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_EditRegistrationNumber.cshtml
@@ -17,11 +17,6 @@
 
   var subject = Model.IsSelfRegistrationOrEdit ? "you" : "they";
   var capitalisedSubject = Model.IsSelfRegistrationOrEdit ? "You" : "They";
-    var professionalRegistrationNumberError = ViewData.ModelState["ProfessionalRegistrationNumber"]?.Errors.FirstOrDefault()?.ErrorMessage;
-    if (ViewData.ModelState.ContainsKey("ProfessionalRegistrationNumber"))
-    {
-        ViewData.ModelState["ProfessionalRegistrationNumber"].Errors.Clear();
-    }
 }
 
 <input type="hidden" asp-for="IsSelfRegistrationOrEdit" />
@@ -58,7 +53,7 @@
           No
         </label>
       </div>
-           
+
       <div class="nhsuk-radios__item">
         <input name="@nameof(Model.HasProfessionalRegistrationNumber)"
                class="nhsuk-radios__input"
@@ -71,16 +66,9 @@
           Yes
         </label>
       </div>
-      <div class="nhsuk-radios__conditional"
+      <div class="nhsuk-radios__conditional @(optionYesSelected ? " " : " nhsuk-radios__conditional--hidden") @(professionalRegNumberErrorHasOccurred ? "form-group-wrapper--error" : "" )"
            id="@professionalRegConditionalId">
-                @if (professionalRegistrationNumberError != null)
-                {
-                    <span class="nhsuk-error-message" id="ProfessionalRegistrationNumber-error">
-                        <span class="nhsuk-u-visually-hidden">Error:</span>
-                        @Html.Raw(professionalRegistrationNumberError)
-                    </span>
-                }
-                      <vc:text-input asp-for="@nameof(Model.ProfessionalRegistrationNumber)"
+        <vc:text-input asp-for="@nameof(Model.ProfessionalRegistrationNumber)"
                        label="Professional Registration Number"
                        populate-with-current-value="true"
                        type="text"
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_ProfessionalRegistrationNumberError.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_ProfessionalRegistrationNumberError.cshtml
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EditDelegate/Index.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EditDelegate/Index.cshtml
@@ -15,10 +15,7 @@
   <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[] {
+      <vc:error-summary order-of-property-names="@(new[] {
                                                    nameof(Model.FirstName),
                                                    nameof(Model.LastName),
                                                    nameof(Model.CentreSpecificEmail),
@@ -31,11 +28,6 @@
                                                    nameof(Model.Answer4),
                                                    nameof(Model.Answer5),
                                                    nameof(Model.Answer6) })" />
-            }
-            if (professionalRegistrationNumberError != null)
-            {
-                <partial name="_ProfessionalRegistrationNumberError" model=@(professionalRegistrationNumberError.ErrorMessage) />
-            }
     }
 
     <h1 class="nhsuk-heading-xl">Edit delegate details</h1>

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public void LearnerInformationPost_updates_tempdata_correctly()`
`176`	`176`	`const string answer4 = "answer4";`
`177`	`177`	`const string answer5 = "answer5";`
`178`	`178`	`const string answer6 = "answer6";`
`179`		`- const string professionalRegistrationNumber = "PR123456";`
	`179`	`+ const string professionalRegistrationNumber = "PRN1234";`
`180`	`180`	`var model = new LearnerInformationViewModel`
`181`	`181`	`{`
`182`	`182`	`JobGroup = jobGroupId,`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public void Index_post_returns_view_with_model_error_with_invalid_prn()`
`175`	`175`	`result.As<ViewResult>().Model.Should().BeOfType<EditDelegateViewModel>();`
`176`	`176`	`AssertModelStateErrorIsExpected(`
`177`	`177`	`result,`
`178`		`- ErrorMessagesTestHelper.InvalidFormatError`
	`178`	`+ "Invalid professional registration number format - Only alphanumeric characters (a-z, A-Z and 0-9) and hyphens (-) allowed"`
`179`	`179`	`);`
`180`	`180`	`A.CallTo(() => userService.GetDelegateById(A<int>._)).MustNotHaveHappened();`
`181`	`181`	`}`