Skip to content

Commit 2212537

Browse files
DavidBlaaDavidBlaa
committed
Merge branch 'rc' of https://github.com/BEXIS2/Core into rc
2 parents 0262b9e + a86dea2 commit 2212537

File tree

342 files changed

+27931
-34
lines changed

Some content is hidden

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

342 files changed

+27931
-34
lines changed

‎BExIS++.sln‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BExIS.Ext.Orm.NH", "Compone
230230
EndProject
231231
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BExIS.Modules.Dim.UI", "Console\BExIS.Web.Shell\Areas\DIM\BExIS.Modules.Dim.UI\BExIS.Modules.Dim.UI.csproj", "{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}"
232232
EndProject
233+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SMM", "SMM", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
234+
EndProject
235+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BExIS.Modules.SMM.UI", "Console\BExIS.Web.Shell\Areas\SMM\BExIS.Modules.SMM.UI\BExIS.Modules.SMM.UI.csproj", "{37402CAB-EB81-4D08-8791-8653949C0FEB}"
236+
EndProject
233237
Global
234238
GlobalSection(SolutionConfigurationPlatforms) = preSolution
235239
Debug|Any CPU = Debug|Any CPU
@@ -1486,6 +1490,24 @@ Global
14861490
{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}.TestServerRelease|Mixed Platforms.Build.0 = TestServerRelease|Any CPU
14871491
{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}.TestServerRelease|x86.ActiveCfg = TestServerRelease|Any CPU
14881492
{9BFFFD11-03C6-47DF-9CC9-F458A9A49377}.TestServerRelease|x86.Build.0 = TestServerRelease|Any CPU
1493+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1494+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
1495+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
1496+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
1497+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|x86.ActiveCfg = Debug|Any CPU
1498+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Debug|x86.Build.0 = Debug|Any CPU
1499+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
1500+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|Any CPU.Build.0 = Release|Any CPU
1501+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
1502+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
1503+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|x86.ActiveCfg = Release|Any CPU
1504+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.Release|x86.Build.0 = Release|Any CPU
1505+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Any CPU.ActiveCfg = TestServerRelease|Any CPU
1506+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Any CPU.Build.0 = TestServerRelease|Any CPU
1507+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Mixed Platforms.ActiveCfg = TestServerRelease|Any CPU
1508+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Mixed Platforms.Build.0 = TestServerRelease|Any CPU
1509+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|x86.ActiveCfg = TestServerRelease|Any CPU
1510+
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|x86.Build.0 = TestServerRelease|Any CPU
14891511
EndGlobalSection
14901512
GlobalSection(SolutionProperties) = preSolution
14911513
HideSolutionNode = FALSE
@@ -1580,6 +1602,8 @@ Global
15801602
{AF3D9C1F-968A-46DD-86FB-6B45020DF4E3} = {CD986786-CEA1-4C30-983E-169C33600BA6}
15811603
{C48DCFC5-DF47-4486-A682-5C648F970318} = {CD986786-CEA1-4C30-983E-169C33600BA6}
15821604
{9BFFFD11-03C6-47DF-9CC9-F458A9A49377} = {F3354AC7-CDA1-44E2-8E85-8DB532ED8C75}
1605+
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {692AFF14-3A57-47D8-912F-093EC8F561C4}
1606+
{37402CAB-EB81-4D08-8791-8653949C0FEB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
15831607
EndGlobalSection
15841608
GlobalSection(ExtensibilityGlobals) = postSolution
15851609
SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}

‎Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/BExIS.Modules.Dim.UI.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@
277277
<Reference Include="Telerik.Web.Mvc, Version=2013.2.611.340, Culture=neutral, PublicKeyToken=29ac1a93ec063d92, processorArchitecture=MSIL">
278278
<HintPath>..\..\..\..\..\packages\TelerikMvcExtensions.2013.2.611\lib\net40\Telerik.Web.Mvc.dll</HintPath>
279279
</Reference>
280-
<Reference Include="Vaelastrasz.Library, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
281-
<HintPath>..\..\..\..\..\packages\Vaelastrasz.Library.3.2.1\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
280+
<Reference Include="Vaelastrasz.Library, Version=3.2.2.0, Culture=neutral, processorArchitecture=MSIL">
281+
<HintPath>..\..\..\..\..\packages\Vaelastrasz.Library.3.2.2\lib\netstandard2.0\Vaelastrasz.Library.dll</HintPath>
282282
</Reference>
283283
<Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
284284
<HintPath>..\..\..\..\..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath>

‎Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/Helpers/DimSeedDataGenerator.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,10 +752,10 @@ private void createDataCiteMappingConcept()
752752
#region GeoLocationPoint
753753

754754
if (!mappingKeys.Any(k => k.XPath.Equals("data/attributes/geoLocations/geoLocationPoint/pointLongitude")))
755-
conceptManager.CreateMappingKey("PointLongitude", "", "", true, true, "data/attributes/geoLocations/geoLocationPoint/pointLongitude", mappingConcept, geoLocations_geoLocationPoint);
755+
conceptManager.CreateMappingKey("PointLongitude", "", "", true, false, "data/attributes/geoLocations/geoLocationPoint/pointLongitude", mappingConcept, geoLocations_geoLocationPoint);
756756

757757
if (!mappingKeys.Any(k => k.XPath.Equals("data/attributes/geoLocations/geoLocationPoint/pointLatitude")))
758-
conceptManager.CreateMappingKey("PointLatitude", "", "", true, true, "data/attributes/geoLocations/geoLocationPoint/pointLatitude", mappingConcept, geoLocations_geoLocationPoint);
758+
conceptManager.CreateMappingKey("PointLatitude", "", "", true, false, "data/attributes/geoLocations/geoLocationPoint/pointLatitude", mappingConcept, geoLocations_geoLocationPoint);
759759

760760
#endregion
761761

@@ -766,16 +766,16 @@ private void createDataCiteMappingConcept()
766766
#region GeoLocationBox
767767

768768
if (!mappingKeys.Any(k => k.XPath.Equals("data/attributes/geoLocations/geoLocationBox/westBoundLongitude")))
769-
conceptManager.CreateMappingKey("WestBoundLongitude", "", "", true, true, "data/attributes/geoLocations/geoLocationBox/westBoundLongitude", mappingConcept, geoLocations_geoLocationBox);
769+
conceptManager.CreateMappingKey("WestBoundLongitude", "", "", true, false, "data/attributes/geoLocations/geoLocationBox/westBoundLongitude", mappingConcept, geoLocations_geoLocationBox);
770770

771771
if (!mappingKeys.Any(k => k.XPath.Equals("data/attributes/geoLocations/geoLocationBox/eastBoundLongitude")))
772-
conceptManager.CreateMappingKey("EastBoundLongitude", "", "", true, true, "data/attributes/geoLocations/geoLocationBox/eastBoundLongitude", mappingConcept, geoLocations_geoLocationBox);
772+
conceptManager.CreateMappingKey("EastBoundLongitude", "", "", true, false, "data/attributes/geoLocations/geoLocationBox/eastBoundLongitude", mappingConcept, geoLocations_geoLocationBox);
773773

774774
if (!mappingKeys.Any(k => k.XPath.Equals("data/attributes/geoLocations/geoLocationBox/southBoundLatitude")))
775-
conceptManager.CreateMappingKey("SouthBoundLatitude", "", "", true, true, "data/attributes/geoLocations/geoLocationBox/southBoundLatitude", mappingConcept, geoLocations_geoLocationBox);
775+
conceptManager.CreateMappingKey("SouthBoundLatitude", "", "", true, false, "data/attributes/geoLocations/geoLocationBox/southBoundLatitude", mappingConcept, geoLocations_geoLocationBox);
776776

777777
if (!mappingKeys.Any(k => k.XPath.Equals("data/attributes/geoLocations/geoLocationBox/northBoundLatitude")))
778-
conceptManager.CreateMappingKey("NorthBoundLatitude", "", "", true, true, "data/attributes/geoLocations/geoLocationBox/northBoundLatitude", mappingConcept, geoLocations_geoLocationBox);
778+
conceptManager.CreateMappingKey("NorthBoundLatitude", "", "", true, false, "data/attributes/geoLocations/geoLocationBox/northBoundLatitude", mappingConcept, geoLocations_geoLocationBox);
779779

780780
#endregion
781781

‎Console/BExIS.Web.Shell/Areas/DIM/BExIS.Modules.Dim.UI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@
8686
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net48" />
8787
<package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net48" />
8888
<package id="TelerikMvcExtensions" version="2013.2.611" targetFramework="net48" />
89-
<package id="Vaelastrasz.Library" version="3.2.1" targetFramework="net48" />
89+
<package id="Vaelastrasz.Library" version="3.2.2" targetFramework="net48" />
9090
<package id="WebActivatorEx" version="2.2.0" targetFramework="net48" />
9191
</packages>

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/.eslintignore‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.DS_Store
2+
node_modules
3+
/build
4+
/.svelte-kit
5+
/package
6+
.env
7+
.env.*
8+
!.env.example
9+
10+
# Ignore files for PNPM, NPM and YARN
11+
pnpm-lock.yaml
12+
package-lock.json
13+
yarn.lock

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/.eslintrc.cjs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
module.exports = {
2+
root: true,
3+
parser: '@typescript-eslint/parser',
4+
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
5+
plugins: ['svelte3', '@typescript-eslint'],
6+
ignorePatterns: ['*.cjs'],
7+
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
8+
settings: {
9+
'svelte3/typescript': () => require('typescript')
10+
},
11+
parserOptions: {
12+
sourceType: 'module',
13+
ecmaVersion: 2020
14+
},
15+
env: {
16+
browser: true,
17+
es2017: true,
18+
node: true
19+
}
20+
};

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/.gitignore‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.DS_Store
2+
node_modules
3+
/build
4+
public
5+
.vscode
6+
/.svelte-kit
7+
/package
8+
.env
9+
.env.*
10+
!.env.example
11+
vite.config.js.timestamp-*
12+
_app

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
engine-strict=true

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/.prettierignore‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.DS_Store
2+
node_modules
3+
/build
4+
/.svelte-kit
5+
/package
6+
.env
7+
.env.*
8+
!.env.example
9+
10+
# Ignore files for PNPM, NPM and YARN
11+
pnpm-lock.yaml
12+
package-lock.json
13+
yarn.lock

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/.prettierrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"useTabs": true,
3+
"singleQuote": true,
4+
"trailingComma": "none",
5+
"printWidth": 100,
6+
"plugins": ["prettier-plugin-svelte"],
7+
"pluginSearchDirs": ["."],
8+
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
9+
}

0 commit comments

Comments
 (0)