Merge pull request #1184 from TechnologyEnhancedLearning/release-v1.6.1-Hollyberry

Release v1.6.1 hollyberry  TO RC

Author: AnjuJose011

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:

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: