Merge pull request #1440 from TechnologyEnhancedLearning/Develop/Fixes/TD-6213

Revert informal assessment changes

Author: AnjuJose011

LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs

@@ -280,11 +280,6 @@ public static string GetActivityStatusDisplayText(this ActivityDetailedItemViewM
             }
             else if (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment)
             {
-                if (activityDetailedItemViewModel.AssessmentDetails.AssessmentTypeEnum == AssessmentTypeEnum.Informal && (activityDetailedItemViewModel.Complete || GetActivityStatusText(activityDetailedItemViewModel) == "Completed"))
-                {
-                    return "Passed";
-                }
-
                 if (activityDetailedItemViewModel.Complete)
                 {
                     return activityDetailedItemViewModel.ScorePercentage >= activityDetailedItemViewModel.AssessmentDetails.PassMark ? "Passed" : "Failed";

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

@@ -429,18 +429,11 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
 
                 var assessmentType = activityEntities.First().ResourceVersion.AssessmentResourceVersion.AssessmentType;
 
-                if (assessmentType == AssessmentTypeEnum.Formal)
-                {
-                    activityEntities = activityEntities.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null &&
-                                                                   x.AssessmentResourceActivity.First().Score.HasValue &&
+                activityEntities = activityEntities.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null && 
+                                                                   x.AssessmentResourceActivity.First().Score.HasValue && 
                                                                    (int)Math.Round(x.AssessmentResourceActivity.First().Score.Value,
                                                                        MidpointRounding.AwayFromZero) >= x.ResourceVersion.AssessmentResourceVersion.PassMark)
                                                                     .ToList();
-                }
-                else if (assessmentType == AssessmentTypeEnum.Informal)
-                {
-                    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))
             {
@@ -533,8 +526,11 @@ 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.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();
+
+                    latestActivityCheck = latestActivityCheck.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null &&
+                    x.AssessmentResourceActivity.First().Score.HasValue && 
+                    (int)Math.Round(x.AssessmentResourceActivity.First().Score.Value, MidpointRounding.AwayFromZero) >= x.ResourceVersion.AssessmentResourceVersion.PassMark)
+                        .ToList();
                 }
 
                 ResourceActivity expectedActivity = null;

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

@@ -58,17 +58,14 @@ BEGIN
         OR (
             r.ResourceTypeId = 11
             AND (
-                -- Either passed by score, or completed with no pass mark
+                -- Must be passed by score
                 EXISTS (
                     SELECT 1
                     FROM activity.AssessmentResourceActivity ara
                     JOIN resources.AssessmentResourceVersion arv
                       ON arv.ResourceVersionId = ra.ResourceVersionId
                     WHERE ara.ResourceActivityId = ra.Id
-                      AND (
-                             (arv.AssessmentType = 2 AND ara.Score >= arv.PassMark) -- formal assessment
-                          OR (arv.AssessmentType = 1 AND ara.Score is not null) -- informal assessment
-                      )
+                      AND ara.Score is not null AND ara.Score >= arv.PassMark -- formal AND informal assessment
                 )
                 -- Or explicitly marked as passed
                 OR ra.ActivityStatusId = 5