Skip to content

Commit fe2d74e

Browse files
rshrirohitrshrirohit
committed
Merge branch 'DLS-Release-v1.1.2' into UAT
2 parents b71dda3 + 0584b6b commit fe2d74e

File tree

5 files changed

+157
-154
lines changed

5 files changed

+157
-154
lines changed

‎DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -620,20 +620,21 @@ FROM CandidateAssessmentSupervisors AS cas INNER JOIN
620620
{
621621
return connection.Query<DelegateSelfAssessment>(
622622
@$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.QuestionLabel, sa.DescriptionLabel, sa.ReviewerCommentsLabel,
623-
sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, ca.StartedDate,
624-
COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed,
625-
ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate,
626-
(SELECT COUNT(*) AS Expr1
627-
FROM CandidateAssessmentSupervisorVerifications AS casv
628-
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
629-
{signedOffFields}
630-
(SELECT COUNT(*) AS Expr1
631-
FROM SelfAssessmentResultSupervisorVerifications AS sarsv
632-
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (sarsv.Superceded = 0)) AS ResultsVerificationRequests
633-
FROM CandidateAssessmentSupervisors AS cas INNER JOIN
634-
CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
635-
SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID
636-
WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId }
623+
sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, ca.StartedDate,
624+
COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed,
625+
ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate,
626+
(SELECT COUNT(*) AS Expr1
627+
FROM CandidateAssessmentSupervisorVerifications AS casv
628+
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
629+
{signedOffFields}
630+
(SELECT COUNT(*) AS Expr1
631+
FROM SelfAssessmentResultSupervisorVerifications AS sarsv
632+
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (sarsv.Superceded = 0)) AS ResultsVerificationRequests,
633+
sa.Vocabulary
634+
FROM CandidateAssessmentSupervisors AS cas INNER JOIN
635+
CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
636+
SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID
637+
WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId }
637638
).FirstOrDefault();
638639
}
639640
public DelegateSelfAssessment? GetSelfAssessmentBySupervisorDelegateCandidateAssessmentId(int candidateAssessmentId, int supervisorDelegateId)
@@ -696,23 +697,24 @@ FROM SelfAssessmentResults AS sar2
696697
{
697698
return connection.Query<DelegateSelfAssessment>(
698699
@$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, sa.ReviewerCommentsLabel, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.RoleProfile, sg.SubGroup, pg.ProfessionalGroup, sa.SupervisorResultsReview AS IsSupervisorResultsReviewed,
699-
(SELECT COUNT(*) AS Expr1
700-
FROM CandidateAssessmentSupervisorVerifications AS casv
701-
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
702-
{signedOffFields}
703-
(SELECT COUNT(*) AS Expr1
704-
FROM SelfAssessmentResultSupervisorVerifications AS sarsv
705-
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests,
706-
ca.NonReportable,ca.DelegateUserID
700+
(SELECT COUNT(*) AS Expr1
701+
FROM CandidateAssessmentSupervisorVerifications AS casv
702+
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested,
703+
{signedOffFields}
704+
(SELECT COUNT(*) AS Expr1
705+
FROM SelfAssessmentResultSupervisorVerifications AS sarsv
706+
WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests,
707+
ca.NonReportable,ca.DelegateUserID,
708+
sa.Vocabulary
707709
FROM CandidateAssessmentSupervisors AS cas INNER JOIN
708-
CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
709-
SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN
710-
SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID LEFT OUTER JOIN
711-
NRPProfessionalGroups AS pg ON sa.NRPProfessionalGroupID = pg.ID LEFT OUTER JOIN
712-
NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN
713-
NRPRoles AS r ON sa.NRPRoleID = r.ID
714-
LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
715-
WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)",
710+
CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
711+
SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN
712+
SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID LEFT OUTER JOIN
713+
NRPProfessionalGroups AS pg ON sa.NRPProfessionalGroupID = pg.ID LEFT OUTER JOIN
714+
NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN
715+
NRPRoles AS r ON sa.NRPRoleID = r.ID
716+
LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
717+
WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)",
716718
new { candidateAssessmentId, adminId, adminIdCategoryId }
717719
).FirstOrDefault();
718720
}

‎DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@ public class DelegateSelfAssessment
2828
public bool IsSupervisorResultsReviewed { get; set; }
2929
public bool IsAssignedToSupervisor { get; set; }
3030
public bool NonReportable { get; set; }
31+
public string? Vocabulary { get; set; }
3132
}
3233
}

