Skip to content

Commit a76d552

Browse files
AnjuJose011AnjuJose011
authored
Merge pull request #1467 from TechnologyEnhancedLearning/Develop/Fixes/Notification-Count
Corrected the completed date for the Moodle course
2 parents 7955405 + f7f95ea commit a76d552

File tree

4 files changed

+45
-26
lines changed

4 files changed

+45
-26
lines changed

‎LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,18 @@
140140
<span class="nhsuk-u-padding-right-2 nhsuk-u-font-size-16 @accessedLabelClass nhsuk-u-font-weight-bold">
141141
@displayText:
142142
</span>
143-
143+
@if(isCompleted)
144+
{
145+
<span class="nhsuk-u-font-size-16 @accessedLabelClass">
146+
@certificateAwardedText
147+
</span>
148+
}
149+
else
150+
{
144151
<span class="nhsuk-u-font-size-16 @accessedLabelClass">
145152
@dateTimeText
146153
</span>
154+
}
147155
</div>
148156
<div>
149157
<span class="nhsuk-u-text-align-left table-content-spacing">

‎LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,18 @@
208208
<span class="nhsuk-u-padding-right-2 nhsuk-u-font-size-16 @accessedLabelClass nhsuk-u-font-weight-bold">
209209
@displayText:
210210
</span>
211-
211+
@if(isCompleted)
212+
{
213+
<span class="nhsuk-u-font-size-16 @accessedLabelClass">
214+
@certificateAwardedText
215+
</span>
216+
}
217+
else
218+
{
212219
<span class="nhsuk-u-font-size-16 @accessedLabelClass">
213220
@dateTimeText
214221
</span>
222+
}
215223
</div>
216224
<div>
217225
<span class="nhsuk-u-text-align-left table-content-spacing">
@@ -255,7 +263,7 @@
255263
</clipPath>
256264
</defs>
257265
</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>
258-
<span class="nhsuk-u-font-size-16">awarded [@dateTimeText]</span>
266+
<span class="nhsuk-u-font-size-16">awarded [@certificateAwardedText]</span>
259267

260268
</div>
261269

‎LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/MobileTopRightNav.cshtml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,19 @@ else
1818
{
1919
<div class="nhsuk-account__myaccount">
2020
<div class="nhsuk-account__icon-wrapper">
21-
<svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 26 26" fill="none">
22-
<g clip-path="url(#clip0_5102_1890)">
23-
<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" />
24-
<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" />
25-
</g>
26-
<defs>
27-
<clipPath id="clip0_5102_1890">
28-
<rect width="26" height="26" fill="white" />
29-
</clipPath>
30-
</defs>
31-
</svg>
32-
21+
<a asp-controller="Notification" asp-action="Index">
22+
<svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 26 26" fill="none">
23+
<g clip-path="url(#clip0_5102_1890)">
24+
<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" />
25+
<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" />
26+
</g>
27+
<defs>
28+
<clipPath id="clip0_5102_1890">
29+
<rect width="26" height="26" fill="white" />
30+
</clipPath>
31+
</defs>
32+
</svg>
33+
</a>
3334
@if (Model.NotificationCount > 0)
3435
{
3536
<div class="nhsuk-header__notification-dot-mobile">@NotificationDisplay()</div>

‎LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/Topnav.cshtml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@
99
@if (Model.ShowMyAccount)
1010
{
1111
<div class="nhsuk-account__myaccount">
12-
<svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 26 26" fill="none">
13-
<g clip-path="url(#clip0_5102_1890)">
14-
<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" />
15-
<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" />
16-
</g>
17-
<defs>
18-
<clipPath id="clip0_5102_1890">
19-
<rect width="26" height="26" fill="white" />
20-
</clipPath>
21-
</defs>
22-
</svg>
12+
<a asp-controller="Notification" asp-action="Index">
13+
<svg xmlns="http://www.w3.org/2000/svg" width="26" height="26" viewBox="0 0 26 26" fill="none">
14+
<g clip-path="url(#clip0_5102_1890)">
15+
<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" />
16+
<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" />
17+
</g>
18+
<defs>
19+
<clipPath id="clip0_5102_1890">
20+
<rect width="26" height="26" fill="white" />
21+
</clipPath>
22+
</defs>
23+
</svg>
24+
</a>
2325
@if (Model.NotificationCount > 0)
2426
{
2527
<div class="nhsuk-header__notification-dot">@NotificationDisplay()</div>

0 commit comments

Comments
 (0)