Skip to content

Limit the self assessment activities listed in the manage delegate view to the category associated with the admin #3015

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
Dec 6, 2024
Merged

Limit the self assessment activities listed in the manage delegate view to the category associated with the admin #3015

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
6 changes: 3 additions & 3 deletions ...gSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

public partial class SelfAssessmentDataService
{
public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId)
public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId, int? adminCategoryId)
{
return connection.Query<CurrentSelfAssessment>(
@"SELECT SelfAssessment.Id,
Expand Down Expand Up @@ -67,7 +67,7 @@ Competencies AS C RIGHT OUTER JOIN
CandidateAssessmentSupervisorVerifications AS casv ON casv.CandidateAssessmentSupervisorID = cas.ID LEFT OUTER JOIN
AdminAccounts AS aaEnrolledBy ON aaEnrolledBy.ID = CA.EnrolledByAdminID LEFT OUTER JOIN
Users AS uEnrolledBy ON uEnrolledBy.ID = aaEnrolledBy.UserID
WHERE (CA.DelegateUserID = @delegateUserId) AND (CA.RemovedDate IS NULL) AND (CA.CompletedDate IS NULL)
WHERE (CA.DelegateUserID = @delegateUserId) AND (CA.RemovedDate IS NULL) AND (CA.CompletedDate IS NULL) AND (ISNULL(@adminCategoryId, 0) = 0 OR sa.CategoryID = @adminCategoryId)
GROUP BY
CA.SelfAssessmentID, SA.Name, SA.Description, SA.IncludesSignposting, SA.SupervisorResultsReview,
SA.ReviewerCommentsLabel, SA.IncludeRequirementsFilters,
Expand All @@ -83,7 +83,7 @@ CandidateAssessments AS CA LEFT OUTER JOIN
(casv.Verified IS NOT NULL)
GROUP BY SelfAssessmentID,casv.SignedOff
)Signoff ON SelfAssessment.Id =Signoff.SelfAssessmentID",
new { delegateUserId, centreId }
new { delegateUserId, centreId, adminCategoryId }
);
}

Expand Down
2 changes: 1 addition & 1 deletion ...earningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ int competencyId

// CandidateAssessmentsDataService

IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId);
IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId, int? adminCategoryId);

CurrentSelfAssessment? GetSelfAssessmentForCandidateById(int delegateUserId, int selfAssessmentId);

Expand Down
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/CurrentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ bool apiIsAccessible

var bannerText = "bannerText";
A.CallTo(() => courseService.GetCurrentCourses(CandidateId)).Returns(currentCourses);
A.CallTo(() => selfAssessmentService.GetSelfAssessmentsForCandidate(DelegateUserId, A<int>._)).Returns(selfAssessments);
A.CallTo(() => selfAssessmentService.GetSelfAssessmentsForCandidate(DelegateUserId, A<int>._, A<int>._)).Returns(selfAssessments);
A.CallTo(() => actionPlanService.GetIncompleteActionPlanResources(DelegateUserId))
.Returns((actionPlanResources, apiIsAccessible));
A.CallTo(() => centresService.GetBannerText(CentreId)).Returns(bannerText);
Expand Down Expand Up @@ -426,7 +426,7 @@ public void MarkActionPlanResourceAsComplete_does_not_call_service_with_invalid_
private void GivenCurrentActivitiesAreEmptyLists()
{
A.CallTo(() => courseService.GetCurrentCourses(A<int>._)).Returns(new List<CurrentCourse>());
A.CallTo(() => selfAssessmentService.GetSelfAssessmentsForCandidate(A<int>._, A<int>._))
A.CallTo(() => selfAssessmentService.GetSelfAssessmentsForCandidate(A<int>._, A<int>._, A<int>._))
.Returns(new List<CurrentSelfAssessment>());
A.CallTo(() => actionPlanService.GetIncompleteActionPlanResources(A<int>._))
.Returns((new List<ActionPlanResource>(), false));
Expand Down
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Controllers/LearningPortalController/Current.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public async Task<IActionResult> Current(

var centreId = User.GetCentreIdKnownNotNull();
var selfAssessments =
selfAssessmentService.GetSelfAssessmentsForCandidate(delegateUserId, centreId);
selfAssessmentService.GetSelfAssessmentsForCandidate(delegateUserId, centreId, 0);

var (learningResources, apiIsAccessible) =
await GetIncompleteActionPlanResourcesIfSignpostingEnabled(delegateUserId);
Expand Down Expand Up @@ -81,7 +81,7 @@ public async Task<IActionResult> AllCurrentItems()
var centreId = User.GetCentreIdKnownNotNull();

var selfAssessment =
selfAssessmentService.GetSelfAssessmentsForCandidate(delegateUserId, centreId);
selfAssessmentService.GetSelfAssessmentsForCandidate(delegateUserId, centreId, 0);

var (learningResources, _) = await GetIncompleteActionPlanResourcesIfSignpostingEnabled(delegateUserId);
var model = new AllCurrentItemsPageViewModel(currentCourses, selfAssessment, learningResources);
Expand Down
3 changes: 2 additions & 1 deletion DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ViewDelegateController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ public IActionResult Index(int delegateId, string? callType)
course.LastUpdated = DateHelper.GetLocalDateTime(course.LastUpdated);
course.Completed = course.Completed?.TimeOfDay == TimeSpan.Zero ? course.Completed : DateHelper.GetLocalDateTime(course.Completed);
}


var selfAssessments =
selfAssessmentService.GetSelfAssessmentsForCandidate(delegateEntity.UserAccount.Id, centreId);
selfAssessmentService.GetSelfAssessmentsForCandidate(delegateEntity.UserAccount.Id, centreId, categoryIdFilter);

foreach (var selfassessment in selfAssessments)
{
Expand Down
6 changes: 3 additions & 3 deletions DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public interface ISelfAssessmentService
//Self Assessments
string? GetSelfAssessmentNameById(int selfAssessmentId);
// Candidate Assessments
IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId);
IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId, int? adminCategoryId);

CurrentSelfAssessment? GetSelfAssessmentForCandidateById(int delegateUserId, int selfAssessmentId);

Expand Down Expand Up @@ -404,9 +404,9 @@ public IEnumerable<Competency> GetCandidateAssessmentOptionalCompetencies(int se
return selfAssessmentDataService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId);
}

public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId)
public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId, int? adminCategoryId)
{
return selfAssessmentDataService.GetSelfAssessmentsForCandidate(delegateUserId, centreId);
return selfAssessmentDataService.GetSelfAssessmentsForCandidate(delegateUserId, centreId, adminCategoryId);
}

public IEnumerable<Competency> GetMostRecentResults(int selfAssessmentId, int delegateId)
Expand Down
Loading