Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
20 changes: 18 additions & 2 deletions LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading