Skip to content

TD-4878-Limit the list of supervisors returned in the Tracking System enrol on self assessment #2898

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
Oct 29, 2024
Merged

TD-4878-Limit the list of supervisors returned in the Tracking System enrol on self assessment #2898

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
19 changes: 19 additions & 0 deletions ...LearningSolutions.Data.Migrations/202410231405_Alter_GetActivitiesForDelegateEnrolment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202410231405)]
public class Alter_GetActivitiesForDelegateEnrolment : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_4878_Alter_GetActivitiesForDelegateEnrolment_Up);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_4878_Alter_GetActivitiesForDelegateEnrolment_Down);
}
}
}
40 changes: 40 additions & 0 deletions DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,4 +448,10 @@
<data name="TD_4634_Alter_GetCompletedCoursesForCandidate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
</root>
Binary file added ...olutions.Data.Migrations/Scripts/TD-4878-Alter_GetActivitiesForDelegateEnrolment_Down.sql
View file
Open in desktop
Binary file not shown.
Binary file added ...gSolutions.Data.Migrations/Scripts/TD-4878-Alter_GetActivitiesForDelegateEnrolment_Up.sql
View file
Open in desktop
Binary file not shown.
11 changes: 4 additions & 7 deletions DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public interface ISupervisorDataService
CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId);
SelfAssessmentResultSummary? GetSelfAssessmentResultSummary(int candidateAssessmentId, int supervisorDelegateId);
IEnumerable<CandidateAssessmentSupervisorVerificationSummary> GetCandidateAssessmentSupervisorVerificationSummaries(int candidateAssessmentId);
IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID);
IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CentreID, int CategoryID);
//UPDATE DATA
bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int candidateId, int adminId);
bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId);
Expand Down Expand Up @@ -380,7 +380,7 @@ LEFT JOIN UserCentreDetails ucd
}
}

public IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID)
public IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CentreID, int CategoryID)
{
return connection.Query<SupervisorForEnrolDelegate>(
$@"SELECT aa.ID AS AdminID,
Expand All @@ -391,14 +391,11 @@ FROM AdminAccounts AS aa INNER JOIN
Centres AS c ON aa.CentreID = c.CentreID LEFT OUTER JOIN
UserCentreDetails AS ucd ON u.ID = ucd.UserID AND c.CentreID = ucd.CentreID
WHERE (aa.IsSupervisor = 1) AND (c.CentreID = @CentreID) AND
(ISNULL(aa.CategoryID, 0) = 0 OR CategoryID =
(SELECT aa.CategoryID FROM Applications AS a INNER JOIN
Customisations AS c ON a.ApplicationID = c.ApplicationID
WHERE (c.CustomisationID = @CustomisationID))) AND
(ISNULL(aa.CategoryID, 0) = 0 OR aa.CategoryID = @CategoryID) AND
(aa.Active = 1)
GROUP BY aa.ID, u.LastName, u.FirstName, COALESCE(ucd.Email, u.PrimaryEmail), CentreName
ORDER BY u.FirstName, u.LastName",
new { CentreID, CustomisationID });
new { CentreID, CategoryID });
}

public bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId)
Expand Down
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Data/Models/Courses/AvailableCourse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public string? Topic
}
public int DelegateStatus { get; set; }
public bool HideInLearnerPortal { get; set; }
public int CategoryID { get; set; }

private string? category;
private string? topic;
Expand Down
1 change: 1 addition & 0 deletions ...LearningSolutions.Data/Models/SessionData/Tracking/Delegate/Enrol/SessionEnrolDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ public class SessionEnrolDelegate
public string? SupervisorEmail { get; set; }
public bool IsSelfAssessment { get; set; }
public int AssessmentVersion { get; set; }
public int? AssessmentCategoryID { get; set; }
}
}
5 changes: 3 additions & 2 deletions DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/EnrolController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public IActionResult Index(int delegateId, EnrolCurrentLearningViewModel enrolCu
sessionEnrol.IsSelfAssessment = selectedCourse.IsSelfAssessment;
sessionEnrol.AssessmentVersion = selectedCourse.CurrentVersion.GetValueOrDefault();
sessionEnrol.AssessmentName = selectedCourse.Name;
sessionEnrol.AssessmentCategoryID = selectedCourse.CategoryID;

multiPageFormService.SetMultiPageFormData(
sessionEnrol,
Expand Down Expand Up @@ -201,7 +202,7 @@ public IActionResult EnrolDelegateSupervisor(int delegateId)
var sessionEnrol = multiPageFormService.GetMultiPageFormData<SessionEnrolDelegate>(
MultiPageFormDataFeature.EnrolDelegateInActivity,
TempData).GetAwaiter().GetResult();
var supervisorList = supervisorService.GetSupervisorForEnrolDelegate(sessionEnrol.AssessmentID.GetValueOrDefault(), centreId.Value);
var supervisorList = supervisorService.GetSupervisorForEnrolDelegate(centreId.Value, sessionEnrol.AssessmentCategoryID.Value);
if (!sessionEnrol.IsSelfAssessment)
{
var model = new EnrolSupervisorViewModel(
Expand Down Expand Up @@ -233,7 +234,7 @@ public IActionResult EnrolDelegateSupervisor(int delegateId, EnrolSupervisorView
{
var centreId = GetCentreId();
var sessionEnrol = multiPageFormService.GetMultiPageFormData<SessionEnrolDelegate>(MultiPageFormDataFeature.EnrolDelegateInActivity, TempData).GetAwaiter().GetResult();
var supervisorList = supervisorService.GetSupervisorForEnrolDelegate(sessionEnrol.AssessmentID.Value, centreId.Value);
var supervisorList = supervisorService.GetSupervisorForEnrolDelegate(centreId.Value, sessionEnrol.AssessmentCategoryID.Value);
var roles = supervisorService.GetSupervisorRolesBySelfAssessmentIdForSupervisor(sessionEnrol.AssessmentID.GetValueOrDefault()).ToArray();

if (!ModelState.IsValid)
Expand Down
6 changes: 3 additions & 3 deletions DigitalLearningSolutions.Web/Services/SupervisorService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public interface ISupervisorService
CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId);
SelfAssessmentResultSummary? GetSelfAssessmentResultSummary(int candidateAssessmentId, int supervisorDelegateId);
IEnumerable<CandidateAssessmentSupervisorVerificationSummary> GetCandidateAssessmentSupervisorVerificationSummaries(int candidateAssessmentId);
IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID);
IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CentreID, int CategoryID);
//UPDATE DATA
bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int candidateId, int adminId);
bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId);
Expand Down Expand Up @@ -172,9 +172,9 @@ public IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdmi
return supervisorDataService.GetSupervisorDelegateDetailsForAdminId(adminId);
}

public IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID)
public IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CentreID, int CategoryID)
{
return supervisorDataService.GetSupervisorForEnrolDelegate(CustomisationID, CentreID);
return supervisorDataService.GetSupervisorForEnrolDelegate(CentreID, CategoryID);
}

public SelfAssessmentSupervisorRole? GetSupervisorRoleById(int id)
Expand Down
Loading