Merge pull request #2548 from TechnologyEnhancedLearning/Develop/Fixes/TD-3321-CorrectingRegexForPhoneNumbers

TD-3321 Correcting regex for phone numbers

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/SuperAdmin/Centres/CentresController.cs

@@ -304,6 +304,7 @@ public IActionResult ManageCentreManager(EditCentreManagerDetailsViewModel editC
         {
             editCentreManagerDetailsViewModel.FirstName = editCentreManagerDetailsViewModel.FirstName == null ? string.Empty : editCentreManagerDetailsViewModel.FirstName.Trim();
             editCentreManagerDetailsViewModel.LastName = editCentreManagerDetailsViewModel.LastName == null ? string.Empty : editCentreManagerDetailsViewModel.LastName.Trim();
+            editCentreManagerDetailsViewModel.Telephone = editCentreManagerDetailsViewModel.Telephone?.Trim() ?? string.Empty;
             if (!ModelState.IsValid)
             {
                 return View(editCentreManagerDetailsViewModel);

DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Centres/AddCentreSuperAdminViewModel.cs

@@ -59,7 +59,7 @@ public AddCentreSuperAdminViewModel(Centre centre)
         [EmailAddress(ErrorMessage = "Enter an email in the correct format, like [email protected]")]
         [NoWhitespace(ErrorMessage = "Email must not contain any whitespace characters")]
         public string? ContactEmail { get; set; }
-        [RegularExpression(@"^(?:\d\s*?){10,11}$", ErrorMessage = "Enter a Telephone number in the correct format.")]
+        [RegularExpression(@"^\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*(\d\s*)?\s*$", ErrorMessage = "Enter a Telephone number in the correct format.")]
         public string? ContactPhone { get; set; }
 
         [MaxLength(250, ErrorMessage = "Email must be 250 characters or fewer")]

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Configuration/EditCentreManagerDetailsViewModel.cs

@@ -31,7 +31,7 @@ public EditCentreManagerDetailsViewModel(Centre centre)
         [NoWhitespace(ErrorMessage = "Email must not contain any whitespace characters")]
         public string? Email { get; set; }
 
-        [RegularExpression(@"^(?:\d\s*?){10,11}$", ErrorMessage = "Enter a Telephone number in the correct format.")]
+        [RegularExpression(@"^\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*\d\s*(\d\s*)?\s*$", ErrorMessage = "Enter a Telephone number in the correct format.")]
         public string? Telephone { get; set; }
     }
 }