Skip to content

Commit f10bd73

Browse files
author
Mathias Husum Nielsen
committed
# Conflicts: # eform-client/src/scss/styles.scss
2 parents 41a0842 + 023d850 commit f10bd73

File tree

88 files changed

+2134
-148
lines changed

Some content is hidden

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

88 files changed

+2134
-148
lines changed

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,12 @@ eFormAPI/EformBase\.Pn/Plugins/EformBase/
367367

368368
eFormAPI/Plugins/Vehicles\.Pn/Vehicles/
369369

370-
eform-client/src/app/plugins/modules/
371370

372371
eFormAPI/Plugins/
373372
eFormAPI/eFormAPI/Areas/HelpPage/HelpPage.css
374373

375-
eFormAPI/eFormAPI/output/
374+
eFormAPI/eFormAPI/output/
375+
eFormAPI/eFormAPI/dataFolder/
376+
377+
eform-client/src/app/plugins/modules/customers-pn/
378+

‎eFormAPI/eFormAPI/Controllers/SettingsController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public OperationResult ConnectionStringExist()
3434
{
3535
return new OperationResult(true);
3636
}
37-
return new OperationResult(false);
37+
return new OperationResult(false, "Connection string does not exist");
3838
}
3939

4040
[AllowAnonymous]

‎eFormAPI/eFormAPI/eFormAPI.Web.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@
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.326.0, Culture=neutral, processorArchitecture=MSIL">
134-
<HintPath>..\packages\Microting.eForm.2.1.326\lib\net45\Microting.eForm.dll</HintPath>
133+
<Reference Include="Microting.eForm, Version=3.0.12.0, Culture=neutral, processorArchitecture=MSIL">
134+
<HintPath>..\packages\Microting.eForm.3.0.12\lib\net45\Microting.eForm.dll</HintPath>
135135
</Reference>
136-
<Reference Include="Microting.eFormApi.BasePn, Version=1.1.16.0, Culture=neutral, processorArchitecture=MSIL">
137-
<HintPath>..\packages\Microting.eFormApi.BasePn.1.1.16\lib\net46\Microting.eFormApi.BasePn.dll</HintPath>
136+
<Reference Include="Microting.eFormApi.BasePn, Version=1.1.25.0, Culture=neutral, processorArchitecture=MSIL">
137+
<HintPath>..\packages\Microting.eFormApi.BasePn.1.1.25\lib\net461\Microting.eFormApi.BasePn.dll</HintPath>
138138
</Reference>
139139
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
140140
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>

‎eFormAPI/eFormAPI/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
3737
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
3838
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
39-
<package id="Microting.eForm" version="2.1.326" targetFramework="net461" />
40-
<package id="Microting.eFormApi.BasePn" version="1.1.16" targetFramework="net461" />
39+
<package id="Microting.eForm" version="3.0.12" targetFramework="net461" />
40+
<package id="Microting.eFormApi.BasePn" version="1.1.25" targetFramework="net461" />
4141
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
4242
<package id="MySql.Data" version="6.9.12" targetFramework="net461" />
4343
<package id="MySql.Data.Entity" version="6.9.12" targetFramework="net461" />

‎eform-client/angular.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@
2323
"polyfills": "src/polyfills.ts",
2424
"tsConfig": "src/tsconfig.app.json",
2525
"assets": [
26-
"src/favicon.ico",
27-
"src/assets"
26+
{ "glob": "**/*", "input": "src/assets/", "output": "/assets/" },
27+
{ "glob": "**/assets/**", "input": "src/app/plugins/modules", "output": "/assets/" },
28+
{ "glob": "favicon.ico", "input": "/src", "output": "/" }
2829
],
2930
"styles": [
3031
"port/angular-bootstrap-md/scss/bootstrap/bootstrap.scss",

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export default {
2+
LoginPage: {
3+
originalMainText: 'Microting eForm',
4+
customMainText: 'Custom login page main text',
5+
originalSecondaryText: 'No more paper-forms and back-office data entry',
6+
customSecondaryText: 'Custom login page secondary text'
7+
},
8+
SiteHeader: {
9+
originalMainText: 'Microting eForm',
10+
customMainText: 'No more paper-forms and back-office data entry',
11+
originalSecondaryText: 'No more paper-forms and back-office data entry',
12+
customSecondaryText: 'Custom site header secondary text'
13+
}
14+
};

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
export default {
2+
username: 'admin',
3+
password: 'Qq1234567$',
4+
email: '[email protected]',
5+
firstName: 'John',
6+
lastNAme: 'Smith',
7+
dataSourceSDK: 'Data Source=.\\SQLEXPRESS',
8+
initialCatalogueSDK: 'eFormSDK',
9+
authenticationTypeSDK: 'Integrated Security=True',
10+
dataSourceMain: 'Data Source=.\\SQLEXPRESS',
11+
token: 'abc1234567890abc1234567890abcdef',
12+
initialCatalogueMain: 'eFormMain',
13+
authenticationTypeMain: 'Integrated Security=True',
14+
languageOptions: {
15+
english: 'English',
16+
danish: 'Danish'
17+
}
18+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default {};

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
username: 'admin',
3+
password: 'Qq1234567$'
4+
};

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export default {
2+
};

0 commit comments

Comments
 (0)