diff --git a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs index 44af540d..a7a0807d 100644 --- a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs @@ -130,7 +130,24 @@ public static string GetResourceTypeDesc(ResourceTypeEnum resourceType) /// The string. public static string GetActivityStatusDisplayText(MyLearningCombinedActivitiesViewModel activity) { - if (activity.ActivityStatus == ActivityStatusEnum.Completed || activity.ActivityStatus == ActivityStatusEnum.Passed || activity.ActivityStatus == ActivityStatusEnum.Passed || activity.ActivityStatus == ActivityStatusEnum.Viewed || activity.ActivityStatus == ActivityStatusEnum.Downloaded) + if (activity.ActivityStatus == ActivityStatusEnum.Completed || activity.ActivityStatus == ActivityStatusEnum.Passed || activity.ActivityStatus == ActivityStatusEnum.Viewed || activity.ActivityStatus == ActivityStatusEnum.Downloaded) + { + return "Completed"; + } + else + { + return "InProgress"; + } + } + + /// + /// GetCertificateStatusDisplayText. + /// + /// The activity. + /// The string. + public static string GetCertificateStatusDisplayText(ActivityDetailedItemViewModel activity) + { + if (activity.ActivityStatus == ActivityStatusEnum.Completed || activity.ActivityStatus == ActivityStatusEnum.Passed || activity.ActivityStatus == ActivityStatusEnum.Viewed || activity.ActivityStatus == ActivityStatusEnum.Downloaded) { return "Completed"; } diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml index c8269ae4..c6a0a65f 100644 --- a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml +++ b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningCertificate.cshtml @@ -1216,7 +1216,7 @@ Last Date Completed@Model.ActivityDetailedItemViewModel.ActivityDate.ToString("dd/MM/yyyy") - Overall Status @ViewActivityHelper.GetActivityStatusText(Model.ActivityDetailedItemViewModel) + Overall Status @ViewActivityHelper.GetCertificateStatusDisplayText(Model.ActivityDetailedItemViewModel) @@ -1399,7 +1399,7 @@ Last Date Completed@Model.ActivityDetailedItemViewModel.ActivityDate.ToString("dd/MM/yyyy") - Overall Status @ViewActivityHelper.GetActivityStatusText(Model.ActivityDetailedItemViewModel) + Overall Status @ViewActivityHelper.GetCertificateStatusDisplayText(Model.ActivityDetailedItemViewModel)