Added Washing test results tables

Related Work Items: #6660

1 files changed, 32 insertions, 3 deletions

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 8a75c526f..cc1bba0e7 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
@@ -34,6 +34,10 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         public event EventHandler SaveTestResults;
 
         #region Properties
+
+        public List<WashingTestMaterial> WashingTestMaterials { get; set; }
+
+
         private SynchronizedObservableCollection<RmlExtensionTestResult> _selectedTestResults;
 
         public SynchronizedObservableCollection<RmlExtensionTestResult> SelectedTestResults
@@ -269,15 +273,21 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             }
             _active_context = ObservablesContext.CreateDefault();
             ResultTabs.Clear();
-            LogManager.Log("Loading selected test results...");
+
+            if(WashingTestMaterials == null)
+                WashingTestMaterials =  _active_context.WashingTestMaterials.ToList();
+
+                LogManager.Log("Loading selected test results...");
 
                 using (_notification.PushTaskItem("Loading Test Results Parameters ..."))
                 {
-                    var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().BuildAsync();
+                    var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().BuildAsync();
                     SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection();
                     foreach (var result in SelectedTestResults)
                     {
-                        ResultTabs.Add(new TestResultViewVM(_notification, _actionLogManager) { TestResult = result, ThreadName = ThreadName });
+                        var testResultViewVM = new TestResultViewVM(_notification, _actionLogManager) { TestResult = result, ThreadName = ThreadName };
+                        CreateWashingResult(testResultViewVM);
+                        ResultTabs.Add(testResultViewVM);
                         if (result.ResultIndex == 1)
                         {
                             SelectedTab = ResultTabs[ResultTabs.Count - 1];
@@ -324,9 +334,28 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             tensileresults.Add(new TensileResult() { RmlExtensionTestResultsGuid = newtab.TestResult.Guid, TestResultColor = TestResultColors.WHITE, ColorPercent = null });
             newtab.TestResult.TensileResults = tensileresults;
 
+            CreateWashingResult(newtab);
+            
             return newtab;
         }
 
+        private void CreateWashingResult(TestResultViewVM testresultViewVM)
+        {
+            if(testresultViewVM.TestResult.RmlExtensionTestWashingResults != null)
+                return;
+
+            var whashingresults = new SynchronizedObservableCollection<RmlExtensionTestWashingResult>();
+            foreach (var material in WashingTestMaterials)
+            {
+                foreach (WashingResultColor color in Enum.GetValues(typeof(WashingResultColor)))
+                {
+                    whashingresults.Add(new RmlExtensionTestWashingResult() { RmlExtensionTestResultsGuid = testresultViewVM.TestResult.Guid, WashingTestMaterialsGuid = material.Guid, Color = (int)color });
+                }
+            }
+            testresultViewVM.TestResult.RmlExtensionTestWashingResults = whashingresults;
+
+        }
+
         #endregion
         #region Save