Skip to content

Commit 2468b06

Browse files
committed
TD-4115 - Number of accessed showing incorrect in the certificate details
1 parent b00b63d commit 2468b06

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

WebAPI/LearningHub.Nhs.Services/MyLearningService.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,13 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
169169
activityEntities.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Incomplete || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress));
170170
if (activityEntities.Any() && activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
171171
{
172+
totalNumberOfAccess = activityQuery.SelectMany(x => x.AssessmentResourceActivity).OrderByDescending(a => a.CreateDate).ToList().Count();
172173
activityEntities = activityEntities.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();
173174
}
175+
else if (activityEntities.Any() && (activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Video || activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Audio))
176+
{
177+
totalNumberOfAccess = activityQuery.SelectMany(x => x.MediaResourceActivity).OrderByDescending(a => a.CreateDate).ToList().Count();
178+
}
174179

175180
if (activityEntities.Any())
176181
{
@@ -272,7 +277,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
272277

273278
if (latestActivityCheck.Any() && expectedActivity != null && resourceActivity.ResourceVersion.CertificateEnabled == true)
274279
{
275-
viewModel.CertificateEnabled = true;
280+
viewModel.CertificateEnabled = true;
276281
}
277282
else
278283
{
@@ -490,7 +495,7 @@ private IQueryable<ResourceActivity> ApplyFilters(IQueryable<ResourceActivity> q
490495

491496
if (requestModel.CertificateEnabled)
492497
{
493-
query = query.Where(x => x.ResourceVersion.CertificateEnabled.Equals(true));
498+
query = query.Where(x => x.ResourceVersion.CertificateEnabled.Equals(true));
494499
}
495500

496501
return query;

0 commit comments

Comments
 (0)