Skip to content

Commit edd6477

Browse files
kevwhitt-heekevwhitt-hee
committed
Merge branch 'master' into Automatic_version_update_dependabot
2 parents 6ecf639 + 17ad383 commit edd6477

File tree

15 files changed

+175
-32
lines changed

15 files changed

+175
-32
lines changed

‎.github/dependabot.yml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,35 @@
44
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
55

66
version: 2
7+
registries:
8+
tel-azure-package-source:
9+
type: nuget-feed
10+
url: "https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json"
11+
username: "kevin.whittaker"
12+
password: ${{ secrets.AZURE_DEVOPS_PAT }}
13+
nuget-package-source:
14+
type: nuget-feed
15+
url: "https://api.nuget.org/v3/index.json"
716
updates:
817
- package-ecosystem: "nuget"
918
directory: "/" # Location of package manifests
1019
schedule:
1120
interval: "daily"
1221
open-pull-requests-limit: 10
22+
registries:
23+
- tel-azure-package-source
24+
- nuget-package-source
1325
target-branch: "Automatic_version_update_dependabot"
1426
ignore:
1527
# Ignore updates to packages that start with 'Wildcards'
1628
- dependency-name: "Microsoft.FeatureManagement.AspNetCore*"
1729
# Ignore some updates to the package
1830
- dependency-name: "Microsoft.VisualStudio.Web.CodeGeneration.Design"
19-
versions: [">7.0.0"]
31+
versions: [">9.0.0"]
2032
- dependency-name: "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"
21-
versions: [">7.0.0"]
33+
versions: [">9.0.0"]
2234
- dependency-name: "Microsoft.AspNetCore.Mvc.Testing"
23-
versions: [">7.0.0"]
35+
versions: [">9.0.0"]
2436
- dependency-name: "Selenium.WebDriver.ChromeDriver"
2537
versions: ">=113.0.5672.1278" # Recommended version
2638
# For all packages, ignore all patch updates
@@ -34,7 +46,7 @@ updates:
3446
interval: "daily"
3547
target-branch: "Automatic_version_update_dependabot"
3648
# - "dependencies"
37-
open-pull-requests-limit: 7
49+
open-pull-requests-limit: 10
3850
ignore:
3951
- dependency-name: "*"
4052
update-types: ["version-update:semver-major"]

‎.github/workflows/auto-merge.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@ jobs:
6969
echo "Skipping 'auto-merge' workflow check to prevent self-referencing."
7070
continue
7171
fi
72-
72+
73+
# If any check is still queued, set ALL_COMPLETED to false
74+
if [[ "$status" == "QUEUED" ]]; then
75+
ALL_COMPLETED=false
76+
fi
77+
7378
# If any check is still in progress, set ALL_COMPLETED to false
7479
if [[ "$status" == "IN_PROGRESS" ]]; then
7580
ALL_COMPLETED=false

‎DigitalLearningSolutions.Data.Migrations/202412020900_UpdateCandidateAssessmentSupervisorsTable.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202412020900)]
6+
public class UpdateCandidateAssessmentSupervisorsTable : ForwardOnlyMigration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql($@"UPDATE cas
11+
SET SelfAssessmentSupervisorRoleID = (SELECT ID FROM SelfAssessmentSupervisorRoles
12+
WHERE SelfAssessmentID = ssr.SelfAssessmentID and AllowDelegateNomination = 1)
13+
FROM CandidateAssessmentSupervisors cas INNER JOIN
14+
SelfAssessmentSupervisorRoles ssr ON cas.SelfAssessmentSupervisorRoleID = ssr.ID
15+
AND cas.Removed IS NULL AND ssr.AllowDelegateNomination = 0 INNER JOIN
16+
SupervisorDelegates sd ON cas.SupervisorDelegateId = sd.ID INNER JOIN
17+
AdminAccounts aa ON sd.SupervisorAdminID = aa.ID
18+
WHERE aa.IsSupervisor = 0 AND aa.IsNominatedSupervisor = 1
19+
-- to exclude duplicate CandidateAssessmentID from update
20+
AND cas.CandidateAssessmentID NOT IN (
21+
SELECT CandidateAssessmentID FROM CandidateAssessmentSupervisors WHERE CandidateAssessmentID in (
22+
SELECT Cas2.CandidateAssessmentID
23+
FROM CandidateAssessmentSupervisors cas2 with (nolock) INNER JOIN
24+
SelfAssessmentSupervisorRoles ssr2 with (nolock) ON cas2.SelfAssessmentSupervisorRoleID = ssr2.ID
25+
AND cas2.Removed IS NULL AND ssr2.AllowDelegateNomination = 0 INNER JOIN
26+
SupervisorDelegates sd2 with (nolock) ON cas2.SupervisorDelegateId = sd2.ID INNER JOIN
27+
AdminAccounts aa2 with (nolock) ON sd2.SupervisorAdminID = aa2.ID
28+
WHERE aa2.IsSupervisor = 0 AND aa2.IsNominatedSupervisor = 1
29+
)
30+
GROUP BY CandidateAssessmentID,SupervisorDelegateId
31+
HAVING COUNT(*)>1
32+
)"
33+
);
34+
}
35+
}
36+
}

‎DigitalLearningSolutions.Data/DataServices/CourseDataService.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ LEFT OUTER JOIN UserCentreDetails AS UCD ON
542542
new { candidateAssessmentId, enrolmentMethodId, completeByDateDynamic }
543543
);
544544
}
545-
if (candidateAssessmentId > 1 && supervisorDelegateId !=0)
545+
if (candidateAssessmentId > 1 && supervisorDelegateId != 0)
546546
{
547547
string sqlQuery = $@"
548548
BEGIN TRANSACTION
@@ -551,17 +551,17 @@ BEGIN TRANSACTION
551551
552552
UPDATE CandidateAssessmentSupervisors SET Removed = NULL
553553
{((selfAssessmentSupervisorRoleId > 0) ? " ,SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID" : string.Empty)}
554-
WHERE CandidateAssessmentID = @candidateAssessmentId
554+
WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId
555555
556556
COMMIT TRANSACTION";
557557

558558
connection.Execute(sqlQuery
559-
, new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic });
559+
, new { candidateAssessmentId, selfAssessmentSupervisorRoleId, enrolmentMethodId, completeByDateDynamic, supervisorDelegateId });
560560
}
561561

562562
if (supervisorId > 0)
563563
{
564-
564+
565565
var adminUserId = Convert.ToInt32(connection.ExecuteScalar(@"SELECT UserID FROM AdminAccounts WHERE (AdminAccounts.ID = @supervisorId)",
566566
new { supervisorId })
567567
);

‎DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs‎

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,85 @@
88

99
public partial class SelfAssessmentDataService
1010
{
11+
public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId, int? adminIdCategoryID)
12+
{
13+
return connection.Query<CurrentSelfAssessment>(
14+
@"SELECT SelfAssessment.Id,
15+
SelfAssessment.Name,
16+
SelfAssessment.Description,
17+
SelfAssessment.IncludesSignposting,
18+
SelfAssessment.IncludeRequirementsFilters,
19+
SelfAssessment. IsSupervisorResultsReviewed,
20+
SelfAssessment.ReviewerCommentsLabel,
21+
SelfAssessment. Vocabulary,
22+
SelfAssessment. NumberOfCompetencies,
23+
SelfAssessment.StartedDate,
24+
SelfAssessment.LastAccessed,
25+
SelfAssessment.CompleteByDate,
26+
SelfAssessment.CandidateAssessmentId,
27+
SelfAssessment.UserBookmark,
28+
SelfAssessment.UnprocessedUpdates,
29+
SelfAssessment.LaunchCount,
30+
SelfAssessment. IsSelfAssessment,
31+
SelfAssessment.SubmittedDate,
32+
SelfAssessment. CentreName,
33+
SelfAssessment.EnrolmentMethodId,
34+
Signoff.SignedOff,
35+
Signoff.Verified,
36+
EnrolledByForename +' '+EnrolledBySurname AS EnrolledByFullName
37+
FROM (SELECT
38+
CA.SelfAssessmentID AS Id,
39+
SA.Name,
40+
SA.Description,
41+
SA.IncludesSignposting,
42+
SA.IncludeRequirementsFilters,
43+
SA.SupervisorResultsReview AS IsSupervisorResultsReviewed,
44+
SA.ReviewerCommentsLabel,
45+
COALESCE(SA.Vocabulary, 'Capability') AS Vocabulary,
46+
COUNT(C.ID) AS NumberOfCompetencies,
47+
CA.StartedDate,
48+
CA.LastAccessed,
49+
CA.CompleteByDate,
50+
CA.ID AS CandidateAssessmentId,
51+
CA.UserBookmark,
52+
CA.UnprocessedUpdates,
53+
CA.LaunchCount,
54+
1 AS IsSelfAssessment,
55+
CA.SubmittedDate,
56+
CR.CentreName AS CentreName,
57+
CA.EnrolmentMethodId,
58+
uEnrolledBy.FirstName AS EnrolledByForename,
59+
uEnrolledBy.LastName AS EnrolledBySurname
60+
FROM Centres AS CR INNER JOIN
61+
CandidateAssessments AS CA INNER JOIN
62+
SelfAssessments AS SA ON CA.SelfAssessmentID = SA.ID ON CR.CentreID = CA.CentreID INNER JOIN
63+
CentreSelfAssessments AS csa ON csa.SelfAssessmentID = SA.ID AND csa.CentreID = @centreId LEFT OUTER JOIN
64+
Competencies AS C RIGHT OUTER JOIN
65+
SelfAssessmentStructure AS SAS ON C.ID = SAS.CompetencyID ON CA.SelfAssessmentID = SAS.SelfAssessmentID LEFT OUTER JOIN
66+
CandidateAssessmentSupervisors AS cas ON ca.ID =cas.CandidateAssessmentID LEFT OUTER JOIN
67+
CandidateAssessmentSupervisorVerifications AS casv ON casv.CandidateAssessmentSupervisorID = cas.ID LEFT OUTER JOIN
68+
AdminAccounts AS aaEnrolledBy ON aaEnrolledBy.ID = CA.EnrolledByAdminID LEFT OUTER JOIN
69+
Users AS uEnrolledBy ON uEnrolledBy.ID = aaEnrolledBy.UserID
70+
WHERE (CA.DelegateUserID = @delegateUserId) AND (CA.RemovedDate IS NULL) AND (CA.CompletedDate IS NULL)
71+
AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)
72+
GROUP BY
73+
CA.SelfAssessmentID, SA.Name, SA.Description, SA.IncludesSignposting, SA.SupervisorResultsReview,
74+
SA.ReviewerCommentsLabel, SA.IncludeRequirementsFilters,
75+
COALESCE(SA.Vocabulary, 'Capability'), CA.StartedDate, CA.LastAccessed, CA.CompleteByDate,
76+
CA.ID,
77+
CA.UserBookmark, CA.UnprocessedUpdates, CA.LaunchCount, CA.SubmittedDate, CR.CentreName,CA.EnrolmentMethodId,
78+
uEnrolledBy.FirstName,uEnrolledBy.LastName)SelfAssessment LEFT OUTER JOIN
79+
(SELECT SelfAssessmentID,casv.SignedOff,MAX(casv.Verified) Verified FROM
80+
CandidateAssessments AS CA LEFT OUTER JOIN
81+
CandidateAssessmentSupervisors AS cas ON ca.ID =cas.CandidateAssessmentID LEFT OUTER JOIN
82+
CandidateAssessmentSupervisorVerifications AS casv ON casv.CandidateAssessmentSupervisorID = cas.ID
83+
WHERE (CA.DelegateUserID = @delegateUserId) AND (CA.RemovedDate IS NULL) AND (CA.CompletedDate IS NULL) AND (casv.SignedOff = 1) AND
84+
(casv.Verified IS NOT NULL)
85+
GROUP BY SelfAssessmentID,casv.SignedOff
86+
)Signoff ON SelfAssessment.Id =Signoff.SelfAssessmentID",
87+
new { delegateUserId, centreId, adminIdCategoryID }
88+
);
89+
}
1190
public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId)
1291
{
1392
return connection.Query<CurrentSelfAssessment>(
@@ -86,7 +165,6 @@ CandidateAssessments AS CA LEFT OUTER JOIN
86165
new { delegateUserId, centreId }
87166
);
88167
}
89-
90168
public CurrentSelfAssessment? GetSelfAssessmentForCandidateById(int delegateUserId, int selfAssessmentId)
91169
{
92170
return connection.QueryFirstOrDefault<CurrentSelfAssessment>(

‎DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public IEnumerable<Competency> GetResultSupervisorVerifications(int selfAssessme
288288
INNER JOIN DelegateAccounts DA1 ON CA.DelegateUserID = DA1.UserID AND au.CentreID = DA1.CentreID AND DA1.Active=1
289289
WHERE (LAR.Verified IS NULL) 
290290
AND ((LAR.Result IS NOT NULL) OR (LAR.SupportingComments IS NOT NULL)) 
291-
AND (LAR.Requested IS NOT NULL)
291+
AND (LAR.Requested IS NOT NULL) AND (au.CategoryID = 0 OR au.CategoryID = (select CategoryID from SelfAssessments where ID = @selfAssessmentId))
292292
ORDER BY SupervisorVerificationRequested DESC, C.Name",
293293
(competency, assessmentQuestion) =>
294294
{

‎DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ int competencyId
7272

7373
// CandidateAssessmentsDataService
7474

75+
IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId, int? adminIdCategoryID);
7576
IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId);
76-
7777
CurrentSelfAssessment? GetSelfAssessmentForCandidateById(int delegateUserId, int selfAssessmentId);
7878

7979
void UpdateLastAccessed(int selfAssessmentId, int delegateUserId);
@@ -174,7 +174,6 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
174174
bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId);
175175
int GetSelfAssessmentCategoryId(int selfAssessmentId);
176176
}
177-
178177
public partial class SelfAssessmentDataService : ISelfAssessmentDataService
179178
{
180179
private readonly IDbConnection connection;

‎DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public interface ISupervisorDataService
2222
DelegateSelfAssessment? GetSelfAssessmentByCandidateAssessmentId(int candidateAssessmentId, int adminId, int? adminIdCategoryId);
2323
IEnumerable<SupervisorDashboardToDoItem> GetSupervisorDashboardToDoItemsForRequestedSignOffs(int adminId);
2424
IEnumerable<SupervisorDashboardToDoItem> GetSupervisorDashboardToDoItemsForRequestedReviews(int adminId);
25-
DelegateSelfAssessment? GetSelfAssessmentBaseByCandidateAssessmentId(int candidateAssessmentId);
25+
DelegateSelfAssessment? GetSelfAssessmentBaseByCandidateAssessmentId(int candidateAssessmentId, int? adminIdCategoryId);
2626
IEnumerable<RoleProfile> GetAvailableRoleProfilesForDelegate(int candidateId, int centreId, int? categoryId);
2727
RoleProfile? GetRoleProfileById(int selfAssessmentId);
2828
IEnumerable<SelfAssessmentSupervisorRole> GetSupervisorRolesForSelfAssessment(int selfAssessmentId);
@@ -594,7 +594,7 @@ FROM CandidateAssessmentSupervisors AS cas INNER JOIN
594594
WHERE (ca.RemovedDate IS NULL) AND (cas.SupervisorDelegateId = @supervisorDelegateId) AND (cas.Removed IS NULL) AND (sa.ID = @selfAssessmentId)", new { selfAssessmentId, supervisorDelegateId }
595595
).FirstOrDefault();
596596
}
597-
public DelegateSelfAssessment? GetSelfAssessmentBaseByCandidateAssessmentId(int candidateAssessmentId)
597+
public DelegateSelfAssessment? GetSelfAssessmentBaseByCandidateAssessmentId(int candidateAssessmentId, int? adminIdCategoryId)
598598
{
599599
return connection.Query<DelegateSelfAssessment>(
600600
@$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.QuestionLabel, sa.DescriptionLabel, sa.ReviewerCommentsLabel,
@@ -611,7 +611,7 @@ FROM SelfAssessmentResultSupervisorVerifications AS sarsv
611611
FROM CandidateAssessmentSupervisors AS cas INNER JOIN
612612
CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN
613613
SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID
614-
WHERE (ca.ID = @candidateAssessmentId)", new { candidateAssessmentId }
614+
WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId }
615615
).FirstOrDefault();
616616
}
617617
public DelegateSelfAssessment? GetSelfAssessmentBySupervisorDelegateCandidateAssessmentId(int candidateAssessmentId, int supervisorDelegateId)

‎DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,10 @@ bool isCentreManager
279279
IsContentCreator = @isContentCreator,
280280
IsContentManager = @isContentManager,
281281
ImportOnly = @importOnly,
282-
CategoryID = @categoryId,
282+
CategoryID = CASE
283+
WHEN @categoryID = 0 THEN NULL
284+
ELSE @categoryID
285+
END,
283286
IsCentreManager = @isCentreManager
284287
WHERE ID = @adminId",
285288
new

0 commit comments

Comments
 (0)