From cf4f7bd420aa85b62922e51a3b1b75f4719b2750 Mon Sep 17 00:00:00 2001 From: Arunima George Date: Wed, 10 Sep 2025 15:16:23 +0100 Subject: [PATCH 1/2] TD-6138: Fixed issues on security tab on my account and added user icon. --- .../Controllers/LoginWizardController.cs | 6 +-- .../Controllers/MyAccountController.cs | 7 +--- .../Styles/nhsuk/layout.scss | 14 ++++++- .../Styles/nhsuk/nhsuk-overrides.scss | 8 ++-- .../Views/MyAccount/ChangePassword.cshtml | 2 +- .../Views/MyAccount/ConfirmPassword.cshtml | 2 +- .../MyAccountSecurityQuestionsDetails.cshtml | 2 +- .../Components/NavigationItems/Topnav.cshtml | 39 +++++++++++++++++++ 8 files changed, 60 insertions(+), 20 deletions(-) diff --git a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs index ab0d07dce..8f1b57a96 100644 --- a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs @@ -616,13 +616,9 @@ public async Task UpdateSecurityQuestionPost(MyAcountSecurityQues this.ModelState.AddModelError("DuplicateQuestion", CommonValidationErrorMessages.DuplicateQuestion); } - if (model.SelectedFirstQuestionId > 0 && string.IsNullOrEmpty(model.SecurityFirstQuestionAnswerHash)) + if ((model.SelectedFirstQuestionId > 0 && string.IsNullOrEmpty(model.SecurityFirstQuestionAnswerHash)) || (model.SelectedSecondQuestionId > 0 && string.IsNullOrEmpty(model.SecuritySecondQuestionAnswerHash))) { this.ModelState.AddModelError(nameof(model.SecurityFirstQuestionAnswerHash), CommonValidationErrorMessages.InvalidSecurityQuestionAnswer); - } - - if (model.SelectedSecondQuestionId > 0 && string.IsNullOrEmpty(model.SecuritySecondQuestionAnswerHash)) - { this.ModelState.AddModelError(nameof(model.SecuritySecondQuestionAnswerHash), CommonValidationErrorMessages.InvalidSecurityQuestionAnswer); } diff --git a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs index c4f549012..ac3adc567 100644 --- a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs @@ -366,14 +366,9 @@ public async Task MyAccountSecurityQuestionsDetails([FromQuery] M return this.View("MyAccountSecurityQuestionsDetails", securityViewModel); } - if (viewModel.SelectedFirstQuestionId > 0 && string.IsNullOrEmpty(viewModel.SecurityFirstQuestionAnswerHash)) + if ((viewModel.SelectedFirstQuestionId > 0 && string.IsNullOrEmpty(viewModel.SecurityFirstQuestionAnswerHash)) || (viewModel.SelectedSecondQuestionId > 0 && string.IsNullOrEmpty(viewModel.SecuritySecondQuestionAnswerHash))) { this.ModelState.AddModelError(nameof(viewModel.SecurityFirstQuestionAnswerHash), CommonValidationErrorMessages.InvalidSecurityQuestionAnswer); - return this.View("MyAccountSecurityQuestionsDetails", securityViewModel); - } - - if (viewModel.SelectedSecondQuestionId > 0 && string.IsNullOrEmpty(viewModel.SecuritySecondQuestionAnswerHash)) - { this.ModelState.AddModelError(nameof(viewModel.SecuritySecondQuestionAnswerHash), CommonValidationErrorMessages.InvalidSecurityQuestionAnswer); return this.View("MyAccountSecurityQuestionsDetails", securityViewModel); } diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss index 196c1e44f..316807252 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss @@ -96,10 +96,20 @@ body { gap: px2rem(24); } +.nhsuk-account__myaccount { + float: right; + position: relative; + z-index: 2; + display: flex; + justify-content: space-between; + align-items: center; + gap: px2rem(8); +} + .nhsuk-header__notification-dot { position: absolute; - top: px2rem(8); - right: px2rem(-10); + top: px2rem(-8); + right: px2rem(86); font-size: px2rem(11); line-height: px2rem(18); font-weight: 900; diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/nhsuk-overrides.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/nhsuk-overrides.scss index 22c319751..f98023fe7 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/nhsuk-overrides.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/nhsuk-overrides.scss @@ -239,8 +239,8 @@ form label.nhsuk-u-visually-hidden { .nhsuk-header__notification-dot { position: absolute; - top: px2rem(8); - right: px2rem(-10); + top: px2rem(-8); + right: px2rem(76); font-size: px2rem(11); line-height: px2rem(18); font-weight: 900; @@ -453,8 +453,8 @@ form label.nhsuk-u-visually-hidden { .nhsuk-header__notification-dot { position: absolute; - top: px2rem(15); - left: px2rem(115); + top: px2rem(-8); + left: px2rem(16); font-size: px2rem(11); line-height: px2rem(18); font-weight: 900; diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePassword.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePassword.cshtml index d68e84bc6..0402064d9 100644 --- a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePassword.cshtml +++ b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangePassword.cshtml @@ -7,7 +7,7 @@ }
- +
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/ConfirmPassword.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/ConfirmPassword.cshtml index 888bafb55..cf34857c9 100644 --- a/LearningHub.Nhs.WebUI/Views/MyAccount/ConfirmPassword.cshtml +++ b/LearningHub.Nhs.WebUI/Views/MyAccount/ConfirmPassword.cshtml @@ -8,7 +8,7 @@
- +
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/MyAccountSecurityQuestionsDetails.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/MyAccountSecurityQuestionsDetails.cshtml index e470e3c20..6fdcb5605 100644 --- a/LearningHub.Nhs.WebUI/Views/MyAccount/MyAccountSecurityQuestionsDetails.cshtml +++ b/LearningHub.Nhs.WebUI/Views/MyAccount/MyAccountSecurityQuestionsDetails.cshtml @@ -8,7 +8,7 @@
- + diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml index fae78987b..00e95c14d 100644 --- a/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml @@ -8,7 +8,27 @@ @if (Model.ShowMyAccount) { + } @if (Model.ShowSignOut) { @@ -20,3 +40,22 @@ } *@ +@functions { + public string NotificationDisplay() + { + if (Model.NotificationCount < 1) + { + return ""; + } + + var returnString = Model.NotificationCount.ToString(); + + if (Model.NotificationCount > 9) + { + returnString = "9+"; + } + + return returnString; + + } +} \ No newline at end of file From 1182f3fcd7e476ce50940cd11c379fa130d4f76c Mon Sep 17 00:00:00 2001 From: Arunima George Date: Wed, 10 Sep 2025 15:20:30 +0100 Subject: [PATCH 2/2] TD-6138: updated styles. --- LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss index 316807252..4efe8d08c 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss @@ -108,8 +108,8 @@ body { .nhsuk-header__notification-dot { position: absolute; - top: px2rem(-8); - right: px2rem(86); + top: px2rem(8); + right: px2rem(-10); font-size: px2rem(11); line-height: px2rem(18); font-weight: 900;