Skip to content

Dls release v1.2.1 hotfix to production #3316

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 6 commits into from
Jul 8, 2025
Merged

Dls release v1.2.1 hotfix to production #3316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4efaeda
TD-5759 Refactors self assessment report sql to use SP, CTE and TVF
kevwhitt-hee Jul 3, 2025
d22f00a
Merge pull request #3309 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 3, 2025
89fa017
TD-5759 Fixes incorrect column names in sp return table
kevwhitt-hee Jul 4, 2025
202431b
Merge pull request #3311 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 4, 2025
d1f2f0c
Fixes "Learner" column name
kevwhitt-hee Jul 4, 2025
63b8659
Merge pull request #3312 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 4, 2025
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
17 changes: 17 additions & 0 deletions ...talLearningSolutions.Data.Migrations/202507030918_CreateOrAlterGetSelfAssessmentReport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(20250703091)]
public class CreateOrAlterGetSelfAssessmentReport : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5759_CreateOrAlterSelfAssessmentReportSPandTVF_UP);
}
public override void Down()
{
Execute.Sql("DROP PROCEDURE IF EXISTS [dbo].[usp_GetSelfAssessmentReport]");
Execute.Sql("DROP FUNCTION IF EXISTS [dbo].[GetOtherCentresForSelfAssessmentTVF]");
}
}
}
12 changes: 12 additions & 0 deletions ...LearningSolutions.Data.Migrations/202507040803_FixCreateOrAlterGetSelfAssessmentReport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202507040803)]
public class FixCreateOrAlterGetSelfAssessmentReport : ForwardOnlyMigration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5759_CreateOrAlterSelfAssessmentReportSPandTVF_Fix_UP);
}
}
}
50 changes: 50 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 @@ -487,4 +487,10 @@
<data name="TD_5447_Alter_ReorderFrameworkCompetency_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5447-Alter_ReorderFrameworkCompetency_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="TD-5759_CreateOrAlterSelfAssessmentReportSPandTVF_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5759_CreateOrAlterSelfAssessmentReportSPandTVF_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="TD-5759_CreateOrAlterSelfAssessmentReportSPandTVF-Fix_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5759_CreateOrAlterSelfAssessmentReportSPandTVF-Fix_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
</root>
117 changes: 117 additions & 0 deletions ...ions.Data.Migrations/Scripts/TD-5759_CreateOrAlterSelfAssessmentReportSPandTVF-Fix_UP.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
CREATE OR ALTER PROCEDURE [dbo].[usp_GetSelfAssessmentReport]
@SelfAssessmentID INT,
@CentreID INT
AS
BEGIN
SET NOCOUNT ON;

-- Step 1: Materialize the LatestAssessmentResults into a temp table
IF OBJECT_ID('tempdb..#LatestAssessmentResults') IS NOT NULL
DROP TABLE #LatestAssessmentResults;

SELECT
s.DelegateUserID,
CASE WHEN COALESCE(rr.LevelRAG, 0) = 3 THEN s.ID ELSE NULL END AS SelfAssessed,
CASE
WHEN sv.Verified IS NOT NULL AND sv.SignedOff = 1 AND COALESCE(rr.LevelRAG, 0) = 3
THEN s.ID ELSE NULL
END AS Confirmed,
CASE WHEN sas.Optional = 1 THEN s.CompetencyID ELSE NULL END AS Optional
INTO #LatestAssessmentResults
FROM SelfAssessmentResults AS s
LEFT JOIN SelfAssessmentStructure AS sas
ON sas.SelfAssessmentID = @SelfAssessmentID
AND s.CompetencyID = sas.CompetencyID
LEFT JOIN SelfAssessmentResultSupervisorVerifications AS sv
ON s.ID = sv.SelfAssessmentResultId
AND sv.Superceded = 0
LEFT JOIN CompetencyAssessmentQuestionRoleRequirements AS rr
ON s.CompetencyID = rr.CompetencyID
AND s.AssessmentQuestionID = rr.AssessmentQuestionID
AND sas.SelfAssessmentID = rr.SelfAssessmentID
AND s.Result = rr.LevelValue
WHERE sas.SelfAssessmentID = @SelfAssessmentID;

CREATE NONCLUSTERED INDEX IX_LAR_DelegateUserID ON #LatestAssessmentResults(DelegateUserID);

