Merge pull request #2103 from TechnologyEnhancedLearning/Develop/Fixes/TD-2285_Areas_missing_validations_on_the_fields_across_the_DLS_application

TD-2285 Added validations in "Edit centre details","Edit centre manager","Edit details","Edit user details" and "Edit delegate details" pages

Author: rshrirohit

DigitalLearningSolutions.Web/Helpers/PromptsService.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Text.RegularExpressions;
     using DigitalLearningSolutions.Data.Models.CustomPrompts;
     using DigitalLearningSolutions.Data.Models.User;
     using DigitalLearningSolutions.Data.Utilities;
@@ -247,6 +248,15 @@ ModelStateDictionary modelState
                     var errorMessage = $"{delegateRegistrationPrompt.Prompt} must be at most 100 characters";
                     modelState.AddModelError("Answer" + delegateRegistrationPrompt.PromptNumber, errorMessage);
                 }
+                if (delegateRegistrationPrompt.Prompt?.ToLower().Contains("telephone") ?? false)
+                {
+                    Regex regex = new Regex(@"^\w{4}\d{6,7}$");
+                    if (!string.IsNullOrEmpty(delegateRegistrationPrompt.Answer) && !regex.IsMatch(delegateRegistrationPrompt.Answer))
+                    {
+                        var errorMessage = $"{delegateRegistrationPrompt.Prompt} must be in correct format";
+                        modelState.AddModelError("Answer" + delegateRegistrationPrompt.PromptNumber, errorMessage);
+                    }
+                }
             }
         }
 

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

@@ -32,6 +32,8 @@ public EditCentreDetailsSuperAdminViewModel(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? CentreEmail { get; set; }
+
+        [RegularExpression(@"[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", ErrorMessage = "Enter an Ip in the correct format.")]
         public string? IpPrefix { get; set; }
         public bool ShowOnMap { get; set; }
     }

DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Users/EditUserDetailsViewModel.cs

@@ -23,9 +23,11 @@ public EditUserDetailsViewModel(UserAccount userAccount)
         public int Id { get; set; }
 
         [Required(ErrorMessage = "Enter a first name")]
+        [MaxLength(250, ErrorMessage = CommonValidationErrorMessages.TooLongFirstName)]
         public string FirstName { get; set; }
 
         [Required(ErrorMessage = "Enter a last name")]
+        [MaxLength(250, ErrorMessage = CommonValidationErrorMessages.TooLongLastName)]
         public string LastName { get; set; }
 
         public int JobGroupId { get; set; }

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

@@ -3,6 +3,7 @@ namespace DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Configur
     using System.ComponentModel.DataAnnotations;
     using DigitalLearningSolutions.Data.Models.Centres;
     using DigitalLearningSolutions.Web.Attributes;
+    using DigitalLearningSolutions.Web.Helpers;
 
     public class EditCentreManagerDetailsViewModel
     {
@@ -20,11 +21,11 @@ public EditCentreManagerDetailsViewModel(Centre centre)
         public int CentreId { get; set; }
 
         [Required(ErrorMessage = "Enter a first name")]
-        [MaxLength(250, ErrorMessage = "First name must be 250 characters or fewer")]
+        [MaxLength(250, ErrorMessage = CommonValidationErrorMessages.TooLongFirstName)]
         public string? FirstName { get; set; }
 
         [Required(ErrorMessage = "Enter a last name")]
-        [MaxLength(250, ErrorMessage = "Last name must be 250 characters or fewer")]
+        [MaxLength(250, ErrorMessage = CommonValidationErrorMessages.TooLongLastName)]
         public string? LastName { get; set; }
 
         [Required(ErrorMessage = "Enter an email")]
@@ -34,6 +35,7 @@ public EditCentreManagerDetailsViewModel(Centre centre)
         public string? Email { get; set; }
 
         [MaxLength(250, ErrorMessage = "Telephone number must be 250 characters or fewer")]
+        [RegularExpression(@"[0-9 ]+", ErrorMessage = "Enter a Telephone number in the correct format.")]
         public string? Telephone { get; set; }
     }
 }