Merge branch 'RC' into Develop/Fixes/TD-6243-Introduce-progress-details-for-audio-and-video-resources-on-the-My-Learning-History-Page

Author: swapnamol-abraham

OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs

@@ -429,7 +429,7 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
                 }
                 else if (assessmentType == AssessmentTypeEnum.Informal)
                 {
-                    activityEntities = activityEntities.Where(x => x.ActivityStatusId == (int)ActivityStatusEnum.Completed).ToList();
+                    activityEntities = activityEntities.Where(x => x.AssessmentResourceActivity != null && x.AssessmentResourceActivity.FirstOrDefault() != null && x.AssessmentResourceActivity.First().Score.HasValue).ToList();// x.ActivityStatusId == (int)ActivityStatusEnum.Completed).ToList();
                 }
             }
             else if (activityEntities.Any() && (activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Video || activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Audio))
@@ -523,8 +523,8 @@ public async Task<List<MyLearningDetailedItemViewModel>> 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.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();
+                    latestActivityCheck = latestActivityCheck.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null && (x.ResourceVersion.AssessmentResourceVersion.AssessmentType == AssessmentTypeEnum.Formal && x.AssessmentResourceActivity.FirstOrDefault() != null && 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.AssessmentResourceActivity.FirstOrDefault() != null && x.AssessmentResourceActivity.First().Score.HasValue)).ToList();
                 }
 
                 ResourceActivity expectedActivity = null;

WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetUsercertificateDetails.sql

@@ -66,8 +66,8 @@ BEGIN
                       ON arv.ResourceVersionId = ra.ResourceVersionId
                     WHERE ara.ResourceActivityId = ra.Id
                       AND (
-                             ara.Score >= arv.PassMark -- formal assessment
-                          OR (ra.ActivityStatusId = 3 AND arv.AssessmentType = 1) --informal assessment
+                             (arv.AssessmentType = 2 AND ara.Score >= arv.PassMark) -- formal assessment
+                          OR (arv.AssessmentType = 1 AND ara.Score is not null) -- informal assessment
                       )
                 )
                 -- Or explicitly marked as passed