Skip to content

Corrected the completed date for the Moodle course #1467

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
Parent: Merge RC changes into CI
merged 3 commits into from
Oct 6, 2025
Merged

Corrected the completed date for the Moodle course #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
901bed9
Corrected the completed date for the oodle course
swapnamol-abraham Oct 6, 2025
838ccd1
Notification menu redirection
swapnamol-abraham Oct 6, 2025
f7f95ea
Corrected the spacing
swapnamol-abraham Oct 6, 2025
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
10 changes: 9 additions & 1 deletion LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,18 @@
<span class="nhsuk-u-padding-right-2 nhsuk-u-font-size-16 @accessedLabelClass nhsuk-u-font-weight-bold">
@displayText:
</span>

@if(isCompleted)
{
<span class="nhsuk-u-font-size-16 @accessedLabelClass">
@certificateAwardedText
</span>
}
else
{
<span class="nhsuk-u-font-size-16 @accessedLabelClass">
@dateTimeText
</span>
}
</div>
<div>
<span class="nhsuk-u-text-align-left table-content-spacing">
Expand Down
12 changes: 10 additions & 2 deletions LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,18 @@
<span class="nhsuk-u-padding-right-2 nhsuk-u-font-size-16 @accessedLabelClass nhsuk-u-font-weight-bold">
@displayText:
</span>

@if(isCompleted)
{
<span class="nhsuk-u-font-size-16 @accessedLabelClass">
@certificateAwardedText
</span>
}
else
{
<span class="nhsuk-u-font-size-16 @accessedLabelClass">
@dateTimeText
</span>
}
</div>
<div>
<span class="nhsuk-u-text-align-left table-content-spacing">
Expand Down Expand Up @@ -255,7 +263,7 @@
</clipPath>
</defs>
</svg> <span class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold nhsuk-u-padding-right-2 nhsuk-u-padding-left-1">Certificate:</span>
<span class="nhsuk-u-font-size-16">awarded [@dateTimeText]</span>
<span class="nhsuk-u-font-size-16">awarded [@certificateAwardedText]</span>

</div>

Expand Down
25 changes: 13 additions & 12 deletions LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/MobileTopRightNav.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ else
{
<div class="nhsuk-account__myaccount">
<div class="nhsuk-account__icon-wrapper">
<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>

<a asp-controller="Notification" asp-action="Index">
<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>
</a>
@if (Model.NotificationCount > 0)
{
<div class="nhsuk-header__notification-dot-mobile">@NotificationDisplay()</div>
Expand Down
24 changes: 13 additions & 11 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 @@ -9,17 +9,19 @@
@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>
<a asp-controller="Notification" asp-action="Index">
<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>
</a>
@if (Model.NotificationCount > 0)
{
<div class="nhsuk-header__notification-dot">@NotificationDisplay()</div>
Expand Down
Loading