Skip to content

Commit c893b10

Browse files
kevwhitt-heekevwhitt-hee
committed
Revert "Squashed commit of the following:"
This reverts commit 66d3ff2.
1 parent f4fa6d0 commit c893b10

File tree

7 files changed

+2549
-2560
lines changed

7 files changed

+2549
-2560
lines changed

‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs‎

Lines changed: 2525 additions & 2489 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,19 +448,25 @@
448448
<data name="TD_4634_Alter_GetCompletedCoursesForCandidate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
449449
<value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
450450
</data>
451-
<data name="TD_4950_Alter_GetAssessmentResultsByDelegate_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
452-
<value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
453-
</data>
454-
<data name="TD_4950_Alter_GetAssessmentResultsByDelegate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
455-
<value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
456-
</data>
457451
<data name="TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter" type="System.Resources.ResXFileRef, System.Windows.Forms">
458452
<value>..\Resources\TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
459453
</data>
454+
<data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
455+
<value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
456+
</data>
457+
<data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
458+
<value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
459+
</data>
460460
<data name="TD_4950_AlterGetCandidateAssessmentResultsById_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
461461
<value>..\Resources\TD-4950-AlterGetCandidateAssessmentResultsById_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
462462
</data>
463463
<data name="TD_4950_AlterGetCandidateAssessmentResultsById_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
464464
<value>..\Resources\TD-4950-AlterGetCandidateAssessmentResultsById_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
465465
</data>
466+
<data name="TD_4950_Alter_GetAssessmentResultsByDelegate_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
467+
<value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
468+
</data>
469+
<data name="TD_4950_Alter_GetAssessmentResultsByDelegate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
470+
<value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
471+
</data>
466472
</root>

‎DigitalLearningSolutions.Data/DataServices/CourseDataService.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,7 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
542542
new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic }
543543
);
544544
}
545-
546545
if (candidateAssessmentId > 1 && supervisorDelegateId !=0)
547-
548546
{
549547
string sqlQuery = $@"
550548
BEGIN TRANSACTION

‎DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs‎

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public interface ISupervisorDataService
3535
CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId);
3636
SelfAssessmentResultSummary? GetSelfAssessmentResultSummary(int candidateAssessmentId, int supervisorDelegateId);
3737
IEnumerable<CandidateAssessmentSupervisorVerificationSummary> GetCandidateAssessmentSupervisorVerificationSummaries(int candidateAssessmentId);
38-
IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID);
38+
IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CentreID, int CategoryID);
3939
IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId);
4040
SupervisorDelegateDetail GetSupervisorDelegateDetailsByIdWithoutRemoveClause(int supervisorDelegateId, int adminId, int delegateUserId);
4141
//UPDATE DATA
@@ -218,62 +218,6 @@ LEFT OUTER JOIN AdminAccounts AS au2
218218
);
219219
}
220220

221-
public IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId)
222-
{
223-
return connection.Query<SupervisorDelegateDetail>(
224-
$@"SELECT sd.ID,
225-
sd.SupervisorEmail, sd.SupervisorAdminID, sd.DelegateEmail, sd.DelegateUserID,da.Active,
226-
sd.Added, sd.AddedByDelegate, sd.NotificationSent, sd.Removed, sd.InviteHash,
227-
u.FirstName, u.LastName, u.ProfessionalRegistrationNumber, u.PrimaryEmail AS CandidateEmail,
228-
jg.JobGroupName,
229-
da.Answer1, da.Answer2, da.Answer3, da.Answer4, da.Answer5, da.Answer6, da.CandidateNumber,
230-
cp1.CustomPrompt AS CustomPrompt1, cp2.CustomPrompt AS CustomPrompt2,
231-
cp3.CustomPrompt AS CustomPrompt3, cp4.CustomPrompt AS CustomPrompt4,
232-
cp5.CustomPrompt AS CustomPrompt5, cp6.CustomPrompt AS CustomPrompt6,
233-
COALESCE (au.CentreID, da.CentreID) AS CentreID,
234-
au.Forename + ' ' + au.Surname AS SupervisorName,
235-
(SELECT COUNT(ca.ID) AS Expr1
236-
FROM CandidateAssessments AS ca LEFT JOIN
237-
CandidateAssessmentSupervisors AS cas ON cas.CandidateAssessmentID = ca.ID AND cas.Removed IS NULL AND cas.SupervisorDelegateId = sd.ID INNER JOIN
238-
SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID
239-
WHERE (ca.RemovedDate IS NULL) AND (ca.DelegateUserID=sd.DelegateUserID) AND (cas.SupervisorDelegateId = sd.ID OR (cas.CandidateAssessmentID IS NULL)
240-
AND ((sa.SupervisorSelfAssessmentReview = 1) OR (sa.SupervisorResultsReview = 1)))) AS CandidateAssessmentCount,
241-
CAST(COALESCE (au2.IsNominatedSupervisor, 0) AS Bit) AS DelegateIsNominatedSupervisor,
242-
CAST(COALESCE (au2.IsSupervisor, 0) AS Bit) AS DelegateIsSupervisor,
243-
da.ID AS Expr1
244-
FROM CustomPrompts AS cp6
245-
RIGHT OUTER JOIN CustomPrompts AS cp5
246-
RIGHT OUTER JOIN DelegateAccounts AS da
247-
RIGHT OUTER JOIN SupervisorDelegates AS sd
248-
INNER JOIN AdminUsers AS au
249-
ON sd.SupervisorAdminID = au.AdminID
250-
INNER JOIN Centres AS ct
251-
ON au.CentreID = ct.CentreID
252-
ON da.CentreID = ct.CentreID
253-
AND da.UserID = sd.DelegateUserID
254-
LEFT OUTER JOIN Users AS u
255-
LEFT OUTER JOIN JobGroups AS jg
256-
ON u.JobGroupID = jg.JobGroupID
257-
ON da.UserID = u.ID
258-
LEFT OUTER JOIN CustomPrompts AS cp1
259-
ON ct.CustomField1PromptID = cp1.CustomPromptID
260-
LEFT OUTER JOIN CustomPrompts AS cp2
261-
ON ct.CustomField2PromptID = cp2.CustomPromptID
262-
LEFT OUTER JOIN CustomPrompts AS cp3
263-
ON ct.CustomField3PromptID = cp3.CustomPromptID
264-
LEFT OUTER JOIN CustomPrompts AS cp4
265-
ON ct.CustomField4PromptID = cp4.CustomPromptID
266-
ON cp5.CustomPromptID = ct.CustomField5PromptID
267-
ON cp6.CustomPromptID = ct.CustomField6PromptID
268-
LEFT OUTER JOIN AdminAccounts AS au2
269-
ON da.UserID = au2.UserID AND da.CentreID = au2.CentreID
270-
WHERE (sd.SupervisorAdminID = @adminId) AND
271-
(u.ID = da.UserID OR sd.DelegateUserID IS NULL)
272-
ORDER BY u.LastName, COALESCE (u.FirstName, sd.DelegateEmail)
273-
", new { adminId }
274-
);
275-
}
276-
277221
public IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId)
278222
{
279223
return connection.Query<SupervisorDelegateDetail>(

‎DigitalLearningSolutions.Web.Tests/Controllers/SupervisorController/SupervisorControllerTests.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class SupervisorControllerTests
4848
private ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService = null!;
4949
private IPdfService pdfService = null!;
5050
private SupervisorController controller = null!;
51+
private ICourseCategoriesService courseCategoriesService = null!;
5152

5253
[SetUp]
5354
public void Setup()
@@ -106,7 +107,8 @@ public void Setup()
106107
emailService,
107108
candidateAssessmentDownloadFileService,
108109
clockUtility,
109-
pdfService
110+
pdfService,
111+
courseCategoriesService
110112
);
111113
controller.ControllerContext = new ControllerContext
112114
{ HttpContext = new DefaultHttpContext { User = user } };
@@ -160,6 +162,7 @@ public void ReviewDelegateSelfAssessment_Should_Return_View_With_Optional_Compet
160162
// Given
161163
int candidateAssessmentId = 1;
162164
int supervisorDelegateId = 2;
165+
int? adminIdCategoryId = 0;
163166
var superviseDelegate = SupervisorTagTestHelper.CreateDefaultSupervisorDelegateDetail();
164167
var delegateSelfAssessment = SupervisorTagTestHelper.CreateDefaultDelegateSelfAssessment();
165168
var appliedFilterViewModel = new List<AppliedFilterViewModel>();
@@ -189,7 +192,7 @@ public void ReviewDelegateSelfAssessment_Should_Return_View_With_Optional_Compet
189192

190193
A.CallTo(() => supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, AdminId, 0))
191194
.Returns(superviseDelegate);
192-
A.CallTo(() => supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, AdminId))
195+
A.CallTo(() => supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, AdminId, adminIdCategoryId))
193196
.Returns(delegateSelfAssessment);
194197
A.CallTo(() => selfAssessmentService.GetMostRecentResults(SelfAssessmentId, DelegateUserId))
195198
.Returns(competencies);
@@ -215,6 +218,7 @@ public void ReviewDelegateSelfAssessment_Should_Return_View_With_Optional_Filter
215218
// Given
216219
int candidateAssessmentId = 1;
217220
int supervisorDelegateId = 2;
221+
int? adminIdCategoryId = 0;
218222
var superviseDelegate = SupervisorTagTestHelper.CreateDefaultSupervisorDelegateDetail();
219223
var delegateSelfAssessment = SupervisorTagTestHelper.CreateDefaultDelegateSelfAssessment();
220224
SearchSupervisorCompetencyViewModel searchModel = null!;
@@ -250,7 +254,7 @@ public void ReviewDelegateSelfAssessment_Should_Return_View_With_Optional_Filter
250254

251255
A.CallTo(() => supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, AdminId, 0))
252256
.Returns(superviseDelegate);
253-
A.CallTo(() => supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, AdminId))
257+
A.CallTo(() => supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, AdminId, adminIdCategoryId))
254258
.Returns(delegateSelfAssessment);
255259
A.CallTo(() => selfAssessmentService.GetMostRecentResults(SelfAssessmentId, DelegateUserId))
256260
.Returns(competencies);

‎DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public IActionResult MyStaffList(
5959
var supervisorEmail = GetUserEmail();
6060
var loggedInAdminUser = userService.GetAdminUserById(adminId);
6161
var centreRegistrationPrompts = centreRegistrationPromptsService.GetCentreRegistrationPromptsByCentreId(centreId);
62-
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId);
62+
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId, loggedInAdminUser.CategoryId);
6363
if (!supervisorDelegateDetails.Any())
6464
{
6565
supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(adminId);
@@ -1440,7 +1440,7 @@ public async Task<IActionResult> DownloadCertificate(int candidateAssessmentId)
14401440
{
14411441
return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
14421442
}
1443-
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value);
1443+
var supervisorDelegateDetails = supervisorService.GetSupervisorDelegateDetailsForAdminId(adminId.Value, loggedInAdminUser.CategoryId);
14441444
var checkSupervisorDelegate = supervisorDelegateDetails.Where(x => x.DelegateUserID == competencymaindata.LearnerId).FirstOrDefault();
14451445
if (checkSupervisorDelegate == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 });
14461446
var delegateUserId = competencymaindata.LearnerId;

‎DigitalLearningSolutions.Web/Services/SupervisorService.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ public interface ISupervisorService
3232
CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId);
3333
SelfAssessmentResultSummary? GetSelfAssessmentResultSummary(int candidateAssessmentId, int supervisorDelegateId);
3434
IEnumerable<CandidateAssessmentSupervisorVerificationSummary> GetCandidateAssessmentSupervisorVerificationSummaries(int candidateAssessmentId);
35-
IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID);
35+
IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CentreID, int CategoryID);
3636
IEnumerable<SupervisorDelegateDetail> GetSupervisorDelegateDetailsForAdminIdWithoutRemovedClause(int adminId);
3737
SupervisorDelegateDetail GetSupervisorDelegateDetailsByIdWithoutRemoveClause(int supervisorDelegateId, int adminId, int delegateUserId);
38+
3839
//UPDATE DATA
3940
bool ConfirmSupervisorDelegateById(int supervisorDelegateId, int candidateId, int adminId);
4041
bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateUserId, int adminId);

0 commit comments

Comments
 (0)