‎DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
namespace DigitalLearningSolutions.Web.ViewModels.Supervisor
22
{
3-
using DigitalLearningSolutions.Data.Models.Frameworks;
43
using DigitalLearningSolutions.Data.Models.SelfAssessments;
54
using DigitalLearningSolutions.Data.Models.Supervisor;
65
using DigitalLearningSolutions.Web.Helpers;
@@ -15,9 +14,9 @@ public class ReviewSelfAssessmentViewModel
1514
public IEnumerable<SupervisorSignOff>? SupervisorSignOffs { get; set; }
1615
public bool IsSupervisorResultsReviewed { get; set; }
1716
public SearchSupervisorCompetencyViewModel SearchViewModel { get; set; }
18-
public string VocabPlural(string vocabulary)
17+
public string VocabPlural()
1918
{
20-
return FrameworkVocabularyHelper.VocabularyPlural(vocabulary);
19+
return FrameworkVocabularyHelper.VocabularyPlural(DelegateSelfAssessment.Vocabulary);
2120
}
2221
public int CandidateAssessmentId { get; set; }
2322
public bool ExportToExcelHide { get; set; }

‎DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
</a>
9797
}
9898

99-
@if(Model.CompetencySummaries.CanViewCertificate)
99+
@if (Model.CompetencySummaries.CanViewCertificate)
100100
{
101101
<a class="nhsuk-button"
102102
asp-route-candidateAssessmentId="@Model.CandidateAssessmentId"
@@ -106,11 +106,11 @@
106106
Certificate
107107
</a>
108108
}
109-
@if(Model.DelegateSelfAssessment.SignOffRequested > 0 && Model.CompetencySummaries.VerifiedCount == Model.CompetencySummaries.QuestionsCount)
109+
@if (Model.DelegateSelfAssessment.SignOffRequested > 0 && Model.CompetencySummaries.VerifiedCount == Model.CompetencySummaries.QuestionsCount)
110110
{
111111
<a role="button" asp-action="SignOffProfileAssessment" asp-route-candidateAssessmentId="@Model.DelegateSelfAssessment.ID" asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID" class="nhsuk-button">Sign-off self assessment</a>
112112
}
113-
@if((Model.DelegateSelfAssessment.ResultsVerificationRequests > 1) && Model.CompetencySummaries.VerifiedCount < Model.CompetencySummaries.QuestionsCount)
113+
@if ((Model.DelegateSelfAssessment.ResultsVerificationRequests > 1) && Model.CompetencySummaries.VerifiedCount < Model.CompetencySummaries.QuestionsCount)
114114
{
115115
<a role="button" asp-action="VerifyMultipleResults" asp-route-candidateAssessmentId="@Model.DelegateSelfAssessment.ID" asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID" class="nhsuk-button">Confirm multiple results</a>
116116
}
@@ -119,6 +119,7 @@
119119
<partial name="../../Supervisor/Shared/_SearchSupervisorCompetency"
120120
model="@Model.SearchViewModel"
121121
view-data="@(new ViewDataDictionary(ViewData) { { "parent", Model } })" />
122+
<p><span role="alert">@Model.CompetencyGroups.Sum(g => g.Count()) matching @Model.VocabPlural().ToLower()</span></p>
122123
@if (Model.CompetencyGroups.Any())
123124
{
124125
foreach (var competencyGroup in Model.CompetencyGroups)

0 commit comments

Comments
 (0)