Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
9f585c3
TD-3711 Adding Last Accessed Columns To Tables
rshrirohit Mar 11, 2025
312ef00
TD-3712 Update LastAccessed Date For Users During Login
rshrirohit Mar 12, 2025
527973e
TD-3711 Correcting table name
rshrirohit Mar 12, 2025
52cb242
TD-3712 Correcting GetUTCDate()
rshrirohit Mar 12, 2025
13a4d51
Merge pull request #3169 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Mar 13, 2025
b5cf544
Merge pull request #3170 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Mar 13, 2025
66d8aed
TD-3713- Update LastAccessed Date For AdminAccounts And DelegateAccounts
rshrirohit Mar 13, 2025
01774db
TD-3713 Addressing test fail for the case when only admin account is …
rshrirohit Mar 13, 2025
be28d6d
TD-3714 Adding LastAccessed Date To Delegates Card In Tracking System
rshrirohit Mar 13, 2025
5d4dd9c
TD-3716-Adding LastAccessed Date In Admin Card
rshrirohit Mar 13, 2025
6b805b7
TD-3717 Adding LastAccessed Date In SuperAdmin UserAccounts Card
rshrirohit Mar 14, 2025
2a8b0a2
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Mar 14, 2025
1f17db2
TD-3714 Making LastAccessed date nullable in model
rshrirohit Mar 14, 2025
3407b72
Merge pull request #3173 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Mar 14, 2025
4afde56
Merge pull request #3174 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Mar 14, 2025
fd992ed
Merge pull request #3175 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Mar 14, 2025
d636cb4
Merge pull request #3176 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Mar 14, 2025
94bb54b
TD-3715 Including LastAccessed Date In Delegates Export
rshrirohit Mar 14, 2025
1f0d1da
TD-3718 Adding LastAccessed Date in SuperAdmin Administrators Card
rshrirohit Mar 16, 2025
2c0a48f
Merge pull request #3183 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Mar 17, 2025
bde0460
Merge pull request #3185 from TechnologyEnhancedLearning/Develop/Feau…
rshrirohit Mar 17, 2025
ba800b7
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Mar 17, 2025
30bebd0
TD-3719 Including LastAccessed Date In SuperAdmin Delegates Card
rshrirohit Mar 18, 2025
e086d72
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Mar 19, 2025
57df4e1
TD-5443-Added check for existing flag names prior to add or edit cust…
Auldrin-Possa Mar 20, 2025
87d3841
TD-5435-The 'To Do' section has been moved above the 'Staff' section.
Auldrin-Possa Mar 21, 2025
9c892a4
TD-5436-The 'To Do' section has been moved above the 'Frameworks' sec…
Auldrin-Possa Mar 21, 2025
a54fb43
Merge pull request #3187 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Mar 25, 2025
92fe354
Merge pull request #3190 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Mar 25, 2025
a9c9979
Merge pull request #3191 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Mar 25, 2025
911ace7
Merge pull request #3192 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Mar 25, 2025
8158abd
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Mar 25, 2025
fffa334
TD-5438-Moved the 'View Proficiencies' button to the top.
Mar 27, 2025
c6bdcc3
TD_5343_Adding the centre information in the footer through out the l…
ABSinhaa Mar 27, 2025
9b5a190
TD_5434 Corrected the spacing indentation within the cshtml pages.
ABSinhaa Mar 27, 2025
86ec024
Merge pull request #3197 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Mar 28, 2025
e2dcf21
Updates styling and hading wording according to design
kevwhitt-hee Apr 1, 2025
05b7dbf
Fixes styling
kevwhitt-hee Apr 1, 2025
9f1b4de
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Apr 1, 2025
d7bbaa9
TD-5439 - A competency description is added to competency when exists.
Auldrin-Possa Apr 1, 2025
6623b90
TD-5482-Related role added to view
Apr 3, 2025
7666ffe
Merge pull request #3204 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Apr 4, 2025
02df8da
Merge pull request #3206 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Apr 7, 2025
7a001a4
TD-5481-Added a Details view component in the view to show supervisor…
Auldrin-Possa Apr 7, 2025
572d66b
Merge pull request #3210 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Apr 9, 2025
305f2d5
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Apr 9, 2025
3821eb4
TD-5511-Framework query modified- The admin userid is used to check t…
Apr 10, 2025
d1a41de
TD_5434 code changes for the new way for showing the banner text in t…
ABSinhaa Apr 10, 2025
105f110
TD-5434_remove unwanted ommented code as we do not need the horizonta…
ABSinhaa Apr 14, 2025
a37e385
Merge pull request #3217 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Apr 15, 2025
fc779eb
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Apr 15, 2025
daec6e8
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Apr 15, 2025
0f1ba1c
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Apr 16, 2025
43875c6
TD-5514-Stored proc updated to add course name in the email subject
Apr 16, 2025
5f3f6d3
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Apr 17, 2025
ff91492
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Apr 17, 2025
120c5dd
TD-5451- Empty competency description check added
Apr 17, 2025
d709470
TD-5487 Issue showing multiple comments when clicked the back link af…
sherif-olaboye Apr 23, 2025
8faae58
Merge pull request #3225 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Apr 24, 2025
3060538
Merge pull request #3229 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Apr 24, 2025
030f828
Merge branch 'DLS-Release-v1.2.0' into DLS-Release-v1.2.1
rshrirohit Apr 25, 2025
7dbc2e8
TD-5528 Issue showing console '500' error on the screen when clicked …
sherif-olaboye Apr 25, 2025
1d5cbad
TD_5434_ made changes based on the new comments received by the team,…
ABSinhaa Apr 28, 2025
89c5c9f
TD-Framework competency group id null check added. Ordering of compet…
Apr 28, 2025
a6694a1
TD-5545 UpdateNotificationsTable
rshrirohit Apr 29, 2025
046fab2
TD-5434_Made changes to the code and now we are loading the banner te…
ABSinhaa Apr 29, 2025
0fce67c
TD_5557_ added a null check to the query for the description propery …
ABSinhaa May 1, 2025
dbdda71
TD-5561 Issue showing mismatch of colouring of buttons on Learning Po…
sherif-olaboye May 7, 2025
9c52e49
Merge branch 'master' into DLS-Release-v1.2.1
rshrirohit May 8, 2025
d7a4015
Merge pull request #3233 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 8, 2025
498976b
Merge pull request #3239 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 8, 2025
e3d3475
Merge pull request #3241 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 8, 2025
030a385
Merge pull request #3242 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 8, 2025
6e68df7
Merge pull request #3249 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 8, 2025
7be11c2
Merge pull request #3255 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 8, 2025
3f0ed28
TD-5487 Issue showing multiple comments when clicked the back link af…
sherif-olaboye May 9, 2025
7246e0d
TD-5568 Add 'Last accessed date' to 'sort' filter on 'Tracking system…
sherif-olaboye May 12, 2025
e364763
TD-5451-empty competency description check added in Supervise section.
May 12, 2025
85abefa
TD-3714 Display the DelegateAccounts.LastAccessed date on the Trackin…
sherif-olaboye May 12, 2025
e2ec325
TD-3716 Display the AdminAccounts.LastAccessed date in the Tracking S…
sherif-olaboye May 12, 2025
8d82452
TD-5443-Validation summary field name corrected
May 12, 2025
b740bf7
Merge pull request #3258 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 13, 2025
a7e04ca
Merge pull request #3261 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 13, 2025
9a764c0
Merge pull request #3262 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 13, 2025
39e3925
Merge pull request #3263 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 13, 2025
0d3242c
Merge pull request #3264 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 13, 2025
6a7ddec
TD-5547 : Rewrote the Self Assessment report code to incorporate and …
ABSinhaa May 15, 2025
b5ab440
TD-5439-Added empty competency description check. Increased competenc…
May 15, 2025
6d07122
TD-5511-Displaying View/Review based on framework review
May 16, 2025
267ac46
Merge pull request #3266 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 19, 2025
b395ce1
Merge pull request #3267 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 19, 2025
6f9fb33
TD-5568 changing to Last Accessed Date to Last accessed date
sherif-olaboye May 19, 2025
aaf8d95
TD-5511-GetAdminUserRoleForFrameworkId(+) query modified to get admin…
May 19, 2025
c26d12a
TD_3718_ adding the text 'Last accessed date' to the administrators c…
ABSinhaa May 20, 2025
fd66a08
TD_3719_added the phrase 'Last accessed date' to the delegates card.
ABSinhaa May 20, 2025
ab8492c
TD_5583_ Added Last accessed date field to the view delegates section…
ABSinhaa May 20, 2025
2d3dda8
TD-3715_Renamed the dataTable column name to 'Last accessed date'.
ABSinhaa May 20, 2025
1697508
TD-5620-Added code to check if the html editor is empty.
May 20, 2025
a961e4d
Merge pull request #3198 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 21, 2025
7fa0ed7
Merge pull request #3260 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit May 21, 2025
0a5d04e
Merge pull request #3265 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 21, 2025
e42945b
Merge pull request #3268 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 21, 2025
f6a25c8
Merge pull request #3270 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 21, 2025
fda2a45
Merge pull request #3271 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 21, 2025
c61de1b
Merge pull request #3272 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 21, 2025
55b7429
Merge pull request #3273 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 21, 2025
7cacd96
Merge pull request #3274 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 21, 2025
79ab922
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
sherif-olaboye May 21, 2025
430d824
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
sherif-olaboye May 21, 2025
0c0f356
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
sherif-olaboye May 21, 2025
0bc1d19
Merge branch 'master' into DLS-Release-v1.2.1
rshrirohit May 22, 2025
40a60d8
TD-5443-Bulk-upload- flags comparision modified by adding Trim and To…
May 22, 2025
744a9ce
Merge pull request #3277 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 28, 2025
aa02953
Merge pull request #3278 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit May 28, 2025
2ee09c1
TD-5581 Issue showing multiple comments on 'Frameworks' - 'Comments' …
sherif-olaboye May 29, 2025
79c3e65
TD-5511-Sql modified to show FrameworkReviewID for admin logged in fr…
May 29, 2025
69dfe66
TD-3712 Updating LastAccessed For Unverified Users Login
rshrirohit May 29, 2025
cfd8bad
Merge pull request #3280 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 2, 2025
d3d67cd
Merge pull request #3282 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 2, 2025
3b4c166
Merge pull request #3281 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jun 2, 2025
b571998
Reapply "updated scss and layout files to rationalise .nhsuk overrides"
frank-hee Jun 3, 2025
f91f260
Revert "Reapply "updated scss and layout files to rationalise .nhsuk …
frank-hee Jun 3, 2025
5ccec6d
TD-5547_Test failed for DSAT code changes.
ABSinhaa Jun 11, 2025
df18089
TD-5583_Test Failed for last accessed information not showing on the …
ABSinhaa Jun 11, 2025
32c2bf6
Merge pull request #3289 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 12, 2025
d7e07a6
Merge pull request #3290 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 12, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202503111500)]
public class AddLastAccessedColumn : Migration
{
public override void Up()
{
Alter.Table("Users").AddColumn("LastAccessed").AsDateTime().Nullable();
Alter.Table("DelegateAccounts").AddColumn("LastAccessed").AsDateTime().Nullable();
Alter.Table("AdminAccounts").AddColumn("LastAccessed").AsDateTime().Nullable();

Execute.Sql("UPDATE u SET LastAccessed = (SELECT MAX(s.LoginTime) FROM DelegateAccounts da JOIN Sessions s ON da.ID = s.CandidateId WHERE da.UserID = u.ID) FROM users u;");
Execute.Sql("UPDATE da SET LastAccessed = (SELECT MAX(s.LoginTime) FROM Sessions s WHERE s.CandidateId = da.ID) FROM DelegateAccounts da;");
Execute.Sql("UPDATE da SET LastAccessed = (SELECT ca.LastAccessed FROM CandidateAssessments ca WHERE ca.ID = da.ID) FROM DelegateAccounts da where da.LastAccessed IS NULL;");
Execute.Sql("UPDATE AA SET LastAccessed = (SELECT MAX(AdS.LoginTime) FROM AdminSessions AdS WHERE AdS.AdminID = AA.ID) FROM AdminAccounts AA;");
}
public override void Down()
{
Delete.Column("LastAccessed").FromTable("Users");
Delete.Column("LastAccessed").FromTable("DelegateAccounts");
Delete.Column("LastAccessed").FromTable("AdminAccounts");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(2025041161520)]
public class Alter_SendExpiredTBCReminders_AppendCourseName : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5514_Alter_SendExpiredTBCReminders_Up);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5514_Alter_SendExpiredTBCReminders_Down);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@


namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202504281045)]
public class Alter_ReorderFrameworkCompetency : Migration
{
public override void Up()
{
Execute.Sql(Properties.Resources.TD_5447_Alter_ReorderFrameworkCompetency_Up);
}
public override void Down()
{
Execute.Sql(Properties.Resources.TD_5447_Alter_ReorderFrameworkCompetency_Down);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;
[Migration(202504281115)]
public class UpdateFrameworkCompetenciesOrdering : ForwardOnlyMigration
{
public override void Up()
{
Execute.Sql(@"WITH Ranked AS (
    SELECT ID,
            ROW_NUMBER() OVER (PARTITION BY FrameworkID ORDER BY SysStartTime) AS NewOrder
    FROM FrameworkCompetencies
Where FrameworkCompetencyGroupID is null
)
UPDATE fc
SET fc.Ordering = r.NewOrder
FROM FrameworkCompetencies fc
JOIN Ranked r ON fc.ID = r.ID;");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace DigitalLearningSolutions.Data.Migrations
{
using FluentMigrator;

[Migration(202504290900)]
public class UpdateNotifications : ForwardOnlyMigration
{
public override void Up()
{
Execute.Sql(@$"UPDATE Notifications SET NotificationName = 'Completed course follow-up feedback requests' where NotificationID = 13");
}

}
}

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

12 changes: 12 additions & 0 deletions DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -475,4 +475,16 @@
<data name="TD_5412_Alter_SendExpiredTBCReminders_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5412-Alter_SendExpiredTBCReminders_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="TD_5514_Alter_SendExpiredTBCReminders_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5514-Alter_SendExpiredTBCReminders_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="TD_5514_Alter_SendExpiredTBCReminders_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5514-Alter_SendExpiredTBCReminders_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<data name="TD_5447_Alter_ReorderFrameworkCompetency_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Scripts\TD-5447-Alter_ReorderFrameworkCompetency_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
</data>
<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>
</root>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading