Skip to content

Commit 131eebf

Browse files
rshrirohitrshrirohit
authored
Merge branch 'Release-2024.32' into Develop/Fixes/TD-4243-Few'addon'coursesshowingon'LearningPortal'notshowingon'Coursesetup&Delegateactivitiesscreensfix
2 parents 690c64b + d82983b commit 131eebf

19 files changed

+694
-8
lines changed

‎DigitalLearningSolutions.Data.Migrations/202408221440_UpdatePrivacyPolicyRecord.cs‎

Lines changed: 540 additions & 0 deletions
Large diffs are not rendered by default.

‎DigitalLearningSolutions.Data.Migrations/202408271130_Alter_GroupCustomisation_StoredProcs.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202408271130)]
6+
public class Alter_GroupCustomisation_StoredProcs : Migration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(Properties.Resources.TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up);
11+
Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up);
12+
}
13+
public override void Down()
14+
{
15+
Execute.Sql(Properties.Resources.TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down);
16+
Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down);
17+
}
18+
19+
}
20+
}

‎DigitalLearningSolutions.Data.Migrations/202408271610_AlterConstraintForProgressAddUtcDate.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
using System.Diagnostics.Metrics;
5+
6+
[Migration(202408271610)]
7+
public class AlterConstraintForProgressAddUtcDate : Migration
8+
{
9+
public override void Up()
10+
{
11+
Execute.Sql(@$"ALTER TABLE [dbo].[Progress] DROP CONSTRAINT [DF_Progress_FirstSubmittedTime];
12+
ALTER TABLE [dbo].[Progress] ADD CONSTRAINT [DF_Progress_FirstSubmittedTime] DEFAULT (GETUTCDATE()) FOR [FirstSubmittedTime];");
13+
}
14+
public override void Down()
15+
{
16+
Execute.Sql(@$"ALTER TABLE [dbo].[Progress] DROP CONSTRAINT [DF_Progress_FirstSubmittedTime];
17+
ALTER TABLE [dbo].[Progress] ADD CONSTRAINT [DF_Progress_FirstSubmittedTime] DEFAULT (GETDATE()) FOR [FirstSubmittedTime];");
18+
}
19+
20+
}
21+
}

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

Lines changed: 90 additions & 0 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: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,5 +429,16 @@
429429
</data>
430430
<data name="TD_4243_Alter_GetCompletedCoursesForCandidate_proc_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
431431
<value>..\Resources\TD-4243_Alter_GetCompletedCoursesForCandidate_proc_up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
432+
<data name="TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
433+
<value>..\Scripts\TD-4436-Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
434+
</data>
435+
<data name="TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
436+
<value>..\Scripts\TD-4436-Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
437+
</data>
438+
<data name="TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
439+
<value>..\Scripts\TD-4436-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
440+
</data>
441+
<data name="TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
442+
<value>..\Scripts\TD-4436-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
432443
</data>
433444
</root>

‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down.sql‎

6.71 KB
Binary file not shown.

‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up.sql‎

7.68 KB
Binary file not shown.

‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down.sql‎

15.3 KB
Binary file not shown.

‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up.sql‎

15.6 KB
Binary file not shown.

‎DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/LearningPortalControllerTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ namespace DigitalLearningSolutions.Web.Tests.Controllers.LearningPortal
1313
using Microsoft.Extensions.Logging;
1414
using NUnit.Framework;
1515
using GDS.MultiPageFormData;
16+
using DigitalLearningSolutions.Web.Helpers;
1617

1718
public partial class LearningPortalControllerTests
1819
{
@@ -69,6 +70,7 @@ public void SetUp()
6970
"mock"
7071
)
7172
);
73+
DateHelper.userTimeZone = "Europe/London";
7274
controller = new LearningPortalController(
7375
centresService,
7476
courseService,

0 commit comments

Comments
 (0)