Skip to content

Develop/fixes/dlsv2 616 adding learner filter enables request sign off #1418

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
Oct 7, 2022
Merged

Develop/fixes/dlsv2 616 adding learner filter enables request sign off #1418

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
cb631f9
Fixed signoff enabled & count to exclude Rejected.
martinfoster-hee Oct 6, 2022
25cb7b5
Merge branch 'master' into Develop/Fixes/DLSV2-616-AddingLearnerFilte…
martinfoster-hee Oct 6, 2022
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
2 changes: 1 addition & 1 deletion ...olutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public void Initialise(List<Competency> unfilteredCompetencies)
AllQuestionsVerifiedOrNotRequired = true;
foreach (var assessmentQuestion in unfilteredCompetencies.SelectMany(c => c.AssessmentQuestions))
{
if ((assessmentQuestion.Result == null || assessmentQuestion.Verified == null) && assessmentQuestion.Required)
if ((assessmentQuestion.Result == null || assessmentQuestion.Verified == null || assessmentQuestion.SignedOff != true) && assessmentQuestion.Required)
{
AllQuestionsVerifiedOrNotRequired = false;
break;
Expand Down
2 changes: 1 addition & 1 deletion ...lLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
var competencySummaries = from g in Model.CompetencyGroups
let questions = g.SelectMany(c => c.AssessmentQuestions).Where(q => q.Required)
let selfAssessedCount = questions.Count(q => q.ResultId.HasValue)
let verifiedCount = questions.Count(q => q.Verified.HasValue)
let verifiedCount = questions.Count(q => q.Verified.HasValue && q.SignedOff is true)
select new ViewDataDictionary(ViewData)
{
{ "isSupervisorResultsReviewed", Model.SelfAssessment.IsSupervisorResultsReviewed },
Expand Down