Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

6 files changed, 89 insertions, 97 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
index f1203231e..c4c4dff85 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
@@ -16,10 +16,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{8266D1DF-F677-4891-A9B6-CFA7550CDF28} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{7A1C5574-B9FF-4D67-B228-C216B72E7C96} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.8.11.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.8.12.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -843,7 +843,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.8.11" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.8.11"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.8.12" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.8.12"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 458bc913a..686d95ccc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -992,16 +992,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             YarnTypes = _active_context.YarnTypes.ToObservableCollection();
             IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection();
 
-            var machines = new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().Build();
-            Machines = machines.Select(x => new MachineModel()
-            {
-                Guid = x.Guid,
-                Name = x.Name,
-                SerialNumber = x.SerialNumber,
-                IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty),
-                LastUpdated = x.LastUpdated,
-                HasRMLTest = false
-            }).ToObservableCollection();
+            
 
         }
 
@@ -1058,6 +1049,16 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
 
                     _active_context = ObservablesContext.CreateDefault();
                     LoadRmlProperties();
+                    var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildListAsync();
+                    Machines = machines.Select(x => new MachineModel()
+                    {
+                        Guid = x.Guid,
+                        Name = x.Name,
+                        SerialNumber = x.SerialNumber,
+                        IdsPacks = x.Configuration.IdsPacks.Where(z => !z.IsEmpty),
+                        LastUpdated = x.LastUpdated,
+                        HasRMLTest = false
+                    }).ToObservableCollection();
 
                     if (guid == null)
                     {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
index ba7ae7238..34ceb9ce8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
@@ -198,9 +198,13 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                 
                 _active_context.TensileResults.RemoveRange(tab.TestResult.TensileResults);
                 tab.TestResult.TensileResults = null;
-                
+
+                _active_context.RmlExtensionTestWashingResults.RemoveRange(tab.TestResult.RmlExtensionTestWashingResults);
+                tab.TestResult.RmlExtensionTestWashingResults = null;
+
                 _active_context.RmlExtensionTestResults.Remove(tab.TestResult);
 
+                
                 ResultTabs.Remove(tab);
                 SelectedTab = ResultTabs.LastOrDefault();
                 _active_context.SaveChanges();
@@ -211,7 +215,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         /// <summary>
         /// Adds a new tab.
         /// </summary>
-        private bool AddNewTab(String name = null)
+        private  bool AddNewTab(String name = null)
         {
             if (ResultTabs.Count > 7)
             {
@@ -226,11 +230,23 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             
             if (!String.IsNullOrWhiteSpace(name))
             {
-                var tab = CreateNewTestResultVM(name, (ResultTabs.Count + 1));
-                ResultTabs.Add(tab);
-                _active_context.RmlExtensionTestResults.Add(tab.TestResult);
-                SelectedTab = tab;
-                return true;
+                try
+                {
+                    var tab = CreateNewTestResultVM(name, (ResultTabs.Count + 1));
+                    ResultTabs.Add(tab);
+                    SelectedTestResults.Add(tab.TestResult);
+                    _active_context.RmlExtensionTestResults.Add(tab.TestResult);
+                    
+                    _active_context.SaveChanges();
+                    SelectedTab = ResultTabs.FirstOrDefault(x=> x.TestResult.Guid == tab.TestResult.Guid);
+                    
+                    return true;
+                }
+                catch(Exception ex)
+                {
+                    LogManager.Log(ex, $"Error add new Tab TestResults.\n{ex.FlattenMessage()}");
+                    return false;
+                }
             }
             else
             {
@@ -274,31 +290,28 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         {
             if (String.IsNullOrEmpty(SelectedMachineGUID))
             {
-             //   _notification.ShowWarning(LogManager.Log($" Please, select machine.", LogCategory.Warning));
                 return;
             }
 
             try
             {
                 IsFree = false;
-            if (_active_context != null)
-            {
-                _active_context.Dispose();
-            }
-            _active_context = ObservablesContext.CreateDefault();
-            ResultTabs.Clear();
-
-            if(WashingTestMaterials == null)
-                WashingTestMaterials =  _active_context.WashingTestMaterials.OrderBy(x=> x.Name).ToList();
-
                 LogManager.Log("Loading selected test results...");
 
+                if (_active_context != null)
+                {
+                    _active_context.Dispose();
+                }
+
+                _active_context = ObservablesContext.CreateDefault();
+                ResultTabs.Clear();
+                
                 using (_notification.PushTaskItem("Loading Test Results Parameters ..."))
                 {
                     
                     BtsrApplicationTypes = _active_context.BtsrApplicationTypes.ToObservableCollection();
-                    
                     BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection();
+                    WashingTestMaterials =  _active_context.WashingTestMaterials.OrderBy(x=> x.Name).ToList();
 
                     var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().WithBtsrApplicationTypes().WithBtsrYarnTypes().BuildAsync();
                     SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection();
@@ -307,24 +320,20 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                         var testResultViewVM = new TestResultViewVM(_notification, _actionLogManager) { TestResult = result, ThreadName = ThreadName };
                         CreateWashingResult(testResultViewVM);
                         ResultTabs.Add(testResultViewVM);
-                        if (result.ResultIndex == 1)
-                        {
-                            SelectedTab = ResultTabs[ResultTabs.Count - 1];
-                        }
+                        
                     }
                     if (ResultTabs.Count == 0)
                     {
-                        SelectedTab = CreateNewTestResultVM("Untitled", 1);
-                        ResultTabs.Add(SelectedTab);
-                        _active_context.RmlExtensionTestResults.Add(SelectedTab.TestResult);
-                        await _active_context.SaveChangesAsync();
+                        AddNewTab("Untitled");
                     }
+                    if(ResultTabs.Count > 0)
+                        SelectedTab = ResultTabs[ResultTabs.Count - 1];
                 }
                 IsFree = true;
             }
             catch (Exception ex)
             {
-                LogManager.Log(ex, $"Error loading TestResults.\n{ex.FlattenMessage()}");
+                LogManager.Log(ex, $"Error loading TestResults.\n{ex.FlattenMessage()}\n Inner Exception: {ex.InnerException.InnerException.ToString()}");
             }
             finally
             {
@@ -338,6 +347,8 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             newtab.TestResult = new RmlExtensionTestResult() { RmlsExtensionsGuid = RMLExtemtionGUID, MachineGuid = SelectedMachineGUID, ResultIndex = index, Name = name, BtsrMax = 0.0, BtsrMin = 0.0, DryerTemperature = 0, TunnelTemperature = 0, TunnelFlow = 0.0, TunnelAvgTemperature = 0.0, TensionHeadMax = 0.0,
             TensionHeadMin = 0.0, TensioinAfterDryerMax = 0.0, TensionAfterDryerMin = 0.0, TensionWinderMax = 0.0, TensionWinderMin = 0.0, PullerTensionMax = 0.0, PullerTensionMin = 0.0, ExitTensionMax = 0.0, ExitTensionMin = 0.0, SeverityZone1Max = 0.0, SeverityZone1Min = 0.0, SeverityZone2Max = 0.0, SeverityZone2Min = 0.0,
             RefLubVersion="", RefCof = 0.0, RefLub = 0.0, ThreadLubVersion = "", ThreadCof = 0.0, ThreadLub = 0.0, Conclusions="", Comment=""};
+
+            
             var rubbingresults = new SynchronizedObservableCollection<RubbingResult>();
             rubbingresults.Add(new RubbingResult() { RmlExtensionTestResultsGuid = newtab.TestResult.Guid, TestResultColor = TestResultColors.CYAN });
             rubbingresults.Add(new RubbingResult() { RmlExtensionTestResultsGuid = newtab.TestResult.Guid, TestResultColor = TestResultColors.MAGENTA });
@@ -393,7 +404,6 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                         model.AddMaterial(rmlExtensionTestWashingResult.Guid, material.Name, null);
                         rmlExtensionTestWashingResult.WashingTestMaterials = material;
                         whashingresults.Add(rmlExtensionTestWashingResult);
-
                     }
                     collecction.Add( model);
                 }
@@ -472,7 +482,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             try
             {
                 IsFree = false;
-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                 {
                     foreach (var tab in ResultTabs)
                     {
@@ -482,7 +492,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                     _active_context.SaveChanges();
                 });
                
-              //  LoadTestResults();
+                //LoadTestResults();
             }
             catch (Exception ex)
             {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 217c6fd93..1661f19ee 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.8.11.0")]
+[assembly: AssemblyVersion("4.8.12.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
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);
             });
         }
     }