Skip to content

Commit 523dc74

Browse files
DavidBlaaDavidBlaa
authored
Merge pull request #2230 from BEXIS2/2195-bexis2-entity-extensions-streamlining-the-workflow-and-data-linking
2195 bexis2 entity extensions streamlining the workflow and data linking
2 parents 89a31f5 + 3118863 commit 523dc74

File tree

96 files changed

+17315
-215
lines changed

Some content is hidden

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

96 files changed

+17315
-215
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,4 @@ svelte
281281
/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Scripts/svelte
282282
/_output
283283
/Console/BExIS.Web.Shell/Web.config
284+
/Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/Properties/PublishProfiles/FolderProfile.pubxml

‎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}

‎Components/DLM/BExIS.Dlm.Tests/Helpers/DatasetHelper.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ public Dataset UpdateAnyTupleForDataset(Dataset dataset, StructuredDataStructure
392392
}
393393
}
394394

395-
public List<DataTuple> GetUpdatedDatatuples(DatasetVersion datasetVersion, StructuredDataStructure dataStructure, DatasetManager datasetManager)
395+
public List<DataTuple> GetUpdatedDatatuples(DatasetVersion datasetVersion, StructuredDataStructure dataStructure, DatasetManager datasetManager, int count = 0)
396396
{
397397
datasetVersion.Should().NotBeNull();
398398
var dataset = datasetVersion.Dataset;
@@ -401,11 +401,17 @@ public List<DataTuple> GetUpdatedDatatuples(DatasetVersion datasetVersion, Struc
401401

402402
try
403403
{
404-
var datatuples = datasetManager.GetDataTuples(datasetVersion.Id);
404+
List<AbstractTuple> datatuples = new List<AbstractTuple>();
405+
if(count == 0)
406+
datatuples = datasetManager.GetDataTuples(datasetVersion.Id);
407+
else
408+
datatuples = datasetManager.GetDataTuples(datasetVersion.Id).Take(count).ToList();
409+
405410
List<DataTuple> editedTuples = new List<DataTuple>();
406411

407412
foreach (var dataTuple in datatuples)
408413
{
414+
409415
dataTuple.Materialize();
410416

411417
var vv = dataTuple.VariableValues.Where(v => v.VariableId.Equals(dataStructure.Variables.Skip(4).First().Id)).FirstOrDefault();
@@ -416,6 +422,7 @@ public List<DataTuple> GetUpdatedDatatuples(DatasetVersion datasetVersion, Struc
416422
//dataTuple.XmlVariableValues.Should().NotBeNull();
417423

418424
editedTuples.Add((DataTuple)dataTuple);
425+
419426
}
420427

421428
return editedTuples;

‎Components/DLM/BExIS.Dlm.Tests/Services/Data/DatasetManager_EditDatasetVersionTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public void EditDatasetVersion_UpdateAllDataTuples_SameNumberOfDatatuples(int pr
196196
datatupleFromDatabaseIds = datasetManager.GetDatasetVersionEffectiveTupleIds(latest);
197197

198198
//get updated tuples as incoming datatuples
199-
incoming = dsHelper.GetUpdatedDatatuples(latest, dataset.DataStructure as StructuredDataStructure, datasetManager);
199+
incoming = dsHelper.GetUpdatedDatatuples(latest, dataset.DataStructure as StructuredDataStructure, datasetManager, 10);
200200

201201
//because of updateing all datatuples the incoming number is should be equal then the existing one
202202
expectedCount = incoming.Count;

‎Components/XML/BExIS.Xml.Helpers/Mapping/XmlSchemaManager.cs‎

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ public long GenerateMetadataStructure(string nameOfStartNode, string schemaName)
716716
//Debug.Writeline("package : " + element.Name);
717717
//Debug.Writeline("--------------------------");
718718

719-
string typeName = GetTypeOfName(element.Name);
719+
string typeName = GetTypeOfName(element);
720720
string rootName = ((XmlSchemaElement)root).Name;
721721

722722
string xpathInternal = "Metadata/" + element.Name + "/" + typeName;
@@ -965,7 +965,7 @@ private MetadataCompoundAttribute get(XmlSchemaElement element, List<string> par
965965
if (ct.Name != null)
966966
nameOfType = ct.Name;
967967
else
968-
nameOfType = GetTypeOfName(element.Name);
968+
nameOfType = GetTypeOfName(element);
969969

970970
MetadataCompoundAttribute metadataCompountAttr = getExistingMetadataCompoundAttribute(nameOfType);
971971
string currentInternalXPath = internalXPath + "/" + element.Name + "/" + nameOfType;
@@ -1328,9 +1328,9 @@ private MetadataCompoundAttribute addMetadataAttributeToMetadataCompoundAttribut
13281328
MetadataAttribute attribute;
13291329

13301330
if (metadataAttributeManager.MetadataAttributeRepo != null &&
1331-
getExistingMetadataAttribute(GetTypeOfName(element.Name)) != null)
1331+
getExistingMetadataAttribute(GetTypeOfName(element)) != null)
13321332
{
1333-
attribute = getExistingMetadataAttribute(GetTypeOfName(element.Name));
1333+
attribute = getExistingMetadataAttribute(GetTypeOfName(element));
13341334
}
13351335
else
13361336
{
@@ -1443,7 +1443,7 @@ private MetadataAttribute createMetadataAttribute(XmlSchemaElement element, stri
14431443
{
14441444
XmlSchemaSimpleType type = (XmlSchemaSimpleType)element.ElementSchemaType;
14451445

1446-
string name = GetTypeOfName(element.Name);
1446+
string name = GetTypeOfName(element);
14471447
string description = "";
14481448

14491449
if (element.Annotation != null)
@@ -1507,7 +1507,7 @@ private MetadataAttribute createMetadataAttribute(XmlSchemaElement element, stri
15071507
var t = ComplexTypes.FirstOrDefault(c => c.Name.Equals(type.Name));
15081508
if (t != null) type = t;
15091509

1510-
string name = GetTypeOfName(element.Name);
1510+
string name = GetTypeOfName(element);
15111511
string description = "";
15121512

15131513
if (element.Annotation != null)
@@ -1628,7 +1628,8 @@ private MetadataCompoundAttribute createMetadataCompoundAttribute(XmlSchemaEleme
16281628
{
16291629
// create a compoundAttribute
16301630
int i = 0;
1631-
MetadataCompoundAttribute mca = getExistingMetadataCompoundAttribute(element.Name + "Type"); ;// = metadataAttributeManager.MetadataCompoundAttributeRepo.Get(p => p.Name == element.Name+"Type").FirstOrDefault();
1631+
string typeName = GetTypeOfName(element);
1632+
MetadataCompoundAttribute mca = getExistingMetadataCompoundAttribute(typeName); ;// = metadataAttributeManager.MetadataCompoundAttributeRepo.Get(p => p.Name == element.Name+"Type").FirstOrDefault();
16321633
//Debug.WriteLine("createMetadataCompoundAttribute" + i++);
16331634
DataType dt1 = dataTypeManager.Repo.Get(p => p.Name.ToLower().Equals("text")).FirstOrDefault();
16341635
if (dt1 == null)
@@ -1640,8 +1641,8 @@ private MetadataCompoundAttribute createMetadataCompoundAttribute(XmlSchemaEleme
16401641
{
16411642
mca = new MetadataCompoundAttribute
16421643
{
1643-
ShortName = GetTypeOfName(element.Name),
1644-
Name = GetTypeOfName(element.Name),
1644+
ShortName = typeName,
1645+
Name = typeName,
16451646
Description = "",
16461647
DataType = dt1
16471648
};
@@ -1909,9 +1910,9 @@ private void addMetadataAttributeToMappingFile(MetadataCompoundAttribute compoun
19091910
MetadataAttribute attribute;
19101911

19111912
if (metadataAttributeManager.MetadataAttributeRepo != null &&
1912-
metadataAttributeManager.MetadataAttributeRepo.Query().Where(m => m.Name.Equals(GetTypeOfName(element.Name))).Count() > 0)
1913+
metadataAttributeManager.MetadataAttributeRepo.Query().Where(m => m.Name.Equals(GetTypeOfName(element))).Count() > 0)
19131914
{
1914-
attribute = metadataAttributeManager.MetadataAttributeRepo.Query().Where(m => m.Name.Equals(GetTypeOfName(element.Name))).First();
1915+
attribute = metadataAttributeManager.MetadataAttributeRepo.Query().Where(m => m.Name.Equals(GetTypeOfName(element))).First();
19151916
}
19161917
else
19171918
{
@@ -2203,9 +2204,28 @@ private void checkDirectory(string filePath)
22032204
}
22042205
}
22052206

2206-
private string GetTypeOfName(string name)
2207+
private string GetTypeOfName(XmlSchemaElement element)
22072208
{
2208-
return name + "Type";
2209+
string nameOfType = "";
2210+
2211+
// check if type is complex
2212+
XmlSchemaComplexType ct = XmlSchemaUtility.GetComplextType(element);
2213+
2214+
if (ct != null && ct.Name != null)
2215+
{
2216+
return ct.Name;
2217+
}
2218+
2219+
//check if simple type
2220+
XmlSchemaSimpleType st = XmlSchemaUtility.GetSimpleType(element);
2221+
2222+
if(st != null && st.Name != null)
2223+
{
2224+
return st.Name;
2225+
}
2226+
2227+
// nothing found so create a new name + XSDType
2228+
return element.Name + element.ElementType.GetType().Name; // bexis2InternType
22092229
}
22102230

22112231
#endregion helper functions

‎Components/XML/BExIS.Xml.Helpers/XmlSchemaUtility.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,14 @@ public static XmlSchemaComplexType GetComplextType(XmlSchemaElement element)
524524
return null;
525525
}
526526

527+
public static XmlSchemaSimpleType GetSimpleType(XmlSchemaElement element)
528+
{
529+
if (element.ElementSchemaType is XmlSchemaSimpleType)
530+
return element.ElementSchemaType as XmlSchemaSimpleType;
531+
532+
return null;
533+
}
534+
527535
public static List<XmlSchemaElement> GetAllSimpleElements(List<XmlSchemaElement> elements)
528536
{
529537
List<XmlSchemaElement> simpleElementList = new List<XmlSchemaElement>();

0 commit comments

Comments
 (0)