Skip to content

Commit 856d2a1

Browse files
OluwatobiAweOluwatobiAwe
committed
merged
2 parents 6996fc8 + dfd492d commit 856d2a1

File tree

45 files changed

+293
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+293
-143
lines changed

‎AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
9090
<PackageReference Include="IdentityModel" Version="4.6.0" />
9191
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
92-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
92+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
9393
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
9494
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
9595
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />

‎LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
1515
<PackageReference Include="FluentAssertions" Version="6.12.0" />
16-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
16+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
1717
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
1919
<PackageReference Include="Selenium.Axe" Version="4.0.19" />

‎LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,15 @@ public async Task<IActionResult> Index(MyLearningUserActivitiesViewModel learnin
139139
if (myLearningDashboard == "my-in-progress")
140140
{
141141
myLearningRequestModel.Incomplete = true;
142-
myLearningRequestModel.Failed = true;
143142
}
144143
else if (myLearningDashboard == "my-recent-completed")
145144
{
146145
myLearningRequestModel.Complete = true;
147-
myLearningRequestModel.Passed = true;
148-
myLearningRequestModel.Downloaded = true;
149146
}
150147
else if (myLearningDashboard == "my-certificates")
151148
{
152149
myLearningRequestModel.CertificateEnabled = true;
153150
myLearningRequestModel.Complete = true;
154-
myLearningRequestModel.Passed = true;
155-
myLearningRequestModel.Downloaded = true;
156151
}
157152
}
158153

@@ -291,20 +286,15 @@ public async Task<IActionResult> LearningHistory(MyLearningUserActivitiesViewMod
291286
if (myLearningDashboard == "my-in-progress")
292287
{
293288
myLearningRequestModel.Incomplete = true;
294-
myLearningRequestModel.Failed = true;
295289
}
296290
else if (myLearningDashboard == "my-recent-completed")
297291
{
298292
myLearningRequestModel.Complete = true;
299-
myLearningRequestModel.Passed = true;
300-
myLearningRequestModel.Downloaded = true;
301293
}
302294
else if (myLearningDashboard == "my-certificates")
303295
{
304296
myLearningRequestModel.CertificateEnabled = true;
305297
myLearningRequestModel.Complete = true;
306-
myLearningRequestModel.Passed = true;
307-
myLearningRequestModel.Downloaded = true;
308298
}
309299
}
310300

‎LearningHub.Nhs.WebUI/Helpers/UtilityHelper.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ public static string GetPrettifiedResourceTypeName(ResourceTypeEnum resourceType
143143
return "Case";
144144
case ResourceTypeEnum.Html:
145145
return "HTML";
146+
case ResourceTypeEnum.Moodle:
147+
return "Course";
146148
default:
147149
return "File";
148150
}

‎LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{
33
using System;
44
using System.Collections.Generic;
5+
using System.Diagnostics;
56
using System.Linq;
67
using LearningHub.Nhs.Models.Enums;
78
using LearningHub.Nhs.Models.MyLearning;
@@ -400,6 +401,21 @@ public static bool CanViewProgress(this ActivityDetailedItemViewModel activityDe
400401
return false;
401402
}
402403

404+
/// <summary>
405+
/// CanView Video Progress.
406+
/// </summary>
407+
/// <param name="activitiesViewModel">The MyLearningCombinedActivitiesViewModel.</param>
408+
/// <returns>The <see cref="bool"/>bool.</returns>
409+
public static bool CanViewVidoProgress(this MyLearningCombinedActivitiesViewModel activitiesViewModel)
410+
{
411+
if ((activitiesViewModel.ResourceType == ResourceTypeEnum.Video || activitiesViewModel.ResourceType == ResourceTypeEnum.Audio) && activitiesViewModel.ActivityStatus == ActivityStatusEnum.Incomplete && activitiesViewModel.IsCurrentResourceVersion && activitiesViewModel.IsMostRecent)
412+
{
413+
return true;
414+
}
415+
416+
return false;
417+
}
418+
403419
/// <summary>
404420
/// GetDurationText.
405421
/// </summary>

‎LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
114114
<PackageReference Include="IdentityModel" Version="4.6.0" />
115115
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
116-
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
116+
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
117117
<PackageReference Include="linqtotwitter" Version="6.9.0" />
118118
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
119119
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />

‎LearningHub.Nhs.WebUI/Styles/nhsuk/pages/dashboard.scss‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
}
4949

5050
.course-card {
51-
border: 1px solid #1C366A;
52-
border-radius: 8px;
53-
box-shadow: 2px 2px 0 #1C366A;
51+
border: 1px solid #d8dde0;
52+
border-radius: 8px;
53+
box-shadow: 5px 5px 0 #1C366A;
5454
}
5555

5656
.dashboard-card-content {
@@ -201,21 +201,21 @@ div.bmj-best-practice-logo-image {
201201
font-family: sans-serif;
202202
}
203203
.filteractive {
204-
color: $nhsuk-blue;
205-
border-color: #0b63ce;
204+
color: $nhsuk-blue !important;
205+
border-color: #376cac;
206206
background-color: $nhsuk-pale-blue-color;
207207
}
208208

209209
.filterinactive {
210-
color: #6e6e6e;
211-
border-color: #c2c2c2;
212-
background-color: #f1f1f1;
213-
opacity: 0.7;
210+
color: #d8dde0;
211+
border-color: #d8dde0;
212+
background-color: $nhsuk-white;
213+
opacity: 0.7;
214214
}
215215

216216
filterfocus {
217217
color: black;
218-
background-color: #ffeb3b;
218+
background-color: #ffb81c;
219219
border-color: #212b32;
220220
}
221221
.dashboard-paging {

‎LearningHub.Nhs.WebUI/Views/Home/_MyAccessedLearningTray.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
case "in-progress":
1010
return "In Progress";
1111
case "my-recent-completed":
12-
return "Recently Completed";
12+
return "Recently completed";
1313
case "my-certificates":
1414
return "Certificates";
1515
case "my-catalogues":
@@ -55,7 +55,7 @@
5555
</li>
5656
<li class="subnavwhite-item nhsuk-bg-grey @(Model.MyLearnings.Type == "my-recent-completed" ? "active" : string.Empty)">
5757
<a tabindex="0" class="subnavwhite-link text-nowrap"
58-
asp-controller="Home" asp-action="Index" asp-route-myLearningDashboard="my-recent-completed" asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning">Recently Completed</a>
58+
asp-controller="Home" asp-action="Index" asp-route-myLearningDashboard="my-recent-completed" asp-route-resourceDashboard="@(Model.Resources.Type)" asp-route-catalogueDashboard="@Model.Catalogues.Type" asp-fragment="my-learning">Recently completed</a>
5959
</li>
6060
<li class="subnavwhite-item nhsuk-bg-grey @(Model.MyLearnings.Type == "my-certificates" ? "active" : string.Empty)">
6161
<a tabindex="0" class="subnavwhite-link text-nowrap"

0 commit comments

Comments
 (0)