Merge pull request #350 from TechnologyEnhancedLearning/Develop/Fixes/LH-TD-4121_View-certificate-link-showing-for-all-the-completed-entries

Swapnamol · web-flow · commit 087cc980a160 · 2024-05-10T15:23:30.000+01:00
TD-4121: Fixed the issue with the assessment certificate view
diff --git a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
@@ -272,7 +272,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
                 }
                 else
                 {
-                    expectedActivity = latestActivityCheck.Where(x => x.Id == resourceActivity.Id && (x.ActivityStatusId == ((int)ActivityStatusEnum.Completed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Passed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Downloaded))).OrderByDescending(x => x.ActivityStart).FirstOrDefault();
+                    expectedActivity = latestActivityCheck.Where(x => x.Id == resourceActivity.Id && (x.ActivityStatusId == ((int)ActivityStatusEnum.Completed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Incomplete) || x.ActivityStatusId == ((int)ActivityStatusEnum.Passed) || x.ActivityStatusId == ((int)ActivityStatusEnum.Downloaded))).OrderByDescending(x => x.ActivityStart).FirstOrDefault();
                 }
 
                 if (latestActivityCheck.Any() && expectedActivity != null)

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai`
`272`	`272`	`}`
`273`	`273`	`else`
`274`	`274`	`{`
`275`		`- expectedActivity = latestActivityCheck.Where(x => x.Id == resourceActivity.Id && (x.ActivityStatusId == ((int)ActivityStatusEnum.Completed) \|\| x.ActivityStatusId == ((int)ActivityStatusEnum.Passed) \|\| x.ActivityStatusId == ((int)ActivityStatusEnum.Downloaded))).OrderByDescending(x => x.ActivityStart).FirstOrDefault();`
	`275`	`+ expectedActivity = latestActivityCheck.Where(x => x.Id == resourceActivity.Id && (x.ActivityStatusId == ((int)ActivityStatusEnum.Completed) \|\| x.ActivityStatusId == ((int)ActivityStatusEnum.Incomplete) \|\| x.ActivityStatusId == ((int)ActivityStatusEnum.Passed) \|\| x.ActivityStatusId == ((int)ActivityStatusEnum.Downloaded))).OrderByDescending(x => x.ActivityStart).FirstOrDefault();`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`if (latestActivityCheck.Any() && expectedActivity != null)`