From be135d46f6a007c2d22f49fe074f0ce122dc0e02 Mon Sep 17 00:00:00 2001 From: swapnamol-abraham Date: Fri, 13 Jun 2025 11:33:27 +0100 Subject: [PATCH] TD-5003: Issue showing 1 sec delay when played Video/Audio resources on 'My Learning' page --- .../Helpers/LearningActivityHelper.cs | 20 +++++++++++++++++-- .../Helpers/ViewActivityHelper.cs | 20 +++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs index caffaaa5d..b67989350 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs @@ -85,7 +85,15 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my case ResourceTypeEnum.Article: return "Read"; case ResourceTypeEnum.Audio: - return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000); + if ((myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000) > myLearningDetailedItemViewModel.ResourceDurationMilliseconds) + { + return "Played " + GetDurationText(myLearningDetailedItemViewModel.ResourceDurationMilliseconds); + } + else + { + return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000); + } + case ResourceTypeEnum.Embedded: return string.Empty; case ResourceTypeEnum.Equipment: @@ -113,7 +121,15 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my } case ResourceTypeEnum.Video: - return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000); + if ((myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000) > myLearningDetailedItemViewModel.ResourceDurationMilliseconds) + { + return "Played " + GetDurationText(myLearningDetailedItemViewModel.ResourceDurationMilliseconds); + } + else + { + return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000); + } + case ResourceTypeEnum.WebLink: return "Visited"; case ResourceTypeEnum.Html: diff --git a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs index 8d17307cf..f3bd9259c 100644 --- a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs @@ -84,7 +84,15 @@ public static string GetResourceTypeVerb(this ActivityDetailedItemViewModel acti case ResourceTypeEnum.Article: return "Read"; case ResourceTypeEnum.Audio: - return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000); + if ((activityDetailedItemViewModel.ActivityDurationSeconds * 1000) > activityDetailedItemViewModel.ResourceDurationMilliseconds) + { + return "Played " + GetDurationText(activityDetailedItemViewModel.ResourceDurationMilliseconds); + } + else + { + return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000); + } + case ResourceTypeEnum.Embedded: return string.Empty; case ResourceTypeEnum.Equipment: @@ -112,7 +120,15 @@ public static string GetResourceTypeVerb(this ActivityDetailedItemViewModel acti } case ResourceTypeEnum.Video: - return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000); + if ((activityDetailedItemViewModel.ActivityDurationSeconds * 1000) > activityDetailedItemViewModel.ResourceDurationMilliseconds) + { + return "Played " + GetDurationText(activityDetailedItemViewModel.ResourceDurationMilliseconds); + } + else + { + return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000); + } + case ResourceTypeEnum.WebLink: return "Visited"; case ResourceTypeEnum.Html: