Skip to content

Commit 614c7d5

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into master
2 parents 71f743b + f9b0295 commit 614c7d5

File tree

8 files changed

+115
-21
lines changed

8 files changed

+115
-21
lines changed

‎eFormAPI/EformBase.Pn/eFormApi.BasePn.csproj‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,24 @@
3030
<WarningLevel>4</WarningLevel>
3131
<PlatformTarget>x64</PlatformTarget>
3232
</PropertyGroup>
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
34+
<DebugSymbols>true</DebugSymbols>
35+
<OutputPath>bin\x64\Debug\</OutputPath>
36+
<DefineConstants>DEBUG;TRACE</DefineConstants>
37+
<DebugType>full</DebugType>
38+
<PlatformTarget>x64</PlatformTarget>
39+
<ErrorReport>prompt</ErrorReport>
40+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
43+
<OutputPath>bin\x64\Release\</OutputPath>
44+
<DefineConstants>TRACE</DefineConstants>
45+
<Optimize>true</Optimize>
46+
<DebugType>pdbonly</DebugType>
47+
<PlatformTarget>x64</PlatformTarget>
48+
<ErrorReport>prompt</ErrorReport>
49+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
50+
</PropertyGroup>
3351
<ItemGroup>
3452
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
3553
<HintPath>..\packages\AWSSDK.Core.3.3.23\lib\net45\AWSSDK.Core.dll</HintPath>
@@ -52,8 +70,8 @@
5270
<Reference Include="EPPlus, Version=4.5.2.1, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
5371
<HintPath>..\packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll</HintPath>
5472
</Reference>
55-
<Reference Include="Microting.eForm, Version=2.1.258.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Microting.eForm.2.1.258\lib\net45\Microting.eForm.dll</HintPath>
73+
<Reference Include="Microting.eForm, Version=2.1.280.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Microting.eForm.2.1.280\lib\net45\Microting.eForm.dll</HintPath>
5775
</Reference>
5876
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
5977
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>
@@ -120,9 +138,6 @@
120138
<None Include="App.config" />
121139
<None Include="packages.config" />
122140
</ItemGroup>
123-
<ItemGroup>
124-
<Content Include="JasperExporter.jar" />
125-
</ItemGroup>
126141
<ItemGroup>
127142
<Folder Include="Controllers\" />
128143
</ItemGroup>
@@ -135,6 +150,7 @@
135150
<Generator>ResXFileCodeGenerator</Generator>
136151
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
137152
</EmbeddedResource>
153+
<Content Include="JasperExporter.jar" />
138154
</ItemGroup>
139155
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
140156
</Project>

‎eFormAPI/EformBase.Pn/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="EPPlus" version="4.5.2.1" targetFramework="net46" />
99
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net46" />
1010
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net46" />
11-
<package id="Microting.eForm" version="2.1.258" targetFramework="net46" />
11+
<package id="Microting.eForm" version="2.1.280" targetFramework="net46" />
1212
<package id="MySql.Data" version="6.9.12" targetFramework="net46" />
1313
<package id="MySql.Data.Entity" version="6.9.12" targetFramework="net46" />
1414
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />

‎eFormAPI/eFormAPI.sln‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2027
4+
VisualStudioVersion = 15.0.27004.2009
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eFormAPI.Web", "eFormAPI\eFormAPI.Web.csproj", "{54404CF9-A407-4F55-BC26-B243099E29A8}"
77
ProjectSection(ProjectDependencies) = postProject
@@ -69,7 +69,6 @@ Global
6969
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|Any CPU.ActiveCfg = Debug|x86
7070
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|x64.ActiveCfg = Debug|x64
7171
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|x86.ActiveCfg = Debug|x86
72-
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|x86.Build.0 = Debug|x86
7372
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Release|Any CPU.ActiveCfg = Release|x86
7473
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Release|x64.ActiveCfg = Release|x64
7574
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Release|x64.Build.0 = Release|x64
@@ -78,7 +77,6 @@ Global
7877
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|Any CPU.ActiveCfg = Debug|x86
7978
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|x64.ActiveCfg = Debug|x86
8079
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|x86.ActiveCfg = Debug|x86
81-
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|x86.Build.0 = Debug|x86
8280
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|Any CPU.ActiveCfg = Release|x86
8381
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.ActiveCfg = Release|x86
8482
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.Build.0 = Release|x86
@@ -87,7 +85,6 @@ Global
8785
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|Any CPU.ActiveCfg = Debug|x86
8886
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x64.ActiveCfg = Debug|x86
8987
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x86.ActiveCfg = Debug|x86
90-
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x86.Build.0 = Debug|x86
9188
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|Any CPU.ActiveCfg = Release|x86
9289
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x64.ActiveCfg = Release|x86
9390
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x64.Build.0 = Release|x86
@@ -96,7 +93,6 @@ Global
9693
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9794
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x64.ActiveCfg = Debug|x64
9895
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x86.ActiveCfg = Debug|Any CPU
99-
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x86.Build.0 = Debug|Any CPU
10096
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
10197
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Release|Any CPU.Build.0 = Release|Any CPU
10298
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Release|x64.ActiveCfg = Release|x64
@@ -106,7 +102,6 @@ Global
106102
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107103
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x64.ActiveCfg = Debug|x64
108104
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x86.ActiveCfg = Debug|Any CPU
109-
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x86.Build.0 = Debug|Any CPU
110105
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Release|Any CPU.ActiveCfg = Release|Any CPU
111106
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Release|Any CPU.Build.0 = Release|Any CPU
112107
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Release|x64.ActiveCfg = Release|x64
@@ -141,8 +136,8 @@ Global
141136
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Debug|x86.Build.0 = Debug|Any CPU
142137
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
143138
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Release|Any CPU.Build.0 = Release|Any CPU
144-
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Release|x64.ActiveCfg = Release|Any CPU
145-
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Release|x64.Build.0 = Release|Any CPU
139+
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Release|x64.ActiveCfg = Release|x64
140+
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Release|x64.Build.0 = Release|x64
146141
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Release|x86.ActiveCfg = Release|Any CPU
147142
{E271AA01-FC8D-42F2-ACAA-17AB95E98CA0}.Release|x86.Build.0 = Release|Any CPU
148143
EndGlobalSection

‎eFormAPI/eFormAPI/eFormAPI.Web.csproj‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131131
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
132132
</Reference>
133-
<Reference Include="Microting.eForm, Version=2.1.258.0, Culture=neutral, processorArchitecture=MSIL">
134-
<HintPath>..\packages\Microting.eForm.2.1.258\lib\net45\Microting.eForm.dll</HintPath>
133+
<Reference Include="Microting.eForm, Version=2.1.280.0, Culture=neutral, processorArchitecture=MSIL">
134+
<HintPath>..\packages\Microting.eForm.2.1.280\lib\net45\Microting.eForm.dll</HintPath>
135135
</Reference>
136136
<Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
137137
<HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
@@ -359,6 +359,18 @@
359359
<Compile Include="Migrations\EformMigrationsConfiguration.cs" />
360360
<Compile Include="Properties\AssemblyInfo.cs" />
361361
<Compile Include="Infrastructure\Services\EmailService.cs" />
362+
<Compile Include="Properties\Resources.da.Designer.cs">
363+
<DependentUpon>Resources.da.resx</DependentUpon>
364+
<AutoGen>True</AutoGen>
365+
<DesignTime>True</DesignTime>
366+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
367+
</Compile>
368+
<Compile Include="Properties\Resources.Designer.cs">
369+
<AutoGen>True</AutoGen>
370+
<DesignTime>True</DesignTime>
371+
<DependentUpon>Resources.resx</DependentUpon>
372+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
373+
</Compile>
362374
<Compile Include="Startup.cs" />
363375
</ItemGroup>
364376
<ItemGroup>
@@ -403,6 +415,16 @@
403415
<EmbeddedResource Include="Migrations\201806142159030_AddLocaleForUser.resx">
404416
<DependentUpon>201806142159030_AddLocaleForUser.cs</DependentUpon>
405417
</EmbeddedResource>
418+
<EmbeddedResource Include="Properties\Resources.da.resx">
419+
<Generator>ResXFileCodeGenerator</Generator>
420+
<LastGenOutput>Resources.da.Designer.cs</LastGenOutput>
421+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
422+
</EmbeddedResource>
423+
<EmbeddedResource Include="Properties\Resources.resx">
424+
<Generator>ResXFileCodeGenerator</Generator>
425+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
426+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
427+
</EmbeddedResource>
406428
</ItemGroup>
407429
<ItemGroup>
408430
<Folder Include="Plugins\" />
@@ -424,7 +446,7 @@
424446
<DocumentationFile>bin\API.docs.xml</DocumentationFile>
425447
<NoWarn>1591;</NoWarn>
426448
<DebugType>full</DebugType>
427-
<PlatformTarget>x64</PlatformTarget>
449+
<PlatformTarget>AnyCPU</PlatformTarget>
428450
<ErrorReport>prompt</ErrorReport>
429451
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
430452
</PropertyGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<IISExpressWindowsAuthentication />
1616
<IISExpressUseClassicPipelineMode />
1717
<UseGlobalApplicationHostFile />
18-
<LastActiveSolutionConfig>Debug|x64</LastActiveSolutionConfig>
18+
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
1919
</PropertyGroup>
2020
<ProjectExtensions>
2121
<VisualStudio>

‎eFormAPI/eFormAPI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
3838
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
3939
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
40-
<package id="Microting.eForm" version="2.1.258" targetFramework="net461" />
40+
<package id="Microting.eForm" version="2.1.280" targetFramework="net461" />
4141
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
4242
<package id="MySql.Data" version="6.9.11" targetFramework="net46" />
4343
<package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />

‎eform-client/protractor.conf.vsts.js‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// Protractor configuration file, see link for more information
2+
// https://github.com/angular/protractor/blob/master/lib/config.ts
3+
4+
/*global jasmine */
5+
var SpecReporter = require('jasmine-spec-reporter');
6+
exports.config = {
7+
allScriptsTimeout: 4500000,
8+
specs: [
9+
'./e2e/tests/settings/settings.site-header.e2e-spec.ts',
10+
'./e2e/tests/settings/settings.login-page.e2e-spec.ts',
11+
'./e2e/tests/device-users/device-users.add.e2e-spec.ts',
12+
'./e2e/tests/device-users/device-users.delete.e2e-spec.ts',
13+
'./e2e/tests/device-users/device-users.edit.e2e-spec.ts',
14+
'./e2e/tests/main-page/main-page.create-eform.e2e-spec.ts',
15+
'./e2e/tests/main-page/main-page.filter-eform.e2e-spec.ts',
16+
'./e2e/tests/main-page/main-page.sort-eform.e2e-spec.ts',
17+
'./e2e/tests/main-page/main-page.tags.e2e-spec.ts',
18+
'./e2e/tests/main-page/main-page.delete-eform.e2e-spec.ts'
19+
],
20+
suites: {
21+
'site-header': './e2e/tests/settings/settings.site-header.e2e-spec.ts',
22+
'login-page': './e2e/tests/settings/settings.login-page.e2e-spec.ts',
23+
'device-users-add': './e2e/tests/device-users/device-users.add.e2e-spec.ts',
24+
'device-users-edit': './e2e/tests/device-users/device-users.edit.e2e-spec.ts',
25+
'device-users-delete': './e2e/tests/device-users/device-users.delete.e2e-spec.ts',
26+
'main-page-create': './e2e/tests/main-page/main-page.create-eform.e2e-spec.ts',
27+
'main-page-filter':'./e2e/tests/main-page/main-page.filter-eform.e2e-spec.ts',
28+
'main-page-sort':'./e2e/tests/main-page/main-page.sort-eform.e2e-spec.ts',
29+
'main-page-tags':'./e2e/tests/main-page/main-page.tags.e2e-spec.ts',
30+
'main-page-delete':'./e2e/tests/main-page/main-page.delete-eform.e2e-spec.ts'
31+
},
32+
capabilities: {
33+
browserName: 'chrome',
34+
chromeOptions: { args: [ "--headless", "--disable-gpu" ]},
35+
maxSessions: 1,
36+
maxInstances: 1
37+
},
38+
directConnect: true,
39+
baseUrl:
40+
'VSTS_TEST_SERVER_ADDRESS',
41+
framework:
42+
'jasmine',
43+
jasmineNodeOpts: {
44+
showColors: true,
45+
defaultTimeoutInterval: 720000,
46+
print: function () {
47+
}
48+
},
49+
useAllAngular2AppRoots: true,
50+
beforeLaunch: function () {
51+
require('ts-node').register({
52+
project: 'e2e'
53+
});
54+
},
55+
onPrepare: function () {
56+
jasmine.getEnv().addReporter(new SpecReporter());
57+
}
58+
59+
};
60+

‎eform-client/server.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const app = express();
66
const defaultPort = process.env.PORT || $$port$$;
77

88
// proxy
9-
var apiProxy = httpProxy.createProxyServer();
9+
var apiProxy = httpProxy.createProxyServer({changeOrigin: true});
1010
var apiForwardingUrl = 'http://localhost:$$apiport$$/';
1111
apiProxy.on('error', function(e) {
1212
console.error('Error:');
@@ -15,7 +15,7 @@ apiProxy.on('error', function(e) {
1515
});
1616

1717
// gzip
18-
app.use(compression());
18+
// app.use(compression());
1919
app.use(express.static(__dirname + '/dist'));
2020

2121
// api handler
@@ -29,6 +29,7 @@ app.all('/api/*', function (req, res) {
2929

3030
// so that PathLocationStrategy can be used
3131
app.all('/*', function (req, res) {
32+
res.removeHeader('accept-encoding');
3233
res.sendFile(path.join(__dirname + '/dist/index.html'));
3334
});
3435

0 commit comments

Comments
 (0)