diff --git a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs index 795773ca..2ffc17e1 100644 --- a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs @@ -177,6 +177,7 @@ public async Task Index(string returnUrl) PrimarySpecialtyId = userEmployment.SpecialtyId.HasValue ? userEmployment.SpecialtyId.ToString() : null, RegistrationNumber = userEmployment.MedicalCouncilNo, StartDate = userEmployment.StartDate.HasValue ? userEmployment.StartDate.Value.DateTime : null, + LocationId = userEmployment.LocationId.ToString(), }; await this.multiPageFormService.SetMultiPageFormData( diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss index 8e5fb3dd..8e7b9a5b 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss @@ -121,16 +121,6 @@ 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); diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml index 00e95c14..4b4f535b 100644 --- a/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml @@ -8,27 +8,7 @@ @if (Model.ShowMyAccount) { -
- - - - - - - - - - - - @if (Model.NotificationCount > 0) - { -
@NotificationDisplay()
- - } - - -
} @if (Model.ShowSignOut) { @@ -39,23 +19,4 @@ Help } *@ - -@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 + \ No newline at end of file