Skip to content

TD-6182: Fixed issues with preloading place of work details and removed user icon. #1413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2025
+2 −50
Merged

TD-6182: Fixed issues with preloading place of work details and removed user icon. #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public async Task<IActionResult> 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(
Expand Down
10 changes: 0 additions & 10 deletions LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
41 changes: 1 addition & 40 deletions LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,7 @@
<!-- start Topnav -->
@if (Model.ShowMyAccount)
{
<div class="nhsuk-account__myaccount">
<svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 26 26" fill="none">
<g clip-path="url(#clip0_5102_1890)">
<path d="M12.9984 14.7859C10.4797 14.7859 8.36719 12.7547 8.36719 10.1547C8.36719 7.55469 10.3984 5.52344 12.9984 5.52344C15.5172 5.52344 17.6297 7.55469 17.6297 10.1547C17.6297 12.7547 15.5172 14.7859 12.9984 14.7859Z" fill="white" />
<path d="M13 0C5.85 0 0 5.85 0 13C0 20.15 5.85 26 13 26C20.15 26 26 20.15 26 13C26 5.85 20.15 0 13 0ZM19.5813 22.3438V21.125C19.5813 18.2812 17.55 16.0063 14.95 16.0063H11.05C8.53125 15.925 6.5 18.2812 6.5 21.125V22.425C1.3 18.7688 0 11.6188 3.65625 6.5C7.3125 1.38125 14.3812 0 19.5 3.65625C24.6187 7.3125 26 14.3812 22.3438 19.5C21.6125 20.6375 20.6375 21.6125 19.5813 22.3438Z" fill="white" />
</g>
<defs>
<clipPath id="clip0_5102_1890">
<rect width="26" height="26" fill="white" />
</clipPath>
</defs>
</svg>
@if (Model.NotificationCount > 0)
{
<div class="nhsuk-header__notification-dot">@NotificationDisplay()</div>

}


<a class="nhsuk-account__login--link" asp-controller="Myaccount" asp-action="Index">My account</a>
</div>
}
@if (Model.ShowSignOut)
{
Expand All @@ -39,23 +19,4 @@
<a class="nhsuk-account__login--link" href="@(settings.Value.SupportUrls.SupportSite)" target="_blank">Help</a>
} *@

<!-- end Topnav -->
@functions {
public string NotificationDisplay()
{
if (Model.NotificationCount < 1)
{
return "";
}

var returnString = Model.NotificationCount.ToString();

if (Model.NotificationCount > 9)
{
returnString = "9+";
}

return returnString;

}
}
<!-- end Topnav -->
Loading