Skip to content

Develop/Fixes/TD-623-LearnerRequestSignOffIssue #1477

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 5 commits into from
Nov 23, 2022
Merged

Develop/Fixes/TD-623-LearnerRequestSignOffIssue #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8e16b7
Fixed errant filter mechanism for Self-Assessed(Confirmation Not Requ…
martinfoster-hee Nov 22, 2022
205e9bd
Fixed ui typo issue.
martinfoster-hee Nov 22, 2022
9b77f88
Merge branch 'master' into Develop/Fixes/TD-623-LearnerRequestSignOff…
martinfoster-hee Nov 22, 2022
c0f2dc6
Fixed mobile v desktop text consistency.
martinfoster-hee Nov 22, 2022
fc6a6f1
Fixed inconsistent mobile v desktop table header caption.
martinfoster-hee Nov 22, 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
3 changes: 1 addition & 2 deletions DigitalLearningSolutions.Web/Helpers/CompetencyFilterHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ private static void ApplyResponseStatusFilters(ref IEnumerable<Competency> compe
let searchTextMatchesCompetencyName = wordsInSearchText.Any(w => c.Name?.Contains(w, StringComparison.CurrentCultureIgnoreCase) ?? false)
let responseStatusFilterMatchesAnyQuestion =
(filters.Contains((int)SelfAssessmentCompetencyFilter.RequiresSelfAssessment) && c.AssessmentQuestions.Any(q => q.ResultId == null))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.SelfAssessed) && c.AssessmentQuestions.Any(q => q.ResultId != null && q.ResultRAG > 1 &&
!(q.Verified == null && q.Requested != null) && !(q.Verified.HasValue && q.SignedOff != null)))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.SelfAssessed) && c.AssessmentQuestions.Any(q => q.ResultId != null && q.Requested == null && q.SignedOff == null))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRequested) && c.AssessmentQuestions.Any(q => q.Verified == null && q.Requested != null))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.ConfirmationRejected) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff != true))
|| (filters.Contains((int)SelfAssessmentCompetencyFilter.Verified) && c.AssessmentQuestions.Any(q => q.Verified.HasValue && q.SignedOff == true))
Expand Down
2 changes: 1 addition & 1 deletion ...rningSolutions.Web/Views/LearningPortal/SelfAssessments/ReviewConfirmationRequests.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
{
<tr role="row" class="nhsuk-table__row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Comptenecy </span>
<span class="nhsuk-table-responsive__heading">Competency </span>
@competency.Name
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
Expand Down
4 changes: 2 additions & 2 deletions ...LearningSolutions.Web/Views/LearningPortal/SelfAssessments/VerificationPickResults.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@
</div>
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Questions </span>
<span class="nhsuk-table-responsive__heading">Question </span>
@question.Question
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Responses </span>
<span class="nhsuk-table-responsive__heading">Response </span>
<partial name="../../Supervisor/Shared/_AssessmentQuestionResponse" model="question" />
</td>

Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/Supervisor/Shared/_AssessmentQuestionReviewCells.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@if ((bool)(ViewData["isSupervisorResultsReviewed"] ?? true))
{
<td class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Questions </span>
<span class="nhsuk-table-responsive__heading">Confirmation status </span>
<partial name="Shared/_AssessmentQuestionStatusTag" model="Model" />
</td>
}
Expand Down