TD-5761: merging latest changes

Author: ArunimaGeorge

LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs

@@ -229,5 +229,30 @@ public static class CommonValidationErrorMessages
         /// Message if the validation token expired.
         /// </summary>
         public const string EmailChangeValidationTokenInvalidMessage = "We cannot find the page you are looking for";
+
+        /// <summary>
+        /// Message if the validation token expired.
+        /// </summary>
+        public const string InvalidSecurityQuestionAnswer = "Enter an answer";
+
+        /// <summary>
+        /// Message if the validation token expired.
+        /// </summary>
+        public const string EmploymentDetailsUpdated = "Your employment details has been changed";
+
+        /// <summary>
+        /// security question Success Message.
+        /// </summary>
+        public const string SecurityQuestionSuccessMessage = "Your security questions has been changed";
+
+        /// <summary>
+        /// location Success Message.
+        /// </summary>
+        public const string LocationDetailsSuccessMessage = "Your location details has been changed";
+
+        /// <summary>
+        /// location Success Message.
+        /// </summary>
+        public const string PersonalDetailsSuccessMessage = "Your personal details has been changed";
     }
 }

LearningHub.Nhs.WebUI/Helpers/CommonValidationErrorMessages.cs

@@ -20,5 +20,16 @@ public static IEnumerable<SelectListItem> MapOptionsToSelectListItems(IEnumerabl
         {
             return options.Select(o => new SelectListItem(o.Name, o.Id.ToString(), o.Id == selectedId)).ToList();
         }
+
+        /// <summary>
+        /// MapSelectListWithSelection.
+        /// </summary>
+        /// <param name="options">options.</param>
+        /// <param name="selectedId">selectedId.</param>
+        /// <returns>SelectListItem.</returns>
+        public static IEnumerable<SelectListItem> MapSelectListWithSelection(IEnumerable<SelectListItem> options, string selectedId = null)
+        {
+            return options.Select(o => new SelectListItem(o.Text, o.Value, o.Value == selectedId)).ToList();
+        }
     }
 }

LearningHub.Nhs.WebUI/Helpers/SelectListHelper.cs

@@ -28,7 +28,7 @@ public static IEnumerable<SideNavigationGroup> GetGroupedMenus()
                         Text = "Personal details",
                         Controller = "MyAccount",
                         Action = "Index",
-                        IsActive = route => MatchRoute(route, "MyAccount", "PersonalDetails"),
+                        IsActive = route => MatchRoute(route, "MyAccount", "Index"),
                     },
                     new SideNavigationItem
                     {

LearningHub.Nhs.WebUI/Models/SideMenu/SideNavigationConfiguration.cs

@@ -2,8 +2,6 @@
 {
     using System.Collections.Generic;
     using System.ComponentModel;
-    using System.ComponentModel.DataAnnotations;
-    using elfhHub.Nhs.Models.Common;
     using Microsoft.AspNetCore.Mvc.Rendering;
     using NHSUKViewComponents.Web.ViewModels;
 
@@ -15,14 +13,12 @@ public class MyAccountLocationViewModel
         /// <summary>
         /// Gets or sets the country id.
         /// </summary>
-        [Required(ErrorMessage = "Select a country.")]
         [DisplayName("Country")]
         public int? SelectedCountryId { get; set; }
 
         /// <summary>
         /// Gets or sets the region id.
         /// </summary>
-        [Required(ErrorMessage = "Select a region.")]
         [DisplayName("Region")]
         public int? SelectedRegionId { get; set; }
 
@@ -39,14 +35,17 @@ public class MyAccountLocationViewModel
         /// <summary>
         /// Gets or sets the country id.
         /// </summary>
-        ////[Required(ErrorMessage = "Select a country.")]
-        ////[DisplayName("Country")]
         public int? SelectedOtherCountryId { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether SelectedOtherCountry.
         /// </summary>
-        public bool SelectedOtherCountry { get; set; }
+        public bool HasSelectedOtherCountry { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether SelectedRegion.
+        /// </summary>
+        public bool HasSelectedRegion { get; set; }
 
         /// <summary>
         /// Gets or sets the Country.

LearningHub.Nhs.WebUI/Models/UserProfile/MyAccountLocationViewModel.cs

@@ -4,6 +4,7 @@
     using System.ComponentModel.DataAnnotations;
     using LearningHub.Nhs.WebUI.Attributes;
     using LearningHub.Nhs.WebUI.Helpers;
+    using LearningHub.Nhs.WebUI.Validation;
 
     /// <summary>
     /// Defines the <see cref="MyAccountPersonalDetailsViewModel" />.
@@ -60,5 +61,15 @@ public class MyAccountPersonalDetailsViewModel
         /// Gets or sets the new primary email address.
         /// </summary>
         public string NewPrimaryEmailAddress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the SecondaryEmailAddress.
+        /// </summary>
+        [DataType(DataType.EmailAddress)]
+        [NotEqual("PrimaryEmailAddress", ErrorMessage = CommonValidationErrorMessages.SecondaryEmailShouldNotBeSame)]
+        [MaxLength(100, ErrorMessage = CommonValidationErrorMessages.TooLongEmail)]
+        [EmailAddress(ErrorMessage = CommonValidationErrorMessages.InvalidEmail)]
+        [NoWhitespace(ErrorMessage = CommonValidationErrorMessages.WhitespaceInEmail)]
+        public string SecondaryEmailAddress { get; set; }
     }
 }

LearningHub.Nhs.WebUI/Models/UserProfile/MyAccountPersonalDetailsViewModel.cs

@@ -27,10 +27,10 @@ public class MyAccountSecurityViewModel
         /// </summary>
         public string SecuritySecondQuestion { get; set; }
 
-        /// <summary>
-        /// Gets or sets the LastUpdated.
-        /// </summary>
-        public DateTimeOffset LastUpdated { get; set; }
+        /////// <summary>
+        /////// Gets or sets the LastUpdated.
+        /////// </summary>
+        ////public DateTimeOffset LastUpdated { get; set; }
 
         /// <summary>
         /// Gets or sets the PasswordHash.
@@ -40,6 +40,6 @@ public class MyAccountSecurityViewModel
         /// <summary>
         /// Gets or sets the SecurityQuestionLastUpdated.
         /// </summary>
-        public DateTimeOffset? SecurityQuestionLastUpdated { get; set; }
+        public string SecurityQuestionLastUpdated { get; set; }
     }
 }

