MS. Performance when open RML extensions. Bug during delete tab - remove objects before save.

Related Work Items: #7357

2 files changed, 33 insertions, 52 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
index a9aabdbdd..8accb9a90 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
@@ -15,27 +15,6 @@ namespace Tango.BL.Builders
         {
         }
         
-        public virtual RMLExtensionTestResultsCollectionBuilder WithRubbingAndTensileResults()
-        {
-            return AddStep(2, () =>
-            {
-                foreach (var result in Entities.ToList())
-                {
-                    Context.RubbingResults.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).OrderBy(x => x.Color).ToList();
-                    Context.TensileResults.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).OrderByDescending(i => i.ColorPercent.HasValue).ThenBy(x => x.ColorPercent).ThenByDescending(x => x.Color).ToList();
-                }
-            });
-        }
-        public virtual RMLExtensionTestResultsCollectionBuilder WithTestResultsFiles()
-        {
-            return AddStep(3, () =>
-            {
-                foreach (var result in Entities.ToList())
-                {
-                    Context.RmlExtensionTestResultsFiles.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).OrderBy(x => x.FileName).ToList();
-                }
-            });
-        }
         public virtual RMLExtensionTestResultsCollectionBuilder ForRMLExtension(String rmlExtensionGUID)
         {
             return AddQueryStep(0, (query) =>
@@ -50,6 +29,7 @@ namespace Tango.BL.Builders
                 }
             });
         }
+
         public virtual RMLExtensionTestResultsCollectionBuilder ForMachine(String machineGUID)
         {
             return AddQueryStep(1, (query) =>
@@ -65,9 +45,23 @@ namespace Tango.BL.Builders
             });
         }
 
+        public virtual RMLExtensionTestResultsCollectionBuilder WithRubbingAndTensileResults()
+        {
+            return AddQueryStep(2, (query) =>
+            {
+                return query.Include(x => x.RubbingResults).Include(x => x.TensileResults); ;
+            });
+            
+        }
+
         public virtual RMLExtensionTestResultsCollectionBuilder WithWashingTestResults()
         {
-            return AddStep(4, () =>
+            return AddQueryStep(3, (query) =>
+            {
+                return query.Include(x => x.RmlExtensionTestWashingResults);//.Include(x => x.RmlExtensionTestWashingResults.WashingTestMaterials);
+            });
+
+           /* return AddStep(4, () =>
             {
                 foreach (var result in Entities.ToList())
                 {
@@ -78,30 +72,30 @@ namespace Tango.BL.Builders
                     }
                     
                 }
-            });
+            });*/
         }
 
         public virtual RMLExtensionTestResultsCollectionBuilder WithBtsrApplicationTypes()
         {
-            return AddStep(5, () =>
+            return AddQueryStep(4, (query) =>
             {
-                foreach (var result in Entities.ToList())
-                {
-                    if(!String.IsNullOrEmpty(result.BtsrApplicationTypeGuid))
-                        result.BtsrApplicationType = Context.BtsrApplicationTypes.FirstOrDefault(x => x.Guid == result.BtsrApplicationTypeGuid);
-                }
+                return query.Include(x => x.BtsrApplicationType) ;
             });
         }
 
         public virtual RMLExtensionTestResultsCollectionBuilder WithBtsrYarnTypes()
         {
-            return AddStep(6, () =>
+            return AddQueryStep(5, (query) =>
             {
-                foreach (var result in Entities.ToList())
-                {
-                    if (!String.IsNullOrEmpty(result.BtsrYarnTypeGuid))
-                        result.BtsrYarnType = Context.BtsrYarnTypes.FirstOrDefault(x => x.Guid == result.BtsrYarnTypeGuid);
-                }
+                return query.Include(x => x.BtsrYarnType);
+            });
+        }
+
+        public virtual RMLExtensionTestResultsCollectionBuilder WithTestResultsFiles()
+        {
+            return AddQueryStep(6, (query) =>
+            {
+                return query.Include(x => x.RmlExtensionTestResultsFiles);
             });
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs
index 25ca3e8f3..38d31feea 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs
@@ -21,34 +21,21 @@ namespace Tango.BL.Builders
             {
                 return query.Include(x => x.MachineVersion);
             });
-            
         }
 
         public virtual MachinesCollectionBuilder WithOrganization()
         {
-            return AddStep(2, () =>
+            return AddQueryStep(2, (query) =>
             {
-                foreach (var machine in Entities.ToList())
-                {
-                    Context.Organizations.Where(x => x.Guid == machine.OrganizationGuid)
-                    .Include(x => x.Address)
-                    .Include(x => x.Contact).FirstOrDefault();
-                }
+                return query.Include(x => x.Organization);
             });
         }
 
         public virtual MachinesCollectionBuilder WithConfiguration()
         {
-            return AddStep(3, () =>
+            return AddQueryStep(3, (query) =>
             {
-                foreach (var machine in Entities.ToList())
-                {
-                    new ConfigurationBuilder(Context)
-                        .Set(machine.ConfigurationGuid)
-                        .WithIdsPacks()
-                        .WithHardwareVersion()
-                        .Build();
-                    }
+                return query.Include(x => x.Configuration).Include(x => x.Configuration.IdsPacks);
             });
         }
     }