Skip to content

Commit 08a51ba

Browse files
renemadsenrenemadsen
committed
Merge branch 'master' of github.com:microting/eform-angular-frontend
2 parents 6f39e7a + 7e7235c commit 08a51ba

Some content is hidden

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

47 files changed

+218
-198
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,3 +364,5 @@ eFormAPI/eFormAPI/expection\.txt
364364
eFormAPI/eFormAPI/Plugins/
365365

366366
eFormAPI/EformBase\.Pn/Plugins/EformBase/
367+
368+
eFormAPI/Plugins/Vehicles\.Pn/Vehicles/

eFormAPI/eFormAPI/Infrastructure/Helpers/LocaleHelper.cs renamed to eFormAPI/EformBase.Pn/Helpers/LocaleHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Threading;
2-
using eFormAPI.Web.Properties;
2+
using EformBase.Pn.Properties;
33

4-
namespace eFormAPI.Web.Infrastructure.Helpers
4+
namespace EformBase.Pn.Helpers
55
{
66
public static class LocaleHelper
77
{

eFormAPI/eFormAPI/Infrastructure/Models/API/OperationDataResult.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Models/API/OperationDataResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace eFormAPI.Web.Infrastructure.Models.API
1+
namespace EformBase.Pn.Infrastructure.Models.API
22
{
33
public class OperationDataResult<TModel> : OperationResult
44
{

eFormAPI/eFormAPI/Infrastructure/Models/API/OperationResult.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Models/API/OperationResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace eFormAPI.Web.Infrastructure.Models.API
1+
namespace EformBase.Pn.Infrastructure.Models.API
22
{
33
public class OperationResult
44
{

eFormAPI/eFormAPI/Properties/Resources.Designer.cs renamed to eFormAPI/EformBase.Pn/Properties/Resources.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eFormAPI/eFormAPI/Properties/Resources.da.resx renamed to eFormAPI/EformBase.Pn/Properties/Resources.da.resx

File renamed without changes.

eFormAPI/eFormAPI/Properties/Resources.resx renamed to eFormAPI/EformBase.Pn/Properties/Resources.resx

File renamed without changes.

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,20 @@
119119
</ItemGroup>
120120
<ItemGroup>
121121
<Compile Include="Consts\EformRoles.cs" />
122+
<Compile Include="Helpers\LocaleHelper.cs" />
122123
<Compile Include="Infrastructure\Handlers\GenerateJasperFilesHandler.cs" />
123124
<Compile Include="Infrastructure\EFormCoreHelper.cs" />
124125
<Compile Include="Infrastructure\Installers\RebusInstaller.cs" />
125126
<Compile Include="Infrastructure\Installers\RebusHandlerInstaller.cs" />
126127
<Compile Include="Infrastructure\Messages\GenerateJasperFiles.cs" />
128+
<Compile Include="Infrastructure\Models\API\OperationDataResult.cs" />
129+
<Compile Include="Infrastructure\Models\API\OperationResult.cs" />
127130
<Compile Include="Properties\AssemblyInfo.cs" />
131+
<Compile Include="Properties\Resources.Designer.cs">
132+
<AutoGen>True</AutoGen>
133+
<DesignTime>True</DesignTime>
134+
<DependentUpon>Resources.resx</DependentUpon>
135+
</Compile>
128136
</ItemGroup>
129137
<ItemGroup>
130138
<None Include="App.config" />
@@ -137,6 +145,11 @@
137145
<Analyzer Include="..\packages\AWSSDK.SQS.3.3.3.7\analyzers\dotnet\cs\AWSSDK.SQS.CodeAnalysis.dll" />
138146
</ItemGroup>
139147
<ItemGroup>
148+
<EmbeddedResource Include="Properties\Resources.da.resx" />
149+
<EmbeddedResource Include="Properties\Resources.resx">
150+
<Generator>ResXFileCodeGenerator</Generator>
151+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
152+
</EmbeddedResource>
140153
<Content Include="JasperExporter.jar" />
141154
</ItemGroup>
142155
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎eFormAPI/eFormAPI.sln‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Global
5555
EndGlobalSection
5656
GlobalSection(ProjectConfigurationPlatforms) = postSolution
5757
{54404CF9-A407-4F55-BC26-B243099E29A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{54404CF9-A407-4F55-BC26-B243099E29A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
5859
{54404CF9-A407-4F55-BC26-B243099E29A8}.Debug|x64.ActiveCfg = Debug|x64
5960
{54404CF9-A407-4F55-BC26-B243099E29A8}.Debug|x64.Build.0 = Debug|x64
6061
{54404CF9-A407-4F55-BC26-B243099E29A8}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -66,7 +67,6 @@ Global
6667
{54404CF9-A407-4F55-BC26-B243099E29A8}.Release|x86.ActiveCfg = Release|Any CPU
6768
{54404CF9-A407-4F55-BC26-B243099E29A8}.Release|x86.Build.0 = Release|Any CPU
6869
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|Any CPU.ActiveCfg = Debug|x86
69-
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|Any CPU.Build.0 = Debug|x86
7070
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|x64.ActiveCfg = Debug|x64
7171
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|x86.ActiveCfg = Debug|x86
7272
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Release|Any CPU.ActiveCfg = Release|x86
@@ -83,7 +83,6 @@ Global
8383
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x86.ActiveCfg = Release|x86
8484
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x86.Build.0 = Release|x86
8585
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|Any CPU.ActiveCfg = Debug|x86
86-
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|Any CPU.Build.0 = Debug|x86
8786
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x64.ActiveCfg = Debug|x86
8887
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x86.ActiveCfg = Debug|x86
8988
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|Any CPU.ActiveCfg = Release|x86
@@ -92,7 +91,6 @@ Global
9291
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x86.ActiveCfg = Release|x86
9392
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x86.Build.0 = Release|x86
9493
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95-
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
9694
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x64.ActiveCfg = Debug|x64
9795
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x86.ActiveCfg = Debug|Any CPU
9896
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -102,7 +100,6 @@ Global
102100
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Release|x86.ActiveCfg = Release|Any CPU
103101
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Release|x86.Build.0 = Release|Any CPU
104102
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105-
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|Any CPU.Build.0 = Debug|Any CPU
106103
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x64.ActiveCfg = Debug|x64
107104
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x86.ActiveCfg = Debug|Any CPU
108105
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -112,7 +109,6 @@ Global
112109
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Release|x86.ActiveCfg = Release|Any CPU
113110
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Release|x86.Build.0 = Release|Any CPU
114111
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115-
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|Any CPU.Build.0 = Debug|Any CPU
116112
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x64.ActiveCfg = Debug|x64
117113
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x86.ActiveCfg = Debug|Any CPU
118114
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x86.Build.0 = Debug|Any CPU
@@ -123,7 +119,6 @@ Global
123119
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|x86.ActiveCfg = Release|Any CPU
124120
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|x86.Build.0 = Release|Any CPU
125121
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126-
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|Any CPU.Build.0 = Debug|Any CPU
127122
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x64.ActiveCfg = Debug|x64
128123
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x86.ActiveCfg = Debug|Any CPU
129124
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x86.Build.0 = Debug|Any CPU

‎eFormAPI/eFormAPI/App_Start/Startup.Auth.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
32
using eFormAPI.Web.Infrastructure.Attributes;
43
using eFormAPI.Web.Infrastructure.Data;
54
using eFormAPI.Web.Infrastructure.Identity;

0 commit comments

Comments
 (0)