Skip to content

Commit 5414198

Browse files
authored
Merge pull request #3163 from TechnologyEnhancedLearning/Develop/Fix/TD-5391-sign-off-request-issue-optional-proficiency
TD-5391-A check has been added to verify if any mandatory competencies need to be confirmed.
2 parents 0ce8975 + 5d3e1dd commit 5414198

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1566,7 +1566,13 @@ ManageOptionalCompetenciesViewModel model
15661566

15671567
}
15681568

1569-
if (!selfAssessmentService.HasMinimumOptionalCompetencies(selfAssessmentId, delegateUserId))
1569+
var recentResults = selfAssessmentService.GetMostRecentResults(selfAssessmentId, User.GetCandidateIdKnownNotNull()).ToList();
1570+
1571+
bool isVerificationPending = recentResults?.SelectMany(comp => comp.AssessmentQuestions).Where(quest => quest.Required)
1572+
.Where(quest => quest.Required)
1573+
.All(quest => !((quest.Result == null || quest.Verified == null || quest.SignedOff != true) && quest.Required)) != true;
1574+
1575+
if (!selfAssessmentService.HasMinimumOptionalCompetencies(selfAssessmentId, delegateUserId) || isVerificationPending)
15701576
{
15711577
var supervisorsSignOffs = selfAssessmentService.GetSupervisorSignOffsForCandidateAssessment(selfAssessmentId, delegateUserId);
15721578

0 commit comments

Comments
 (0)