LearningHub.Nhs.WebUI/Models/UserProfile/MyAccountSecurityViewModel.cs

@@ -0,0 +1,54 @@
+namespace LearningHub.Nhs.WebUI.Models.UserProfile
+{
+    using System.Collections.Generic;
+    using System.ComponentModel.DataAnnotations;
+    using elfhHub.Nhs.Models.Common;
+    using Microsoft.AspNetCore.Mvc.Rendering;
+    using NHSUKViewComponents.Web.ViewModels;
+
+    /// <summary>
+    /// Defines the <see cref="MyAcountSecurityQuestionsViewModel" />.
+    /// </summary>
+    public class MyAcountSecurityQuestionsViewModel
+    {
+        /// <summary>
+        /// Gets or sets selectedQuestion.
+        /// </summary>
+        public int SelectedFirstQuestionId { get; set; }
+
+        /// <summary>
+        /// Gets or sets selectedQuestion.
+        /// </summary>
+        public int SelectedSecondQuestionId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the security question answer hash.
+        /// </summary>
+        public string SecurityFirstQuestionAnswerHash { get; set; }
+
+        /// <summary>
+        /// Gets or sets the security question answer hash.
+        /// </summary>
+        public string SecuritySecondQuestionAnswerHash { get; set; }
+
+        /// <summary>
+        /// Gets or sets the FirstSecurityQuestions.
+        /// </summary>
+        public IEnumerable<SelectListItem> FirstSecurityQuestions { get; set; }
+
+        /// <summary>
+        /// Gets or sets the SecondSecurityQuestions.
+        /// </summary>
+        public IEnumerable<SelectListItem> SecondSecurityQuestions { get; set; }
+
+        /// <summary>
+        /// Gets or sets the UserSecurityFirstQuestionId.
+        /// </summary>
+        public int UserSecurityFirstQuestionId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the UserSecurityFirstQuestionId.
+        /// </summary>
+        public int UserSecuritySecondQuestionId { get; set; }
+    }
+}

LearningHub.Nhs.WebUI/Models/UserProfile/MyAcountSecurityQuestionsViewModel.cs

@@ -36,6 +36,21 @@ public class UserPrimarySpecialtyUpdateViewModel : PagingViewModel
         /// </summary>
         public GenericListViewModel OptionalSpecialtyItem { get; set; }
 
+        /// <summary>
+        /// Gets or sets the selected job role id.
+        /// </summary>
+        public int? SelectedJobRoleId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the selected grade id.
+        /// </summary>
+        public string SelectedGradeId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the selected medical council number.
+        /// </summary>
+        public string SelectedMedicalCouncilNo { get; set; }
+
         /// <summary>
         /// sets the list of radio specialty.
         /// </summary>

LearningHub.Nhs.WebUI/Models/UserProfile/UserPrimarySpecialtyUpdateViewModel.cs

@@ -30,6 +30,16 @@ public class UserStartDateUpdateViewModel : IValidatableObject
         /// </summary>
         public int? Year { get; set; }
 
+        /////// <summary>
+        /////// Gets or sets filter text.
+        /////// </summary>
+        ////public string FilterText { get; set; }
+
+        /// <summary>
+        /// Gets or sets the selected primary specialty id.
+        /// </summary>
+        public int? SelectedPrimarySpecialtyId { get; set; }
+
         /// <summary>
         /// Gets or sets the GetDate.
         /// </summary>