Skip to content

Commit 7cc47e9

Browse files
rshrirohitrshrirohit
committed
Merge branch 'DLS-Release-v1.3.0' into DEV
2 parents 9ef3d4f + 1c68772 commit 7cc47e9

File tree

54 files changed

+1687
-477
lines changed

Some content is hidden

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

54 files changed

+1687
-477
lines changed

‎DigitalLearningSolutions.Data.Migrations/202508261415_RemoveCustomAdminTitlesAddSupervisorNominatedSupervisor.cs‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202508261415, TransactionBehavior.None)]
6+
public class RemoveCustomAdminTitlesAddSupervisorNominatedSupervisor : Migration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(Properties.Resources.TD_5638_SnapshotData_UP);
11+
12+
Execute.Sql($@"
13+
-- 1. Drop old FK
14+
ALTER TABLE [dbo].[SelfAssessmentSupervisorRoles]
15+
DROP CONSTRAINT [FK_SelfAssessmentSupervisorRoles_SelfAssessmentID_SelfAssessments_ID];
16+
17+
18+
-- 2. Make column nullable
19+
ALTER TABLE [dbo].[SelfAssessmentSupervisorRoles]
20+
ALTER COLUMN SelfAssessmentID INT NULL;
21+
22+
23+
-- 3. Recreate FK (allows NULLs by default)
24+
ALTER TABLE [dbo].[SelfAssessmentSupervisorRoles]
25+
ADD CONSTRAINT [FK_SelfAssessmentSupervisorRoles_SelfAssessmentID_SelfAssessments_ID]
26+
FOREIGN KEY (SelfAssessmentID) REFERENCES SelfAssessments(ID);
27+
28+
29+
-- 4. Add two default roles
30+
INSERT INTO [dbo].[SelfAssessmentSupervisorRoles]
31+
([SelfAssessmentID],[RoleName],[SelfAssessmentReview],[ResultsReview]
32+
,[RoleDescription]
33+
,[AllowDelegateNomination],[AllowSupervisorRoleSelection])
34+
VALUES
35+
(NULL,'Supervisor',1,1
36+
,'This person may be the line manager, practice educator or educational supervisor at University.'
37+
,0,1),
38+
(NULL,'Nominated Supervisor',0,1
39+
,'Nominated Supervisors must be deemed competent to administer intravenous medication by their home organisation. Nominated Supervisors should be authorised to supervise and assess the practice of others by their line manager, who should consider their level of experience.'
40+
,1,0);
41+
42+
43+
-- 5. Update all CandidateAssessmentSupervisor records
44+
UPDATE cas
45+
SET cas.SelfAssessmentSupervisorRoleID =
46+
    CASE
47+
        WHEN sasr.RoleName = 'Educator/Manager' THEN sup.ID
48+
        WHEN sasr.RoleName = 'Assessor'         THEN nom.ID
49+
    END
50+
FROM CandidateAssessmentSupervisors cas
51+
INNER JOIN SelfAssessmentSupervisorRoles sasr
52+
    ON cas.SelfAssessmentSupervisorRoleID = sasr.ID
53+
LEFT JOIN SelfAssessmentSupervisorRoles sup
54+
    ON sup.RoleName = 'Supervisor'
55+
LEFT JOIN SelfAssessmentSupervisorRoles nom
56+
    ON nom.RoleName = 'Nominated Supervisor';
57+
58+
59+
-- 6. Remove all existing roles where SelfAssessmentID is not null
60+
DELETE FROM SelfAssessmentSupervisorRoles WHERE SelfAssessmentID IS NOT NULL;
61+
"
62+
);
63+
}
64+
65+
public override void Down()
66+
{
67+
// Intentionally empty. If things go wrong later, we will manually restore the snapshot
68+
}
69+
}
70+
}

‎DigitalLearningSolutions.Data.Migrations/202508281600_AlterGetCandidateAssessmentResultsByIdSP.cs‎

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

‎DigitalLearningSolutions.Data.Migrations/202508281630_AlterGetAssessmentResultsByDelegateSP.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(202508281630)]
8+
public class AlterGetAssessmentResultsByDelegateSP : Migration
9+
{
10+
public override void Up()
11+
{
12+
Execute.Sql(Properties.Resources.TD_5638_Alter_GetAssessmentResultsByDelegate_Up);
13+
}
14+
public override void Down()
15+
{
16+
Execute.Sql(Properties.Resources.TD_5638_Alter_GetAssessmentResultsByDelegate_DOWN);
17+
}
18+
}
19+
}

‎DigitalLearningSolutions.Data.Migrations/202510221132_AddIncludeLearnerDeclarationPromptToSelfAssessmentsTable.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202510221132)]
6+
public class AddIncludeLearnerDeclarationPromptToSelfAssessmentsTable : Migration
7+
{
8+
public override void Up()
9+
{
10+
Alter.Table("SelfAssessments").AddColumn("IncludeLearnerDeclarationPrompt").AsBoolean().WithDefaultValue(false);
11+
}
12+
13+
public override void Down()
14+
{
15+
Delete.Column("IncludeLearnerDeclarationPrompt").FromTable("SelfAssessments");
16+
}
17+
}
18+
}

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

Lines changed: 105 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: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,21 @@
511511
<data name="TD_5535_Alter_GetActivitiesForDelegateEnrolment_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
512512
<value>..\Scripts\TD-5535-Alter_GetActivitiesForDelegateEnrolment_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
513513
</data>
514+
<data name="TD_5638_Alter_GetAssessmentResultsByDelegate_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
515+
<value>..\Scripts\TD-5638-Alter_GetAssessmentResultsByDelegate_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
516+
</data>
517+
<data name="TD_5638_Alter_GetAssessmentResultsByDelegate_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
518+
<value>..\Scripts\TD-5638-Alter_GetAssessmentResultsByDelegate_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
519+
</data>
520+
<data name="TD_5638_Alter_GetCandidateAssessmentResultsById_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
521+
<value>..\Scripts\TD-5638-Alter_GetCandidateAssessmentResultsById_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
522+
</data>
523+
<data name="TD_5638_Alter_GetCandidateAssessmentResultsById_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
524+
<value>..\Scripts\TD-5638-Alter_GetCandidateAssessmentResultsById_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
525+
</data>
526+
<data name="TD_5638_SnapshotData_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
527+
<value>..\Scripts\TD-5638-SnapshotData-UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
528+
</data>
514529
<data name="TD_5552_SendRetiringNotification" type="System.Resources.ResXFileRef, System.Windows.Forms">
515530
<value>..\Scripts\TD-5552-SendRetiringNotification.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
516531
</data>

‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5638-Alter_GetAssessmentResultsByDelegate_DOWN.sql‎

10.2 KB
Binary file not shown.

‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5638-Alter_GetAssessmentResultsByDelegate_Up.sql‎

10.6 KB
Binary file not shown.

‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5638-Alter_GetCandidateAssessmentResultsById_DOWN.sql‎

10.7 KB
Binary file not shown.

‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5638-Alter_GetCandidateAssessmentResultsById_Up.sql‎

11.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)