Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
5ea3ce0
Bump Microsoft.VisualStudio.Web.CodeGeneration.Design
dependabot[bot] Mar 10, 2025
9a0c7d4
Bump @babel/core from 7.26.9 to 7.26.10 in /DigitalLearningSolutions.…
dependabot[bot] Mar 11, 2025
786cdd4
Bump @babel/preset-typescript in /DigitalLearningSolutions.Web (#3195)
dependabot[bot] Mar 24, 2025
02ddb74
Bump fork-ts-checker-webpack-plugin in /DigitalLearningSolutions.Web …
dependabot[bot] Mar 31, 2025
9f99c3c
Bump webpack from 5.97.1 to 5.99.0 in /DigitalLearningSolutions.Web (…
dependabot[bot] Apr 7, 2025
389f288
Bump HtmlSanitizer from 8.0.795 to 9.0.884
dependabot[bot] Apr 24, 2025
476dc8d
Bump core-js from 3.40.0 to 3.42.0 in /DigitalLearningSolutions.Web (…
dependabot[bot] Apr 29, 2025
1679bb2
Bump @babel/preset-env in /DigitalLearningSolutions.Web (#3245)
dependabot[bot] Apr 30, 2025
02f79b1
Bump webpack from 5.99.0 to 5.99.8 in /DigitalLearningSolutions.Web (…
dependabot[bot] May 6, 2025
6dbd547
Bump webpack from 5.99.8 to 5.99.9 in /DigitalLearningSolutions.Web (…
dependabot[bot] May 20, 2025
97a7d8a
Bump @types/lodash in /DigitalLearningSolutions.Web (#3276)
dependabot[bot] May 20, 2025
f5ae3b1
Bump @babel/core from 7.26.10 to 7.27.4 in /DigitalLearningSolutions.…
dependabot[bot] May 30, 2025
5da1a6f
updated scss and layout files to rationalise .nhsuk overrides
frank-hee Jun 3, 2025
0a8cbba
Revert "updated scss and layout files to rationalise .nhsuk overrides"
frank-hee Jun 3, 2025
60e2c62
Reapply "updated scss and layout files to rationalise .nhsuk overrides"
frank-hee Jun 3, 2025
8c02dde
replacing accidental deletion of web.config
frank-hee Jun 4, 2025
5387096
Fix horizontal spacing issues on breadcrumbs and maincontentwrapper
frank-hee Jun 6, 2025
3baa32e
Fixed horizontal spacing around breadcrumbs and main content.
frank-hee Jun 6, 2025
0409d61
Replacing accidentally deleted files
frank-hee Jun 9, 2025
556f965
Restoring appsettings.Test.json
frank-hee Jun 9, 2025
63a4e27
restoring appsettings.Development.json
frank-hee Jun 9, 2025
196fc68
Bump core-js from 3.42.0 to 3.43.0 in /DigitalLearningSolutions.Web (…
dependabot[bot] Jun 9, 2025
3c39d1b
Bump @types/lodash in /DigitalLearningSolutions.Web (#3294)
dependabot[bot] Jun 18, 2025
b36bc8c
Merge pull request #3165 from TechnologyEnhancedLearning/dependabot/n…
rshrirohit Jun 19, 2025
2125cad
Merge pull request #3237 from TechnologyEnhancedLearning/dependabot/n…
rshrirohit Jun 19, 2025
95a3da4
Merge branch 'master' into Automatic_version_update_dependabot
rshrirohit Jun 19, 2025
339307f
TD-5670 Adds migrations for DB maintenance scripts
kevwhitt-hee Jun 20, 2025
6bdddeb
Merge pull request #3287 from TechnologyEnhancedLearning/Develop/Fixe…
frank-hee Jun 23, 2025
15214bf
TD-5709 fixes subquery returns multiple results error
kevwhitt-hee Jun 24, 2025
04054db
TD_5410_Adding config to the rate limiter so that we can conpare the …
ABSinhaa Jun 24, 2025
45313c8
TD-5621 Issue with the font/size showing for the headings/sub heading…
sherif-olaboye Jun 30, 2025
a092b18
TD-3223 Showing console '404' error when removing the delegate from a…
sherif-olaboye Jul 1, 2025
ce1d59c
TD-3223 Showing console '404' error when removing the delegate from …
sherif-olaboye Jul 1, 2025
dd8e58a
TD-5548 Issue showing 'some existing competency records changed order…
sherif-olaboye Jul 3, 2025
5547046
TD-5551-Sql modified - Requested date removed from the group by
auldrinpossa Jul 7, 2025
6661295
TD_5666_Framework Competency Group Description showing on Learning Po…
ABSinhaa Jul 7, 2025
753d6bc
Merge branch 'master' into DLS-Release-v1.2.2
rshrirohit Jul 8, 2025
fe3cceb
Merge pull request #3305 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 8, 2025
d3a6ec1
Merge pull request #3313 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 8, 2025
271f4d1
TD-5709 Added where clause to limit the results to active admin records
rshrirohit Jul 8, 2025
a17a7cd
Merge branch 'DLS-Release-v1.2.1-Hotfix' into DLS-Release-v1.2.2
rshrirohit Jul 9, 2025
1327415
TD-5771 Issue showing 'LearchingLaunched' field showing blank for all…
sherif-olaboye Jul 9, 2025
c864d26
Merge branch 'DLS-Release-v1.2.2' into Develop/Features/TD-5670-DBMai…
rshrirohit Jul 9, 2025
b7fc082
TD_5666 Made code changes after discussion and showed thee descriptio…
ABSinhaa Jul 10, 2025
0da58cd
Merge branch 'master' into DLS-Release-v1.2.2
rshrirohit Jul 16, 2025
596c1a1
Merge pull request #3297 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jul 21, 2025
52eb0a2
Merge pull request #3299 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
819f1b7
Merge pull request #3310 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
b36f6f8
Merge pull request #3315 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
180fa56
Merge pull request #3319 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
0508cdb
Merge pull request #3304 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 21, 2025
602a065
TD-5759-The CentreEmail and RegistrationEmail fields in the SQL query…
Auldrin-Possa Jul 21, 2025
d41fdb4
TD-5621 Align expander component on Review and Self-Assessment pages
sherif-olaboye Jul 22, 2025
af1c9d4
TD-5666_Test failed for View For Print functionality on the framework…
ABSinhaa Jul 24, 2025
332b079
Merge pull request #3326 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 25, 2025
bfac183
Merge pull request #3331 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 25, 2025
740b4d9
Merge branch 'DLS-Release-v1.2.1-Hotfix' into DLS-Release-v1.2.2
rshrirohit Jul 31, 2025
186b7fe
TD-4088 Implements supervisor launch tableau dashboard mechanism with…
kevwhitt-hee Jul 31, 2025
8bebdc6
Update SupervisorControllerTests.cs
kevwhitt-hee Jul 31, 2025
048acfd
Merge pull request #3328 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 4, 2025
dcc033d
Merge pull request #3338 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Aug 4, 2025
22a9fa2
TD_5410 Changes after discussion over moving the changs from class fi…
ABSinhaa Aug 12, 2025
195dfef
TD_5410 Changes after discussion, removing IConfiguration and Extra j…
ABSinhaa Aug 12, 2025
3745b6e
TD_5410 Reoving unwanted nuget packages, variable declarations and em…
ABSinhaa Aug 12, 2025
225b6ae
TD_5410_removing unwanted System from the namespace section.
ABSinhaa Aug 12, 2025
289a732
TD-5816-Moved ‘competencies update’ code before ‘competencies remove’…
Auldrin-Possa Aug 13, 2025
2733024
Merge pull request #3300 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 14, 2025
a1d4f31
Merge pull request #3346 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 14, 2025
aa7cb46
TD-5884- Managed header div positions and CSS classes to align the logo.
Auldrin-Possa Aug 18, 2025
4603e92
TD-5339 Self Assessment Process Agreement
rshrirohit Aug 19, 2025
378b7b6
TD-5339 Added migration nr a addiding DB column.
rshrirohit Aug 19, 2025
c4b040b
TD-5339 Changing text to pick up dynamic vocabulary
rshrirohit Aug 19, 2025
88d3659
Merge pull request #3350 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 21, 2025
618ee37
Merge pull request #3352 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Aug 21, 2025
254d3ab
Develop/Fixes/TD-5399-CorrectingRoutingAndAddingServiceFilter
rshrirohit Aug 22, 2025
70b7d6f
TD-6095- Modified CSS to fix certificate view.
Auldrin-Possa Aug 26, 2025
a97b036
TD-5339 CorrectingUnitTests
rshrirohit Aug 26, 2025
20b5f0b
TD-5339 Removing Unnecessary Code
rshrirohit Aug 26, 2025
f60486c
TD-5339 Removing unit test since related code is now removed
rshrirohit Aug 26, 2025
cfb2eb8
Merge pull request #3356 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 26, 2025
3b9a326
Merge pull request #3358 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 26, 2025
d0bb3e4
Revert "TD-5548 Issue showing 'some existing competency records chang…
rshrirohit Aug 27, 2025
e8073c7
Merge pull request #3359 from TechnologyEnhancedLearning/revert-3310-…
rshrirohit Aug 28, 2025
7b25b16
TD-6108 Updating ServiceFilter Logic To Exclude Other Areas
rshrirohit Aug 28, 2025
6c81af8
Merge pull request #3360 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 28, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -512,3 +512,5 @@ DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
DigitalLearningSolutions.Web/Views/Shared/Components/SingleCheckbox/Default.cshtml
DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
/DigitalLearningSolutions.Web/appsettings.Test.json
/DigitalLearningSolutions.Web/web.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202506110906)]
public class AddSqlMaintenanceSolution : Migration
{

public override void Up()
{
Execute.Sql(Properties.Resources.TD_5670_MaintenanceScripts_UP);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5670_MaintenanceScripts_DOWN);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202508190845)]
public class AddSelfAssessmentProcessAgreed : Migration
{
public override void Up()
{
Alter.Table("CandidateAssessments").AddColumn("SelfAssessmentProcessAgreed").AsDateTime().Nullable();
}

public override void Down()
{
Delete.Column("SelfAssessmentProcessAgreed").FromTable("CandidateAssessments");
}
}
}

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

Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,12 @@
<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_5670_MaintenanceScripts_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5670-MaintenanceScripts_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="TD-5670-MaintenanceScripts_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5670-MaintenanceScripts_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</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>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
IF OBJECT_ID('dbo.IndexOptimize', 'P') IS NOT NULL DROP PROCEDURE dbo.IndexOptimize;
IF OBJECT_ID('dbo.CommandExecute', 'P') IS NOT NULL DROP PROCEDURE dbo.CommandExecute;
IF OBJECT_ID('dbo.sp_purge_commandlog', 'P') IS NOT NULL DROP PROCEDURE dbo.sp_purge_commandlog;
IF OBJECT_ID('dbo.CommandLog', 'U') IS NOT NULL DROP TABLE dbo.CommandLog;
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
-- ============================================
-- Drop if exists (for clean redeploy)
-- ============================================
IF OBJECT_ID('dbo.IndexOptimize', 'P') IS NOT NULL DROP PROCEDURE dbo.IndexOptimize;
IF OBJECT_ID('dbo.DatabaseIntegrityCheck', 'P') IS NOT NULL DROP PROCEDURE dbo.DatabaseIntegrityCheck;
IF OBJECT_ID('dbo.CommandExecute', 'P') IS NOT NULL DROP PROCEDURE dbo.CommandExecute;
IF OBJECT_ID('dbo.CommandLog', 'U') IS NOT NULL DROP TABLE dbo.CommandLog;
GO

-- ============================================
-- CommandLog table
-- ============================================
CREATE TABLE dbo.CommandLog (
ID INT IDENTITY PRIMARY KEY,
DatabaseName SYSNAME NULL,
SchemaName SYSNAME NULL,
ObjectName SYSNAME NULL,
ObjectType CHAR(2) NULL,
IndexName SYSNAME NULL,
IndexType TINYINT NULL,
StatisticsName SYSNAME NULL,
PartitionNumber INT NULL,
ExtendedInfo XML NULL,
Command NVARCHAR(MAX) NOT NULL,
CommandType NVARCHAR(60) NOT NULL,
StartTime DATETIME NOT NULL,
EndTime DATETIME NOT NULL,
ErrorNumber INT NOT NULL,
ErrorMessage NVARCHAR(MAX) NULL
);
GO

-- ============================================
-- CommandExecute stored procedure
-- ============================================
CREATE PROCEDURE dbo.CommandExecute
@Command NVARCHAR(MAX),
@CommandType NVARCHAR(60),
@DatabaseName SYSNAME = NULL,
@SchemaName SYSNAME = NULL,
@ObjectName SYSNAME = NULL,
@ObjectType CHAR(2) = NULL,
@IndexName SYSNAME = NULL,
@IndexType TINYINT = NULL,
@StatisticsName SYSNAME = NULL,
@PartitionNumber INT = NULL,
@ExtendedInfo XML = NULL
AS
BEGIN
SET NOCOUNT ON;

DECLARE @StartTime DATETIME = GETDATE();
DECLARE @ErrorNumber INT = 0;
DECLARE @ErrorMessage NVARCHAR(MAX) = NULL;

BEGIN TRY
EXEC (@Command);
END TRY
BEGIN CATCH
SET @ErrorNumber = ERROR_NUMBER();
SET @ErrorMessage = ERROR_MESSAGE();
END CATCH;

INSERT INTO dbo.CommandLog (
DatabaseName, SchemaName, ObjectName, ObjectType, IndexName, IndexType, StatisticsName,
PartitionNumber, ExtendedInfo, Command, CommandType, StartTime, EndTime, ErrorNumber, ErrorMessage
)
VALUES (
@DatabaseName, @SchemaName, @ObjectName, @ObjectType, @IndexName, @IndexType, @StatisticsName,
@PartitionNumber, @ExtendedInfo, @Command, @CommandType, @StartTime, GETDATE(), @ErrorNumber, @ErrorMessage
);

IF @ErrorNumber <> 0
RAISERROR(@ErrorMessage, 16, 1);
END
GO

-- ============================================
-- IndexOptimize stored procedure
-- ============================================
CREATE PROCEDURE dbo.IndexOptimize
@Databases NVARCHAR(MAX) = 'USER_DATABASES',
@FragmentationMedium TINYINT = 30,
@FragmentationHigh TINYINT = 70
AS
BEGIN
SET NOCOUNT ON;

DECLARE @db SYSNAME;
DECLARE db_cursor CURSOR FOR
SELECT name FROM sys.databases
WHERE (@Databases = 'USER_DATABASES' AND database_id > 4)
OR name = @Databases;

OPEN db_cursor;
FETCH NEXT FROM db_cursor INTO @db;

WHILE @@FETCH_STATUS = 0
BEGIN
DECLARE @sql NVARCHAR(MAX) = N'
USE [' + @db + '];

DECLARE @schema SYSNAME, @table SYSNAME, @index SYSNAME;
DECLARE @index_id INT, @frag FLOAT;

DECLARE c CURSOR FOR
SELECT s.name, t.name, i.name, i.index_id, ips.avg_fragmentation_in_percent
FROM sys.dm_db_index_physical_stats(DB_ID(), NULL, NULL, NULL, ''LIMITED'') ips
JOIN sys.indexes i ON i.object_id = ips.object_id AND i.index_id = ips.index_id
JOIN sys.tables t ON t.object_id = ips.object_id
JOIN sys.schemas s ON s.schema_id = t.schema_id
WHERE ips.index_id > 0 AND ips.page_count > 100;

OPEN c;
FETCH NEXT FROM c INTO @schema, @table, @index, @index_id, @frag;

WHILE @@FETCH_STATUS = 0
BEGIN
DECLARE @cmd NVARCHAR(MAX);
SET @cmd = ''ALTER INDEX ['' + @index + ''] ON ['' + @schema + ''].['' + @table + ''] '';

IF @frag >= ' + CAST(@FragmentationHigh AS NVARCHAR) + '
SET @cmd += ''REBUILD'';
ELSE IF @frag >= ' + CAST(@FragmentationMedium AS NVARCHAR) + '
SET @cmd += ''REORGANIZE'';
ELSE
SET @cmd = NULL;

IF @cmd IS NOT NULL
EXEC dbo.CommandExecute @Command = @cmd,
@CommandType = ''ALTER INDEX'',
@DatabaseName = ''' + @db + ''',
@SchemaName = @schema,
@ObjectName = @table,
@ObjectType = ''U'',
@IndexName = @index;

FETCH NEXT FROM c INTO @schema, @table, @index, @index_id, @frag;
END;

CLOSE c;
DEALLOCATE c;
';

EXEC sp_executesql @sql;
FETCH NEXT FROM db_cursor INTO @db;
END;

CLOSE db_cursor;
DEALLOCATE db_cursor;
END
GO

-- ============================================
-- DatabaseIntegrityCheck stored procedure
-- ============================================
CREATE PROCEDURE dbo.DatabaseIntegrityCheck
@Databases NVARCHAR(MAX) = 'USER_DATABASES'
AS
BEGIN
SET NOCOUNT ON;

DECLARE @db SYSNAME;
DECLARE db_cursor CURSOR FOR
SELECT name FROM sys.databases
WHERE (@Databases = 'USER_DATABASES' AND database_id > 4)
OR name = @Databases;

OPEN db_cursor;
FETCH NEXT FROM db_cursor INTO @db;

WHILE @@FETCH_STATUS = 0
BEGIN
DECLARE @cmd NVARCHAR(MAX);
SET @cmd = 'DBCC CHECKDB([' + @db + ']) WITH NO_INFOMSGS, ALL_ERRORMSGS';

EXEC dbo.CommandExecute
@Command = @cmd,
@CommandType = 'DBCC CHECKDB',
@DatabaseName = @db;

FETCH NEXT FROM db_cursor INTO @db;
END

CLOSE db_cursor;
DEALLOCATE db_cursor;
END
GO

-- ============================================
-- Purge command log stored procedure
-- ============================================
CREATE OR ALTER PROCEDURE dbo.sp_purge_commandlog
@DaysToKeep INT = 30
AS
BEGIN
SET NOCOUNT ON;

DECLARE @DeleteBefore DATETIME = DATEADD(DAY, -@DaysToKeep, GETDATE());

DELETE FROM dbo.CommandLog
WHERE StartTime < @DeleteBefore;
END
GO
Loading
Loading