Merge pull request #1433 from TechnologyEnhancedLearning/Develop/Fixes/TD-6243-Introduce-progress-details-for-audio-and-video-resources-on-the-My-Learning-History-Page

TD-6243: Introduce progress details for audio and video resources on …

Author: AnjuJose011

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

@@ -89,7 +89,7 @@
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />

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

@@ -13,7 +13,7 @@
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
 		<PackageReference Include="Selenium.Axe" Version="4.0.19" />

LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics;
     using System.Linq;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.MyLearning;
@@ -405,6 +406,21 @@ public static bool CanViewProgress(this ActivityDetailedItemViewModel activityDe
             return false;
         }
 
+        /// <summary>
+        /// CanView Video Progress.
+        /// </summary>
+        /// <param name="activitiesViewModel">The MyLearningCombinedActivitiesViewModel.</param>
+        /// <returns>The <see cref="bool"/>bool.</returns>
+        public static bool CanViewVidoProgress(this MyLearningCombinedActivitiesViewModel activitiesViewModel)
+        {
+            if ((activitiesViewModel.ResourceType == ResourceTypeEnum.Video || activitiesViewModel.ResourceType == ResourceTypeEnum.Audio) && activitiesViewModel.ActivityStatus == ActivityStatusEnum.Incomplete && activitiesViewModel.IsCurrentResourceVersion && activitiesViewModel.IsMostRecent)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// GetDurationText.
         /// </summary>

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

@@ -113,7 +113,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />

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

@@ -223,6 +223,13 @@
                                         <div class="nhs-progress-bar" style="width: @(activity.ScorePercentage)%"></div>
                                     </div>
                                 }
+                                else @if (ViewActivityHelper.CanViewVidoProgress(activity))
+                                {
+                                    <div class="nhsuk-u-padding-top-1">
+                                        @activity.CompletionPercentage% complete
+                                        <a asp-controller="MyLearning" asp-action="ViewProgress" asp-route-resourceId="@activity.ResourceId" asp-route-version="@activity.MajorVersion" asp-route-maxTime="@activity.ResourceDurationMilliseconds" asp-route-returnUrl="@returnUrl" asp-route-resourceReferenceId="@activity.ResourceReferenceId">View Progress</a>
+                                    </div>
+                                }
 
 
                                 @if (ViewActivityHelper.CanCertificateawarded(activity))

OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj

@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
 	</ItemGroup>
 

OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj

@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
 	</ItemGroup>
 

OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj

@@ -24,7 +24,7 @@
 		<PackageReference Include="AutoMapper" Version="10.1.1" />
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.20" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />

OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj

@@ -17,7 +17,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
 	</ItemGroup>
 
 	<ItemGroup>

OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj

@@ -30,7 +30,7 @@
 		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.56" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.57" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
 		<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />