Skip to content

TD-6213 make certificate available for informal certificate without passmark condition #1414

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 1 commit into from
Sep 16, 2025
Merged

TD-6213 make certificate available for informal certificate without passmark condition #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 22 additions & 2 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 @@ -387,8 +387,28 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
activityEntities.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Incomplete || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress));
if (activityEntities.Any() && activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
{
totalNumberOfAccess = activityQuery.SelectMany(x => x.AssessmentResourceActivity).OrderByDescending(a => a.CreateDate).ToList().Count();
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();
totalNumberOfAccess = activityQuery.SelectMany(x => x.AssessmentResourceActivity)
.OrderByDescending(a => a.CreateDate)
.Count();

var assessmentType = activityEntities.First().ResourceVersion.AssessmentResourceVersion.AssessmentType;

if (assessmentType == AssessmentTypeEnum.Formal)
{
activityEntities = activityEntities.Where(x => {
var act = x.AssessmentResourceActivity.FirstOrDefault();
var ver = x.ResourceVersion.AssessmentResourceVersion;
return act != null && act.Score.HasValue &&
Math.Round(act.Score.Value, MidpointRounding.AwayFromZero) >= ver.PassMark;
}).ToList();
}
else if (assessmentType == AssessmentTypeEnum.Informal)
{
activityEntities = activityEntities.Where(x => {
var act = x.AssessmentResourceActivity.FirstOrDefault();
return act != null && x.ActivityStatusId == (int)ActivityStatusEnum.Completed;
}).ToList();
}
}
else if (activityEntities.Any() && (activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Video || activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Audio))
{
Expand Down
16 changes: 12 additions & 4 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 @@ -54,17 +54,25 @@ BEGIN
)
OR ra.ActivityStatusId IN (3,5)
))
OR (r.ResourceTypeId = 11 AND (
OR (
r.ResourceTypeId = 11
AND (
-- Either passed by score, or completed with no pass mark
EXISTS (
SELECT 1
FROM activity.AssessmentResourceActivity ara
JOIN resources.AssessmentResourceVersion arv
ON arv.ResourceVersionId = ra.ResourceVersionId
WHERE ara.ResourceActivityId = ra.Id
AND ara.Score >= arv.PassMark
AND (
ara.Score >= arv.PassMark -- formal assessment
OR (ra.ActivityStatusId = 3 AND arv.AssessmentType = 1) --informal assessment
)
)
OR ra.ActivityStatusId IN (3,5)
))
-- Or explicitly marked as passed
OR ra.ActivityStatusId = 5
)
)
OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12)
AND ra.ActivityStatusId = 3)
)
Expand Down
Loading