Merge branch 'rc' of https://github.com/bexis2/core into rc

Author: sventhiel

.gitignore

@@ -281,3 +281,4 @@ svelte
 /Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Scripts/svelte
 /_output
 /Console/BExIS.Web.Shell/Web.config
+/Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI/Properties/PublishProfiles/FolderProfile.pubxml

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

@@ -392,7 +392,7 @@ public Dataset UpdateAnyTupleForDataset(Dataset dataset, StructuredDataStructure
             }
         }
 
-        public List<DataTuple> GetUpdatedDatatuples(DatasetVersion datasetVersion, StructuredDataStructure dataStructure, DatasetManager datasetManager)
+        public List<DataTuple> GetUpdatedDatatuples(DatasetVersion datasetVersion, StructuredDataStructure dataStructure, DatasetManager datasetManager, int count = 0)
         {
             datasetVersion.Should().NotBeNull();
             var dataset = datasetVersion.Dataset;
@@ -401,11 +401,17 @@ public List<DataTuple> GetUpdatedDatatuples(DatasetVersion datasetVersion, Struc
 
             try
             {
-                var datatuples = datasetManager.GetDataTuples(datasetVersion.Id);
+                List<AbstractTuple> datatuples = new List<AbstractTuple>();
+                if(count == 0)
+                    datatuples =  datasetManager.GetDataTuples(datasetVersion.Id);
+                else
+                    datatuples = datasetManager.GetDataTuples(datasetVersion.Id).Take(count).ToList();
+
                 List<DataTuple> editedTuples = new List<DataTuple>();
 
                 foreach (var dataTuple in datatuples)
                 {
+
                     dataTuple.Materialize();
 
                     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
                     //dataTuple.XmlVariableValues.Should().NotBeNull();
 
                     editedTuples.Add((DataTuple)dataTuple);
+                  
                 }
 
                 return editedTuples;

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

@@ -196,7 +196,7 @@ public void EditDatasetVersion_UpdateAllDataTuples_SameNumberOfDatatuples(int pr
                 datatupleFromDatabaseIds = datasetManager.GetDatasetVersionEffectiveTupleIds(latest);
 
                 //get updated tuples as incoming datatuples
-                incoming = dsHelper.GetUpdatedDatatuples(latest, dataset.DataStructure as StructuredDataStructure, datasetManager);
+                incoming = dsHelper.GetUpdatedDatatuples(latest, dataset.DataStructure as StructuredDataStructure, datasetManager, 10);
 
                 //because of updateing all datatuples the incoming number is should be equal then the existing one
                 expectedCount = incoming.Count;