Skip to content

Commit 31ea9b9

Browse files
EleonoraPetzoldEleonoraPetzold
authored
Merge pull request #176 from bexis/dev_v3
Dev v3
2 parents 7925967 + 2985807 commit 31ea9b9

File tree

225 files changed

+37719
-395
lines changed

Some content is hidden

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

225 files changed

+37719
-395
lines changed

‎BExIS++.lutconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<LUTConfig Version="1.0">
2+
<Repository />
3+
<ParallelBuilds>true</ParallelBuilds>
4+
<ParallelTestRuns>true</ParallelTestRuns>
5+
<TestCaseTimeout>180000</TestCaseTimeout>
6+
</LUTConfig>

‎BExIS++.sln‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SMM", "SMM", "{02EA681E-C7D
234234
EndProject
235235
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}"
236236
EndProject
237+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PUM", "PUM", "{96384857-88D4-4282-8EFD-FE8FCB0319B7}"
238+
EndProject
239+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BExIS.Modules.PUM.UI", "Console\BExIS.Web.Shell\Areas\PUM\BExIS.Modules.PUM.UI\BExIS.Modules.PUM.UI.csproj", "{C1AE3004-853A-4CCF-9099-AE919C6121C8}"
240+
EndProject
237241
Global
238242
GlobalSection(SolutionConfigurationPlatforms) = preSolution
239243
Debug|Any CPU = Debug|Any CPU
@@ -1508,6 +1512,24 @@ Global
15081512
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|Mixed Platforms.Build.0 = TestServerRelease|Any CPU
15091513
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|x86.ActiveCfg = TestServerRelease|Any CPU
15101514
{37402CAB-EB81-4D08-8791-8653949C0FEB}.TestServerRelease|x86.Build.0 = TestServerRelease|Any CPU
1515+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1516+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
1517+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
1518+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
1519+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Debug|x86.ActiveCfg = Debug|Any CPU
1520+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Debug|x86.Build.0 = Debug|Any CPU
1521+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
1522+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Release|Any CPU.Build.0 = Release|Any CPU
1523+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
1524+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
1525+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Release|x86.ActiveCfg = Release|Any CPU
1526+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.Release|x86.Build.0 = Release|Any CPU
1527+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.TestServerRelease|Any CPU.ActiveCfg = TestServerRelease|Any CPU
1528+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.TestServerRelease|Any CPU.Build.0 = TestServerRelease|Any CPU
1529+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.TestServerRelease|Mixed Platforms.ActiveCfg = TestServerRelease|Any CPU
1530+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.TestServerRelease|Mixed Platforms.Build.0 = TestServerRelease|Any CPU
1531+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.TestServerRelease|x86.ActiveCfg = TestServerRelease|Any CPU
1532+
{C1AE3004-853A-4CCF-9099-AE919C6121C8}.TestServerRelease|x86.Build.0 = TestServerRelease|Any CPU
15111533
EndGlobalSection
15121534
GlobalSection(SolutionProperties) = preSolution
15131535
HideSolutionNode = FALSE
@@ -1604,10 +1626,12 @@ Global
16041626
{9BFFFD11-03C6-47DF-9CC9-F458A9A49377} = {F3354AC7-CDA1-44E2-8E85-8DB532ED8C75}
16051627
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {692AFF14-3A57-47D8-912F-093EC8F561C4}
16061628
{37402CAB-EB81-4D08-8791-8653949C0FEB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
1629+
{96384857-88D4-4282-8EFD-FE8FCB0319B7} = {692AFF14-3A57-47D8-912F-093EC8F561C4}
1630+
{C1AE3004-853A-4CCF-9099-AE919C6121C8} = {96384857-88D4-4282-8EFD-FE8FCB0319B7}
16071631
EndGlobalSection
16081632
GlobalSection(ExtensibilityGlobals) = postSolution
1609-
EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
16101633
SolutionGuid = {9B6E4921-8EBA-487D-A098-3E473A0EAC64}
1634+
EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.2.1.505.2\lib\NET35
16111635
EndGlobalSection
16121636
GlobalSection(SubversionScc) = preSolution
16131637
Svn-Managed = True

‎Components/DLM/BExIS.Dlm.Entities/Data/VariableValue.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public VariableInstance Variable
6161
{
6262
get
6363
{
64-
if (this.Tuple.DatasetVersion.Dataset.DataStructure.Self is StructuredDataStructure)
64+
if (this.Tuple.DatasetVersion.Dataset.DataStructure != null)
6565
{
6666
VariableInstance u = (this.Tuple.DatasetVersion.Dataset.DataStructure.Self as StructuredDataStructure).Variables
6767
.Where(p => p.Id.Equals(this.VariableId))

‎Components/DLM/BExIS.Dlm.Services/Data/DatasetManager.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ public DataTable GetLatestDatasetVersionTuples(long datasetId, int pageNumber, i
12541254
// should use the fallback method, but DatasetConvertor class must be merged with OutputDataManager and SearchUIHelper claases first.
12551255
var version = this.GetDatasetLatestVersion(datasetId);
12561256
var tuples = getDatasetVersionEffectiveTuples(version, pageNumber, pageSize, false); // the false, causes the method to use a scoped sesssion and keep it alive further processings that aredone later on the tuples
1257-
if (version.Dataset.DataStructure.Self is StructuredDataStructure)
1257+
if (version.Dataset.DataStructure!=null)
12581258
{
12591259
DataTable table = convertDataTuplesToDataTable(tuples, version, (StructuredDataStructure)version.Dataset.DataStructure.Self);
12601260
return table;
@@ -1268,7 +1268,7 @@ public DataTable GetDatasetVersionTuples(long versionId, int pageNumber, int pag
12681268
// should use the fallback method, but DatasetConvertor class must be merged with OutputDataManager and SearchUIHelper claases first.
12691269
var version = this.GetDatasetVersion(versionId);
12701270
var tuples = getDatasetVersionEffectiveTuples(version, pageNumber, pageSize, false); // the false, causes the method to use a scoped sesssion and keep it alive further processings that aredone later on the tuples
1271-
if (version.Dataset.DataStructure.Self is StructuredDataStructure)
1271+
if (version.Dataset.DataStructure != null)
12721272
{
12731273
DataTable table = convertDataTuplesToDataTable(tuples, version, (StructuredDataStructure)version.Dataset.DataStructure.Self);
12741274
return table;
@@ -3361,7 +3361,7 @@ private void createMaterializedView(long datasetId)
33613361
{
33623362
var datasetRepo = uow.GetReadOnlyRepository<Dataset>();
33633363
Dataset ds = datasetRepo.Get(datasetId);
3364-
if (ds.DataStructure != null && ds.DataStructure.Self is StructuredDataStructure)
3364+
if (ds.DataStructure != null && ds.DataStructure!= null)
33653365
{
33663366
StructuredDataStructure sds = (StructuredDataStructure)ds.DataStructure.Self;
33673367
if (sds.Variables != null && sds.Variables.Count() > 0)

0 commit comments

Comments
 (0)