Skip to content

Revert informal assessment changes #1440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

Revert informal assessment changes #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6996fc8
TD-6213 revert changes for informal assessment
OluwatobiAwe Sep 25, 2025
856d2a1
merged
OluwatobiAwe Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
18 changes: 7 additions & 11 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetUsercertificateDetails.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading