Skip to content

Commit 35649cb

Browse files
Gid733Gid733
authored
Merge pull request #48 from microting/master
Updates
2 parents c2243b9 + add0e1c commit 35649cb

File tree

6 files changed

+54
-15
lines changed

6 files changed

+54
-15
lines changed

‎eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10-
<PackageReference Include="Microting.eForm" Version="3.0.155" />
10+
<PackageReference Include="Microting.eForm" Version="3.0.160" />
1111
<PackageReference Include="NUnit" Version="3.11.0" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
1313
</ItemGroup>

‎eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10-
<PackageReference Include="Microting.eForm" Version="3.0.155" />
10+
<PackageReference Include="Microting.eForm" Version="3.0.160" />
1111
<PackageReference Include="NUnit" Version="3.11.0" />
1212
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
13-
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.94" />
13+
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.96" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎eFormAPI/eFormAPI.Web/Hosting/Helpers/PluginHelper.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ public static List<IEformPlugin> GetPlugins(IConfiguration configuration)
4747
{
4848
var connectionString = dbContext.Database.GetDbConnection().ConnectionString;
4949

50-
// var connectionStringMatch = Regex.Match(connectionString, @"(Database=\w*;)");//.Groups[1].Value;
51-
// if (connectionStringMatch.Groups.Count != 3)
52-
// {
53-
// throw new Exception("Error while parsing connection-string database name");
54-
// }
55-
5650
var dbNameSection = Regex.Match(connectionString, @"(Database=\w*;)").Groups[0].Value;
5751
var dbPrefix = Regex.Match(connectionString, @"Database=(\d*)_").Groups[1].Value;
5852

‎eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="JetBrains.Annotations" Version="2018.3.0" />
27-
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.94" />
28-
<PackageReference Include="Microting.eForm" Version="3.0.155" />
29-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
27+
<PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.96" />
28+
<PackageReference Include="Microting.eForm" Version="3.0.160" />
29+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.0" />
3030
<PackageReference Include="SharpZipLib.NETStandard" Version="1.0.7" />
3131
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />
3232
<PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
3333
<PackageReference Include="McMaster.NETCore.Plugins" Version="0.2.1" />
3434
<PackageReference Include="OtpSharp.Core" Version="1.0.0" />
3535
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.1" />
37-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.1" />
38-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.1" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.2" />
37+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.2" />
38+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.2" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

‎eform-client/e2e/Constants/XMLForEformFractions.ts‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
export default {
2+
XML: '<?xml version="1.0" encoding="UTF-8"?>\n' +
3+
'<Main>\n' +
4+
' <Id>138798</Id>\n' +
5+
' <Repeated>0</Repeated>\n' +
6+
' <Label>Number 1</Label>\n' +
7+
' <StartDate>2018-05-08</StartDate>\n' +
8+
' <EndDate>2028-05-08</EndDate>\n' +
9+
' <Language>da</Language>\n' +
10+
' <MultiApproval>false</MultiApproval>\n' +
11+
' <FastNavigation>false</FastNavigation>\n' +
12+
' <Review>false</Review>\n' +
13+
' <Summary>false</Summary>\n' +
14+
' <DisplayOrder>0</DisplayOrder>\n' +
15+
' <ElementList>\n' +
16+
' <Element type="DataElement">\n' +
17+
' <Id>138798</Id>\n' +
18+
' <Label>Number 1</Label>\n' +
19+
' <Description><![CDATA[]]></Description>\n' +
20+
' <DisplayOrder>0</DisplayOrder>\n' +
21+
' <ReviewEnabled>false</ReviewEnabled>\n' +
22+
' <ManualSync>false</ManualSync>\n' +
23+
' <ExtraFieldsEnabled>false</ExtraFieldsEnabled>\n' +
24+
' <DoneButtonDisabled>false</DoneButtonDisabled>\n' +
25+
' <ApprovalEnabled>false</ApprovalEnabled>\n' +
26+
' <DataItemList>\n' +
27+
' <DataItem type="Number">\n' +
28+
' <Id>343963</Id>\n' +
29+
' <Label>Number 1</Label>\n' +
30+
' <Description><![CDATA[Number 1 description]]></Description>\n' +
31+
' <DisplayOrder>0</DisplayOrder>\n' +
32+
' <Mandatory>true</Mandatory>\n' +
33+
' <MinValue>1</MinValue>\n' +
34+
' <MaxValue>1100</MaxValue>\n' +
35+
' <Value>24</Value>\n' +
36+
' <DecimalCount>2</DecimalCount>\n' +
37+
' <UnitName/>\n' +
38+
' <Color>e8eaf6</Color>\n' +
39+
' </DataItem>\n' +
40+
' </DataItemList>\n' +
41+
' </Element>\n' +
42+
' </ElementList>\n' +
43+
'</Main>'
44+
};

‎eform-client/src/app/plugins/plugins.routing.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {RouterModule, Routes} from '@angular/router';
33
import {AuthGuard} from 'src/app/common/guards';
44

55
export const routes: Routes = [
6+
// INSERT ROUTES HERE
67
];
78

89
@NgModule({

0 commit comments

Comments
 (0)