Skip to content

Commit b6fb19a

Browse files
rshrirohitrshrirohit
authored
Merge pull request #2693 from TechnologyEnhancedLearning/Release-2024.29
Release 2024.29
2 parents b04fc9a + d77f528 commit b6fb19a

File tree

197 files changed

+9126
-4698
lines changed

Some content is hidden

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

197 files changed

+9126
-4698
lines changed

‎.github/workflows/build-and-deploy-dev.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,17 @@ jobs:
3333

3434
- name: Add TechnologyEnhancedLearning as nuget package source
3535
run: |
36-
$nugetSources = dotnet nuget list source | Out-String;
37-
if(!($nugetSources -like "*TechnologyEnhancedLearning*"))
38-
{
39-
dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text;
40-
}
41-
36+
$nugetSources = dotnet nuget list source | Out-String;
37+
if($nugetSources -like "*TechnologyEnhancedLearning*")
38+
{
39+
# Update the source (in case PAT has been updated)
40+
dotnet nuget update source TechnologyEnhancedLearning --source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
41+
}
42+
else
43+
{
44+
# Add the source
45+
dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
46+
}
4247
- name: Dotnet publish
4348
run: |
4449
dotnet publish DigitalLearningSolutions.sln -c Release -o E:/web/${{env.SitePath}}-NEW

‎.github/workflows/build-and-deploy-uat.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,17 @@ jobs:
3434
- name: Add TechnologyEnhancedLearning as nuget package source
3535
run: |
3636
$nugetSources = dotnet nuget list source | Out-String;
37-
if(!($nugetSources -like "*TechnologyEnhancedLearning*"))
38-
{
39-
dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text;
37+
if($nugetSources -like "*TechnologyEnhancedLearning*")
38+
{
39+
# Update the source (in case PAT has been updated)
40+
dotnet nuget update source TechnologyEnhancedLearning --source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
41+
}
42+
else
43+
{
44+
# Add the source
45+
dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
4046
}
41-
47+
4248
- name: Dotnet publish
4349
run: |
4450
dotnet publish DigitalLearningSolutions.sln -c Release -o E:/web/${{env.SitePath}}-NEW

‎.github/workflows/continuous-integration-workflow.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
name: Build and test
1111
runs-on: windows-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Setup .NET Core SDK 6.0
16-
uses: actions/setup-dotnet@v3
16+
uses: actions/setup-dotnet@v4
1717
with:
1818
dotnet-version: 6.0.x
1919

@@ -27,12 +27,12 @@ jobs:
2727
run: dotnet test DigitalLearningSolutions.Web.Tests
2828

2929
- name: Setup node
30-
uses: actions/setup-node@v3
30+
uses: actions/setup-node@v4
3131
with:
3232
node-version: 20
3333

3434
- name: Typescript install
35-
run: yarn install --frozen-lockfile
35+
run: yarn install --network-timeout 600000 --frozen-lockfile
3636
working-directory: ./DigitalLearningSolutions.Web
3737

3838
- name: Typescript build

‎DigitalLearningSolutions.Data.Migrations/202305220753_AlterGetCompletedCoursesForCandidate.cs‎

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

‎DigitalLearningSolutions.Data.Migrations/202401301650_AddGroupDelegatesConstraints.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202401301650)]
6+
public class AddGroupDelegatesConstraints : Migration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(
11+
@"WITH duplicateRowNum AS (
12+
SELECT *, ROW_NUMBER() OVER (PARTITION BY GroupId,DelegateId ORDER BY AddedDate) rownum
13+
FROM GroupDelegates
14+
)
15+
DELETE FROM duplicateRowNum WHERE rownum > 1;"
16+
);
17+
18+
Create.UniqueConstraint("UQ_GroupDelegates_GroupID_DelegateID").OnTable("GroupDelegates")
19+
.Columns("GroupID","DelegateID");
20+
}
21+
22+
public override void Down()
23+
{
24+
Delete.UniqueConstraint("UQ_GroupDelegates_GroupID_DelegateID").FromTable("GroupDelegates");
25+
}
26+
}
27+
}

‎DigitalLearningSolutions.Data.Migrations/202403221110_UpdateCandidateAssessmentsNonReportable.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202403221110)]
6+
public class UpdateCandidateAssessmentsNonReportable : Migration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(
11+
@$"UPDATE CandidateAssessments
12+
SET NonReportable= 1
13+
FROM CandidateAssessments AS CA
14+
INNER JOIN CandidateAssessmentSupervisors AS CAS ON CA.ID = cas.CandidateAssessmentID AND CAS.Removed IS NULL
15+
INNER JOIN SupervisorDelegates AS SD ON SD.ID = CAS.SupervisorDelegateId
16+
INNER JOIN AdminAccounts AS AA ON AA.ID = SD.SupervisorAdminID AND AA.UserID = SD.DelegateUserID
17+
WHERE NonReportable = 0"
18+
);
19+
}
20+
public override void Down()
21+
{
22+
}
23+
}
24+
}

‎DigitalLearningSolutions.Data.Migrations/202404120935_InactivateDelegateAccountsWithNoEmail.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
namespace DigitalLearningSolutions.Data.Migrations
2+
{
3+
using FluentMigrator;
4+
5+
[Migration(202404120935)]
6+
public class InactivateDelegateAccountsWithNoEmail : ForwardOnlyMigration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(
11+
@$"UPDATE DelegateAccounts
12+
SET Active = 0
13+
FROM Users AS u INNER JOIN
14+
DelegateAccounts ON u.ID = DelegateAccounts.UserID
15+
WHERE (NOT (u.PrimaryEmail LIKE N'%@%')) AND (DelegateAccounts.Active = 1)"
16+
);
17+
}
18+
}
19+
}

‎DigitalLearningSolutions.Data.Migrations/202404231652_RemoveDuplicateDelegatesFromDelegateGroups.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(202404231652)]
6+
public class RemoveDuplicateDelegatesFromDelegateGroups : ForwardOnlyMigration
7+
{
8+
public override void Up()
9+
{
10+
Execute.Sql(
11+
@$"WITH GroupDelegatesCTE AS (
12+
SELECT *,
13+
ROW_NUMBER() OVER (PARTITION BY GroupID, DelegateID ORDER BY GroupDelegateID) AS rn
14+
FROM GroupDelegates
15+
)
16+
DELETE FROM GroupDelegatesCTE WHERE rn > 1;"
17+
);
18+
}
19+
}
20+
}

‎DigitalLearningSolutions.Data.Migrations/202405031044_AlterGetCurrentCoursesForCandidate_V2.cs‎

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

‎DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
</PropertyGroup>
7-
8-
<ItemGroup>
9-
<None Remove="Resources\CookiePolicy.txt" />
10-
</ItemGroup>
11-
12-
<ItemGroup>
13-
<EmbeddedResource Include="Resources\CookiePolicy.txt">
14-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15-
</EmbeddedResource>
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<PackageReference Include="Dapper" Version="2.0.123" />
20-
<PackageReference Include="FluentMigrator" Version="3.2.9" />
21-
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="3.2.9" />
22-
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
23-
</ItemGroup>
24-
25-
<ItemGroup>
26-
<Compile Update="202104220853_FixCustomisationUpdateSPs.cs">
27-
<SubType>Code</SubType>
28-
</Compile>
29-
<Compile Update="Properties\Resources.Designer.cs">
30-
<DesignTime>True</DesignTime>
31-
<AutoGen>True</AutoGen>
32-
<DependentUpon>Resources.resx</DependentUpon>
33-
</Compile>
34-
</ItemGroup>
35-
36-
<ItemGroup>
37-
<EmbeddedResource Update="Properties\Resources.resx">
38-
<Generator>ResXFileCodeGenerator</Generator>
39-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
40-
</EmbeddedResource>
41-
</ItemGroup>
42-
43-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<None Remove="Resources\CookiePolicy.txt" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<EmbeddedResource Include="Resources\CookiePolicy.txt">
14+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15+
</EmbeddedResource>
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="Dapper" Version="2.1.24" />
20+
<PackageReference Include="FluentMigrator" Version="3.3.2" />
21+
<PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="3.3.2" />
22+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<Compile Update="202104220853_FixCustomisationUpdateSPs.cs">
27+
<SubType>Code</SubType>
28+
</Compile>
29+
<Compile Update="Properties\Resources.Designer.cs">
30+
<DesignTime>True</DesignTime>
31+
<AutoGen>True</AutoGen>
32+
<DependentUpon>Resources.resx</DependentUpon>
33+
</Compile>
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<EmbeddedResource Update="Properties\Resources.resx">
38+
<Generator>ResXFileCodeGenerator</Generator>
39+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
40+
</EmbeddedResource>
41+
</ItemGroup>
42+
43+
</Project>

0 commit comments

Comments
 (0)