Skip to content

Commit 66ae70e

Browse files
sherif-olaboyesherif-olaboye
committed
Merge branch 'Release-2024.38' into Develop/Features/TD-4383-Warncentreadminsthatactiveadminaccountexistswheninactivatingdelegateaccount
2 parents b175fc0 + 0597301 commit 66ae70e

File tree

61 files changed

+1350
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1350
-238
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/202408271645_AlterAvailableandCompletedCoursesForDelegate.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+

2+
3+
namespace DigitalLearningSolutions.Data.Migrations
4+
{
5+
using FluentMigrator;
6+
7+
[Migration(202409031645)]
8+
public class AlterAvailableandCompletedCoursesForDelegate : Migration
9+
{
10+
public override void Up()
11+
{
12+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetActivitiesForDelegateEnrolment_proc_up);
13+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCompletedCoursesForCandidate_proc_up);
14+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCurrentCoursesForCandidate_V2_proc_up);
15+
}
16+
public override void Down()
17+
{
18+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetActivitiesForDelegateEnrolment_proc_down);
19+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCompletedCoursesForCandidate_proc_down);
20+
Execute.Sql(Properties.Resources.TD_4243_Alter_GetCurrentCoursesForCandidate_V2_proc_down);
21+
}
22+
}
23+
}

‎DigitalLearningSolutions.Data.Migrations/202409051645_Alter_GetCompletedCoursesForCandidate_CourseActive.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+

2+
3+
namespace DigitalLearningSolutions.Data.Migrations
4+
{
5+
using FluentMigrator;
6+
7+
[Migration(202409051645)]
8+
public class Alter_GetCompletedCoursesForCandidate_CourseActive : Migration
9+
{
10+
public override void Up()
11+
{
12+
Execute.Sql(Properties.Resources.TD_4634_Alter_GetCompletedCoursesForCandidate_UP);
13+
}
14+
public override void Down()
15+
{
16+
Execute.Sql(Properties.Resources.TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN);
17+
}
18+
}
19+
}

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

Lines changed: 222 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: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,4 +418,34 @@
418418
<data name="TD_4436_Alter_uspCreateProgressRecord_V3_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
419419
<value>..\Scripts\TD-4436-Alter_uspCreateProgressRecord_V3_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
420420
</data>
421+
<data name="TD_4243_Alter_GetActivitiesForDelegateEnrolment_proc_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
422+
<value>..\Resources\TD-4243_Alter_GetActivitiesForDelegateEnrolment_proc_down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
423+
</data>
424+
<data name="TD_4243_Alter_GetActivitiesForDelegateEnrolment_proc_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
425+
<value>..\Resources\TD-4243_Alter_GetActivitiesForDelegateEnrolment_proc_up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
426+
</data>
427+
<data name="TD_4243_Alter_GetCompletedCoursesForCandidate_proc_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
428+
<value>..\Resources\TD-4243_Alter_GetCompletedCoursesForCandidate_proc_down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
429+
</data>
430+
<data name="TD_4243_Alter_GetCompletedCoursesForCandidate_proc_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
431+
<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>
433+
<data name="TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
434+
<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>
435+
</data>
436+
<data name="TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
437+
<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>
438+
</data>
439+
<data name="TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
440+
<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>
441+
</data>
442+
<data name="TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
443+
<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>
444+
</data>
445+
<data name="TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
446+
<value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
447+
</data>
448+
<data name="TD_4634_Alter_GetCompletedCoursesForCandidate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
449+
<value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
450+
</data>
421451
</root>

0 commit comments

Comments
 (0)