-- Step 2: Run the main query
SELECT
sa.Name AS SelfAssessment,
u.LastName + ', ' + u.FirstName AS Learner,
da.Active AS LearnerActive,
u.ProfessionalRegistrationNumber AS PRN,
jg.JobGroupName AS JobGroup,
da.Answer1 AS RegistrationAnswer1,
da.Answer2 AS RegistrationAnswer2,
da.Answer3 AS RegistrationAnswer3,
da.Answer4 AS RegistrationAnswer4,
da.Answer5 AS RegistrationAnswer5,
da.Answer6 AS RegistrationAnswer6,
oc.OtherCentres,
CASE
WHEN aa.ID IS NULL THEN 'Learner'
WHEN aa.IsCentreManager = 1 THEN 'Centre Manager'
WHEN aa.IsCentreAdmin = 1 AND aa.IsCentreManager = 0 THEN 'Centre Admin'
WHEN aa.IsSupervisor = 1 THEN 'Supervisor'
WHEN aa.IsNominatedSupervisor = 1 THEN 'Nominated supervisor'
END AS DLSRole,
da.DateRegistered AS Registered,
ca.StartedDate AS [Started],
ca.LastAccessed,
COUNT(DISTINCT LAR.Optional) AS [OptionalProficienciesAssessed],
COUNT(DISTINCT LAR.SelfAssessed) AS [SelfAssessedAchieved],
COUNT(DISTINCT LAR.Confirmed) AS [ConfirmedResults],
MAX(casv.Requested) AS SignOffRequested,
MAX(1 * casv.SignedOff) AS SignOffAchieved,
MIN(casv.Verified) AS ReviewedDate
FROM CandidateAssessments AS ca
INNER JOIN DelegateAccounts AS da
ON ca.DelegateUserID = da.UserID
AND da.CentreID = @CentreID
INNER JOIN Users AS u
ON u.ID = da.UserID
INNER JOIN SelfAssessments AS sa
ON ca.SelfAssessmentID = sa.ID
INNER JOIN CentreSelfAssessments AS csa
ON sa.ID = csa.SelfAssessmentID
INNER JOIN Centres AS c
ON csa.CentreID = c.CentreID
AND da.CentreID = c.CentreID
INNER JOIN JobGroups AS jg
ON u.JobGroupID = jg.JobGroupID
LEFT JOIN AdminAccounts AS aa
ON da.UserID = aa.UserID
AND aa.CentreID = da.CentreID
AND aa.Active = 1
LEFT JOIN CandidateAssessmentSupervisors AS cas
ON ca.ID = cas.CandidateAssessmentID
LEFT JOIN CandidateAssessmentSupervisorVerifications AS casv
ON casv.CandidateAssessmentSupervisorID = cas.ID
LEFT JOIN SupervisorDelegates AS sd
ON cas.SupervisorDelegateId = sd.ID
LEFT JOIN #LatestAssessmentResults AS LAR
ON LAR.DelegateUserID = ca.DelegateUserID
OUTER APPLY dbo.GetOtherCentresForSelfAssessmentTVF(da.UserID, @SelfAssessmentID, c.CentreID) AS oc
WHERE
sa.ID = @SelfAssessmentID
AND sa.ArchivedDate IS NULL
AND c.Active = 1
AND ca.RemovedDate IS NULL
AND ca.NonReportable = 0
GROUP BY
sa.Name,
u.LastName + ', ' + u.FirstName,
da.Active,
u.ProfessionalRegistrationNumber,
jg.JobGroupName,
da.Answer1, da.Answer2, da.Answer3, da.Answer4, da.Answer5, da.Answer6,
da.DateRegistered,
ca.StartedDate,
ca.LastAccessed,
oc.OtherCentres,
aa.ID, aa.IsCentreManager, aa.IsCentreAdmin, aa.IsSupervisor, aa.IsNominatedSupervisor
ORDER BY
sa.Name, u.LastName + ', ' + u.FirstName;

END;
GO
145 changes: 145 additions & 0 deletions ...olutions.Data.Migrations/Scripts/TD-5759_CreateOrAlterSelfAssessmentReportSPandTVF_UP.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
CREATE OR ALTER FUNCTION dbo.GetOtherCentresForSelfAssessmentTVF
(
@UserID INT,
@SelfAssessmentID INT,
@ExcludeCentreID INT
)
RETURNS TABLE
AS
RETURN
(
SELECT
STUFF((
SELECT DISTINCT
', ' + c.CentreName
FROM Users AS u
INNER JOIN DelegateAccounts AS da ON u.ID = da.UserID
INNER JOIN Centres AS c ON da.CentreID = c.CentreID
INNER JOIN CentreSelfAssessments AS csa ON c.CentreID = csa.CentreID
WHERE u.ID = @UserID
AND da.Active = 1
AND da.Approved = 1
AND csa.SelfAssessmentID = @SelfAssessmentID
AND c.CentreID <> @ExcludeCentreID
FOR XML PATH(''), TYPE
).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS OtherCentres
);
GO

CREATE OR ALTER PROCEDURE [dbo].[usp_GetSelfAssessmentReport]
@SelfAssessmentID INT,
@CentreID INT
AS
BEGIN
SET NOCOUNT ON;

-- Step 1: Materialize the LatestAssessmentResults into a temp table
IF OBJECT_ID('tempdb..#LatestAssessmentResults') IS NOT NULL
DROP TABLE #LatestAssessmentResults;

SELECT
s.DelegateUserID,
CASE WHEN COALESCE(rr.LevelRAG, 0) = 3 THEN s.ID ELSE NULL END AS SelfAssessed,
CASE
WHEN sv.Verified IS NOT NULL AND sv.SignedOff = 1 AND COALESCE(rr.LevelRAG, 0) = 3
THEN s.ID ELSE NULL
END AS Confirmed,
CASE WHEN sas.Optional = 1 THEN s.CompetencyID ELSE NULL END AS Optional
INTO #LatestAssessmentResults
FROM SelfAssessmentResults AS s
LEFT JOIN SelfAssessmentStructure AS sas
ON sas.SelfAssessmentID = @SelfAssessmentID
AND s.CompetencyID = sas.CompetencyID
LEFT JOIN SelfAssessmentResultSupervisorVerifications AS sv
ON s.ID = sv.SelfAssessmentResultId
AND sv.Superceded = 0
LEFT JOIN CompetencyAssessmentQuestionRoleRequirements AS rr
ON s.CompetencyID = rr.CompetencyID
AND s.AssessmentQuestionID = rr.AssessmentQuestionID
AND sas.SelfAssessmentID = rr.SelfAssessmentID
AND s.Result = rr.LevelValue
WHERE sas.SelfAssessmentID = @SelfAssessmentID;

CREATE NONCLUSTERED INDEX IX_LAR_DelegateUserID ON #LatestAssessmentResults(DelegateUserID);

-- Step 2: Run the main query
SELECT
sa.Name AS SelfAssessment,
u.LastName + ', ' + u.FirstName AS Learner,
da.Active AS LearnerActive,
u.ProfessionalRegistrationNumber AS PRN,
jg.JobGroupName AS JobGroup,
da.Answer1,
da.Answer2,
da.Answer3,
da.Answer4,
da.Answer5,
da.Answer6,
oc.OtherCentres,
CASE
WHEN aa.ID IS NULL THEN 'Learner'
WHEN aa.IsCentreManager = 1 THEN 'Centre Manager'
WHEN aa.IsCentreAdmin = 1 AND aa.IsCentreManager = 0 THEN 'Centre Admin'
WHEN aa.IsSupervisor = 1 THEN 'Supervisor'
WHEN aa.IsNominatedSupervisor = 1 THEN 'Nominated supervisor'
END AS DLSRole,
da.DateRegistered AS Registered,
ca.StartedDate,
ca.LastAccessed,
COUNT(DISTINCT LAR.Optional) AS [OptionalProficienciesAssessed],
COUNT(DISTINCT LAR.SelfAssessed) AS [SelfAssessedAchieved],
COUNT(DISTINCT LAR.Confirmed) AS [ConfirmedResults],
MAX(casv.Requested) AS SignOffRequested,
MAX(1 * casv.SignedOff) AS SignOffAchieved,
MIN(casv.Verified) AS ReviewedDate
FROM CandidateAssessments AS ca
INNER JOIN DelegateAccounts AS da
ON ca.DelegateUserID = da.UserID
AND da.CentreID = @CentreID
INNER JOIN Users AS u
ON u.ID = da.UserID
INNER JOIN SelfAssessments AS sa
ON ca.SelfAssessmentID = sa.ID
INNER JOIN CentreSelfAssessments AS csa
ON sa.ID = csa.SelfAssessmentID
INNER JOIN Centres AS c
ON csa.CentreID = c.CentreID
AND da.CentreID = c.CentreID
INNER JOIN JobGroups AS jg
ON u.JobGroupID = jg.JobGroupID
LEFT JOIN AdminAccounts AS aa
ON da.UserID = aa.UserID
AND aa.CentreID = da.CentreID
AND aa.Active = 1
LEFT JOIN CandidateAssessmentSupervisors AS cas
ON ca.ID = cas.CandidateAssessmentID
LEFT JOIN CandidateAssessmentSupervisorVerifications AS casv
ON casv.CandidateAssessmentSupervisorID = cas.ID
LEFT JOIN SupervisorDelegates AS sd
ON cas.SupervisorDelegateId = sd.ID
LEFT JOIN #LatestAssessmentResults AS LAR
ON LAR.DelegateUserID = ca.DelegateUserID
OUTER APPLY dbo.GetOtherCentresForSelfAssessmentTVF(da.UserID, @SelfAssessmentID, c.CentreID) AS oc
WHERE
sa.ID = @SelfAssessmentID
AND sa.ArchivedDate IS NULL
AND c.Active = 1
AND ca.RemovedDate IS NULL
AND ca.NonReportable = 0
GROUP BY
sa.Name,
u.LastName + ', ' + u.FirstName,
da.Active,
u.ProfessionalRegistrationNumber,
jg.JobGroupName,
da.Answer1, da.Answer2, da.Answer3, da.Answer4, da.Answer5, da.Answer6,
da.DateRegistered,
ca.StartedDate,
ca.LastAccessed,
oc.OtherCentres,
aa.ID, aa.IsCentreManager, aa.IsCentreAdmin, aa.IsSupervisor, aa.IsNominatedSupervisor
ORDER BY
sa.Name, u.LastName + ', ' + u.FirstName;

END;
GO
Loading
Loading