From 59887e65aeaadd3ea9d7eea4860b88bb53faed1e Mon Sep 17 00:00:00 2001 From: OluwatobiAwe Date: Thu, 18 Sep 2025 17:43:24 +0100 Subject: [PATCH 1/3] TD-6208 Certificate Status update --- .../Helpers/ViewActivityHelper.cs | 19 ++++++++++++++++++- .../MyLearning/LearningCertificate.cshtml | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) 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) From 36537342b27e4273b389fb9d548679a4ddb709c6 Mon Sep 17 00:00:00 2001 From: OluwatobiAwe Date: Fri, 19 Sep 2025 13:02:36 +0100 Subject: [PATCH 2/3] TD-6213 --- .../Services/MyLearningService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs index b5f503cd..41128e58 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs @@ -373,6 +373,7 @@ public async Task> GetPlayedSegments(int userId, in /// The . public async Task> GetResourceCertificateDetails(int userId, int resourceReferenceId, int majorVersion, int minorVersion) { + userId = 2299493; MyLearningDetailedItemViewModel myLearningDetailedItemViewModel = null; var activityQuery = resourceActivityRepository.GetByUserId(userId); if (majorVersion > 0) @@ -501,7 +502,8 @@ public async Task> PopulateMyLearningDetai latestActivityCheck.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Incomplete || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress)); if (latestActivityCheck.Any() && latestActivityCheck.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Assessment) { - latestActivityCheck = latestActivityCheck.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null && x.AssessmentResourceActivity.FirstOrDefault().Score.HasValue && (int)Math.Round(x.AssessmentResourceActivity.FirstOrDefault().Score.Value, MidpointRounding.AwayFromZero) >= x.ResourceVersion.AssessmentResourceVersion.PassMark).ToList(); + + latestActivityCheck = latestActivityCheck.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null && (x.ResourceVersion.AssessmentResourceVersion.AssessmentType == AssessmentTypeEnum.Formal && x.AssessmentResourceActivity.First().Score.HasValue && (int)Math.Round(x.AssessmentResourceActivity.First().Score.Value, MidpointRounding.AwayFromZero) >= x.ResourceVersion.AssessmentResourceVersion.PassMark) ||(x.ResourceVersion.AssessmentResourceVersion.AssessmentType == AssessmentTypeEnum.Informal && x.ActivityStatusId == (int)ActivityStatusEnum.Completed)).ToList(); } ResourceActivity expectedActivity = null; From 00b0464adc6ea0f252f662d29b098a241d4eea17 Mon Sep 17 00:00:00 2001 From: OluwatobiAwe Date: Fri, 19 Sep 2025 13:06:04 +0100 Subject: [PATCH 3/3] . removed local test id --- .../Services/MyLearningService.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs index 41128e58..c06e5c0c 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs @@ -373,7 +373,6 @@ public async Task> GetPlayedSegments(int userId, in /// The . public async Task> GetResourceCertificateDetails(int userId, int resourceReferenceId, int majorVersion, int minorVersion) { - userId = 2299493; MyLearningDetailedItemViewModel myLearningDetailedItemViewModel = null; var activityQuery = resourceActivityRepository.GetByUserId(userId); if (majorVersion > 0)