Skip to content

TD- 4624 addregexvalidationofprofessionalregistrationnumberfieldthroughouttheapplication #3393

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 1 commit into from
Oct 16, 2025
Merged

TD- 4624 addregexvalidationofprofessionalregistrationnumberfieldthroughouttheapplication #3393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,15 @@
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>
Expand Down
34 changes: 22 additions & 12 deletions DigitalLearningSolutions.Web/Views/Register/LearnerInformation.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,28 @@
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred)
{
<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) })" />
}
{

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) />

}
}

<h1 class="nhsuk-heading-xl">Learner information</h1>

Expand Down
17 changes: 17 additions & 0 deletions DigitalLearningSolutions.Web/Views/Shared/_ProfessionalRegistrationNumberError.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@model string
@{

}
<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(Model)
</span>
</span>
</div>
</div>
14 changes: 1 addition & 13 deletions DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EditDelegate/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,7 @@
}
if (professionalRegistrationNumberError != null)
{
<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>
<partial name="_ProfessionalRegistrationNumberError" model=@(professionalRegistrationNumberError.ErrorMessage) />
}
}

Expand Down
Loading