From c4e8c98689dcedf035484cd079eac8d9678286db Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 24 Jul 2022 16:45:32 +0300 Subject: Added Washing test results tables Related Work Items: #6660 --- .../Views/TestResultsView.xaml | 316 +++++++++++++-------- 1 file changed, 204 insertions(+), 112 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index f6262b52d..0aceebc9a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -255,57 +255,148 @@ - - - - - - - - - - + + + + + + - - - - Process Parameters - + + + + Process Parameters + - - - Dryer temperature - - - - - - Tunnel temperature - - - - - - Tunnel flow - - - - - - Tunnel AVG temperature - - - - - - - - - Rubbing results - - + + + Dryer temperature + + + + + + Tunnel temperature + + + + + + Tunnel flow + + + + + + Tunnel AVG temperature + + + + + + + + + + Rubbing results + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Uniformity + + + + Uniformity + + + Severity + + + Zone 1 + + + + + - + + + + + Zone 2 + + + + + - + + + + + + + + Washing results + - + - - + + - - + + + + + + + + + - + - + - - - + + + + + + + + + + @@ -360,29 +464,49 @@ + + + + + + + + + + + + + + + + + + + + Tension through the thread path Tension in Zone - + - Tensiometer (gr) - + Tensiometer (gr) + Tension in Zone - + MS - + - Head - + Head + @@ -392,7 +516,7 @@ BTSR - + @@ -402,7 +526,7 @@ After dryer - + @@ -412,7 +536,7 @@ Puller tension - + @@ -422,7 +546,7 @@ Winder - + @@ -441,7 +565,7 @@ - + Mechanical properties @@ -499,9 +623,9 @@ - + - + @@ -515,45 +639,12 @@ - + - - Uniformity - - - - Uniformity - - - Severity - - - Zone 1 - - - - - - - - - - - Zone 2 - - - - - - - - - - - - COF @@ -599,12 +690,13 @@ - + - + + - - + + -- cgit v1.3.1 From 516ee0b585d84bda4fcc3c31aa44d1e3b7da5e93 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 28 Jul 2022 18:33:11 +0300 Subject: MS. RML extension. Added table washing test results , GUI and database. Related Work Items: #6660 --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../Models/WashingMaterialColorModel.cs | 255 +++++++++ .../Tango.MachineStudio.ThreadExtensions.csproj | 5 + .../ViewModels/TestResultViewVM.cs | 14 + .../ViewModels/TestResultsViewVM.cs | 64 ++- .../Views/TestResultsView.xaml | 602 ++++++++++++--------- .../Views/TestResultsView.xaml.cs | 13 + .../DTO/RmlExtensionTestWashingResultDTOBase.cs | 8 + .../Entities/RmlExtensionTestWashingResult.cs | 35 +- .../Entities/RmlExtensionTestWashingResultBase.cs | 38 ++ .../ColorCanvas/Implementation/ColorCanvas.cs | 3 +- .../DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 3 + .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 174 +++--- 15 files changed, 871 insertions(+), 344 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/WashingMaterialColorModel.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index ae97d44f3..e333b6ee5 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 320ca4e52..b5da0b516 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/WashingMaterialColorModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/WashingMaterialColorModel.cs new file mode 100644 index 000000000..868ce1d58 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/WashingMaterialColorModel.cs @@ -0,0 +1,255 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core; + +namespace Tango.MachineStudio.ThreadExtensions.Models +{ + public class WashingMaterialColorModel : ExtendedObject + { + public class MaterialColorValueModel: ExtendedObject + { + private string _materialName; + + public string MaterialName + { + get { return _materialName; } + set + { + _materialName = value; + RaisePropertyChangedAuto(); + } + } + + private double? _colorValue; + + public double? ColorValue + { + get { return _colorValue; } + set { + _colorValue= value; + RaisePropertyChangedAuto(); + } + } + + public string RmlExtensionTestWashingResultGUID { get; set; } + } + + private int _index; + + public int Index + { + get { return _index; } + set { _index = value; } + } + + private int _color; + + public int Color + { + get { return _color; } + set + { + _color = value; + RaisePropertyChangedAuto(); + } + } + + private List _colorValues; + + public List ColorValues + { + get { return _colorValues; } + set { _colorValues = value; + RaisePropertyChangedAuto(); } + } + + + public double? WashingValue1 + { + get { + if (ColorValues.Count >= 1) + return ColorValues[0].ColorValue; + return null; + } + set { + if (ColorValues.Count >= 1) + ColorValues[0].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue2 + { + get + { + if (ColorValues.Count > 1) + return ColorValues[1].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 1) + ColorValues[1].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue3 + { + get + { + if (ColorValues.Count > 2) + return ColorValues[2].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 2) + ColorValues[2].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue4 + { + get + { + if (ColorValues.Count > 3) + return ColorValues[3].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 3) + ColorValues[3].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue5 + { + get + { + if (ColorValues.Count > 4) + return ColorValues[4].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 4) + ColorValues[4].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue6 + { + get + { + if (ColorValues.Count > 5) + return ColorValues[5].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 5) + ColorValues[5].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public double? WashingValue7 + { + get + { + if (ColorValues.Count > 6) + return ColorValues[6].ColorValue; + return null; + } + set + { + if (ColorValues.Count > 6) + ColorValues[6].ColorValue = value; + RaisePropertyChangedAuto(); + } + } + + public string Header1 + { + get + { + if (ColorValues.Count >= 1) + return ColorValues[0].MaterialName; + return null; + } + } + public string Header2 + { + get + { + if (ColorValues.Count > 1) + return ColorValues[1].MaterialName; + return null; + } + } + public string Header3 + { + get + { + if (ColorValues.Count > 2) + return ColorValues[2].MaterialName; + return null; + } + } + public string Header4 + { + get + { + if (ColorValues.Count > 3) + return ColorValues[3].MaterialName; + return null; + } + } + public string Header5 + { + get + { + if (ColorValues.Count > 4) + return ColorValues[4].MaterialName; + return null; + } + } + public string Header6 + { + get + { + if (ColorValues.Count > 5) + return ColorValues[5].MaterialName; + return null; + } + } + public string Header7 + { + get + { + if (ColorValues.Count > 6) + return ColorValues[6].MaterialName; + return null; + } + } + + public WashingMaterialColorModel() + { + ColorValues = new List(); + } + + public void AddMaterial(string rmlExtensionTestWashingResultGuid, string materialName, double? colorValue) + { + ColorValues.Add(new MaterialColorValueModel(){ MaterialName = materialName, ColorValue = colorValue, RmlExtensionTestWashingResultGUID = rmlExtensionTestWashingResultGuid}); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj index f8d6419f6..000ab221a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Tango.MachineStudio.ThreadExtensions.csproj @@ -117,6 +117,7 @@ + @@ -258,6 +259,10 @@ {b60c695c-61e8-4091-b506-4c45349c04aa} Tango.ColorCalibration + + {a2f5af44-29ff-45d6-9d25-ecda5cce88b5} + Tango.ColorPicker + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs index 68a886f99..624ee7216 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultViewVM.cs @@ -18,6 +18,7 @@ using Tango.Core.Commands; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.ThreadExtensions.Models; using Tango.SharedUI; +using System.Collections.ObjectModel; namespace Tango.MachineStudio.ThreadExtensions.ViewModels { @@ -66,6 +67,18 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels RaisePropertyChanged(nameof(TestResultsFiles)); } } + + private ObservableCollection _colorsToMaterialCollection; + + public ObservableCollection ColorsToMaterialCollection + { + get { return _colorsToMaterialCollection; } + set { _colorsToMaterialCollection = value; + RaisePropertyChangedAuto(); + } + } + + public List TestResultsFiles { @@ -91,6 +104,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels DownLoadFileCommand = new RelayCommand(DownLoadFile); DeleteCommand = new RelayCommand(DeleteFile); DownLoadAllCommand = new RelayCommand(DownLoadAllFiles); + } #region TestResultsFiles 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 cc1bba0e7..2dd444f0f 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 @@ -275,7 +275,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels ResultTabs.Clear(); if(WashingTestMaterials == null) - WashingTestMaterials = _active_context.WashingTestMaterials.ToList(); + WashingTestMaterials = _active_context.WashingTestMaterials.OrderBy(x=> x.Name).ToList(); LogManager.Log("Loading selected test results..."); @@ -336,25 +336,54 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels CreateWashingResult(newtab); + return newtab; } private void CreateWashingResult(TestResultViewVM testresultViewVM) { - if(testresultViewVM.TestResult.RmlExtensionTestWashingResults != null) - return; - - var whashingresults = new SynchronizedObservableCollection(); - foreach (var material in WashingTestMaterials) + if(testresultViewVM.TestResult.RmlExtensionTestWashingResults != null && testresultViewVM.TestResult.RmlExtensionTestWashingResults.Count > 0 ) { - foreach (WashingResultColor color in Enum.GetValues(typeof(WashingResultColor))) + var collection = new ObservableCollection(); + Dictionary colorDictionary = new Dictionary(); + List< RmlExtensionTestWashingResult > washingResultsOrdersByColor = testresultViewVM.TestResult.RmlExtensionTestWashingResults.OrderBy(x=>x.IndexRow).ThenBy(c => c.WashingTestMaterials != null ? c.WashingTestMaterials.Name : c.WashingTestMaterialsGuid).ToList(); + foreach (var res in washingResultsOrdersByColor) { - whashingresults.Add(new RmlExtensionTestWashingResult() { RmlExtensionTestResultsGuid = testresultViewVM.TestResult.Guid, WashingTestMaterialsGuid = material.Guid, Color = (int)color }); + WashingMaterialColorModel wmodel = null; + if(false == colorDictionary.TryGetValue(res.IndexRow, out wmodel)) + { + wmodel = new WashingMaterialColorModel() { Color = res.Color }; + colorDictionary.Add(res.IndexRow, wmodel); + collection.Add(wmodel); + } + wmodel.AddMaterial(res.Guid, res.GetMaterialName, res.WashingValue); } + testresultViewVM.ColorsToMaterialCollection = collection; } - testresultViewVM.TestResult.RmlExtensionTestWashingResults = whashingresults; + else + { + var whashingresults = new SynchronizedObservableCollection(); + var collecction = new ObservableCollection(); + for (int index_row = 0; index_row < 6; index_row++) + { + var model = new WashingMaterialColorModel() { Color = -1 }; + + foreach (var material in WashingTestMaterials) + { + var rmlExtensionTestWashingResult = new RmlExtensionTestWashingResult() { RmlExtensionTestResultsGuid = testresultViewVM.TestResult.Guid, WashingTestMaterialsGuid = material.Guid, Color = -1, IndexRow = index_row }; + model.AddMaterial(rmlExtensionTestWashingResult.Guid, material.Name, null); + rmlExtensionTestWashingResult.WashingTestMaterials = material; + whashingresults.Add(rmlExtensionTestWashingResult); + + } + collecction.Add( model); + } + testresultViewVM.ColorsToMaterialCollection = collecction; + testresultViewVM.TestResult.RmlExtensionTestWashingResults = whashingresults; + } } + #endregion #region Save @@ -398,6 +427,22 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } } + public void ApplyToWashingResults(TestResultViewVM testresultViewVM) + { + foreach ( var model in testresultViewVM.ColorsToMaterialCollection) + { + foreach( var colormodel in model.ColorValues) + { + var result = testresultViewVM.TestResult.RmlExtensionTestWashingResults.FirstOrDefault(x=> x.Guid == colormodel.RmlExtensionTestWashingResultGUID); + if( result != null) + { + result.Color = model.Color; + result.WashingValue = colormodel.ColorValue; + } + } + } + } + public async void Save() { if (String.IsNullOrEmpty(SelectedMachineGUID)) @@ -412,6 +457,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels { foreach (var tab in ResultTabs) { + ApplyToWashingResults(tab); tab.TestResult.LastUpdated = DateTime.UtcNow; } _active_context.SaveChanges(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index 0aceebc9a..77cac3648 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -12,10 +12,12 @@ xmlns:localconverters="clr-namespace:Tango.MachineStudio.ThreadExtensions.Converters" xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions" xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker" + xmlns:components="clr-namespace:Tango.SharedUI.Components;assembly=Tango.SharedUI" xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" xmlns:fa="http://schemas.fontawesome.io/icons/" mc:Ignorable="d" - d:DesignHeight="950" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" FontSize="16"> + d:DesignHeight="950" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" FontSize="14"> @@ -23,7 +25,8 @@ - + + + + + + + + + + + @@ -416,68 +413,146 @@ - + - - - + + + + + + + + + + + + + COLOR + + + + + + + + + + COLOR + + + + + + + + - + + + + + + - + - + + + + + + - + - + + + + + + + + + + + + + + + + + + + + - + - + + + + + + - + - + + + + + + - + - + + + + + + - + @@ -486,93 +561,155 @@ - - - - Tension through the thread path - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Tension through the thread path + - Tension in Zone + Tension in Zone - Tensiometer (gr) + Tensiometer (gr) - Tension in Zone + Tension in Zone - MS + MS - Head + Head - - + + - BTSR + BTSR - - + + - After dryer + After dryer - - + + - Puller tension + Puller tension - - + + - Winder + Winder - - + + - Winder Exit Tension + Winder Exit Tension - - + + - - Mechanical properties - + + Mechanical properties + - - + + @@ -607,12 +744,13 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs index a75dc5d09..20be37970 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs @@ -52,5 +52,18 @@ namespace Tango.MachineStudio.ThreadExtensions.Views } } } + private void Popup_MouseDown(object sender, MouseButtonEventArgs e) + { + e.Handled = true; + } + private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs e) + { + if (e.NewValue.HasValue) + { + //_vm.OnSelectedBrushColorChanged((Color)e.NewValue); + } + } + } } + diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs index 9f98d4aa9..db4fd9893 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs @@ -37,6 +37,14 @@ namespace Tango.BL.DTO get; set; } + /// + /// index row + /// + public Int32 IndexRow + { + get; set; + } + /// /// color /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs index af8858e64..9d67cef70 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs @@ -1,8 +1,12 @@ -using System; +using ColorMine.ColorSpaces; +using Newtonsoft.Json; +using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Media; namespace Tango.BL.Entities { @@ -12,5 +16,34 @@ namespace Tango.BL.Entities { } + + [NotMapped] + [JsonIgnore] + public string GetMaterialName + { + get + { + return WashingTestMaterials != null ? WashingTestMaterials.Name : ""; + } + } + + //[NotMapped] + //[JsonIgnore] + //public Color ColorValue + //{ + // get + // { + // byte[] bytes = BitConverter.GetBytes(Color); + // var color1 = new SolidColorBrush(System.Windows.Media.Color.FromArgb(bytes[3], bytes[2], bytes[1], bytes[0])); + // return System.Windows.Media.Color.FromRgb(bytes[2], bytes[1], bytes[0]); + // } + // set + // { + // int v = ColorToInteger(value); + // int colorCodeWithAlpha = BitConverter.ToInt32(new byte[] { value.B, value.G, value.R, value.A }, 0); + // Color = colorCodeWithAlpha; + // RaisePropertyChanged(nameof(Color)); + // } + //} } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs index 0927baa04..c4016bb40 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs @@ -27,6 +27,8 @@ namespace Tango.BL.Entities public abstract class RmlExtensionTestWashingResultBase : ObservableEntity { + public event EventHandler IndexRowChanged; + public event EventHandler ColorChanged; public event EventHandler> WashingValueChanged; @@ -87,6 +89,33 @@ namespace Tango.BL.Entities } } + protected Int32 _indexrow; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase index row. + /// + + [Column("INDEX_ROW")] + + public Int32 IndexRow + { + get + { + return _indexrow; + } + + set + { + if (_indexrow != value) + { + _indexrow = value; + + OnIndexRowChanged(value); + + } + } + } + protected Int32 _color; /// @@ -205,6 +234,15 @@ namespace Tango.BL.Entities } } + /// + /// Called when the IndexRow has changed. + /// + protected virtual void OnIndexRowChanged(Int32 indexrow) + { + IndexRowChanged?.Invoke(this, indexrow); + RaisePropertyChanged(nameof(IndexRow)); + } + /// /// Called when the Color has changed. /// diff --git a/Software/Visual_Studio/Tango.ColorPicker/ColorCanvas/Implementation/ColorCanvas.cs b/Software/Visual_Studio/Tango.ColorPicker/ColorCanvas/Implementation/ColorCanvas.cs index 6404c9af3..5d84309d8 100644 --- a/Software/Visual_Studio/Tango.ColorPicker/ColorCanvas/Implementation/ColorCanvas.cs +++ b/Software/Visual_Studio/Tango.ColorPicker/ColorCanvas/Implementation/ColorCanvas.cs @@ -549,7 +549,8 @@ namespace Tango var currentColor = ColorUtilities.ConvertHsvToRgb( hsv.H, hsv.S, hsv.V ); currentColor.A = A; _updateSpectrumSliderValue = false; - SelectedColor = currentColor; + if(SelectedColor != currentColor) + SelectedColor = currentColor; _updateSpectrumSliderValue = true; SetHexadecimalStringProperty( GetFormatedColorString( SelectedColor ), false ); } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs index c97f1ab73..f475d471d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB public System.DateTime LAST_UPDATED { get; set; } public string RML_EXTENSION_TEST_RESULTS_GUID { get; set; } public string WASHING_TEST_MATERIALS_GUID { get; set; } + public int INDEX_ROW { get; set; } public int COLOR { get; set; } public Nullable WASHING_VALUE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index f367a5aa0..eae61d93a 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1239,6 +1239,7 @@ + @@ -6629,6 +6630,7 @@ + @@ -9948,6 +9950,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 2cc7da5b5..f5a974c53 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -4,101 +4,101 @@ - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + -- cgit v1.3.1 From 6e4ddaeef2667e071f7f079876e98bd77ed233f3 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 7 Aug 2022 09:11:33 +0300 Subject: MS . RML Extension --- .../ViewModels/MainViewVM.cs | 6 +- .../ViewModels/TestResultsViewVM.cs | 19 +++++ .../Views/TestResultsView.xaml | 85 +++++++++++++++++----- .../Tango.BL/Builders/machinesCollectionBuilder.cs | 55 ++++++++++++++ 4 files changed, 145 insertions(+), 20 deletions(-) create mode 100644 Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml') 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 820a55558..d6f3ea418 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 @@ -973,7 +973,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } } - private void LoadRmlProperties() + private async void LoadRmlProperties() { Applications = _active_context.YarnApplications.ToObservableCollection(); Brands = _active_context.YarnBrands.ToObservableCollection(); @@ -991,7 +991,9 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels Texturing = _active_context.YarnTexturings.ToObservableCollection(); YarnTypes = _active_context.YarnTypes.ToObservableCollection(); IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection(); - Machines = ObservablesStaticCollections.Instance.Machines.Select(x => new MachineModel() + + var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildAsync(); + Machines = machines.Select(x => new MachineModel() { Guid = x.Guid, Name = x.Name, 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 2dd444f0f..03c87a3a6 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 @@ -129,6 +129,20 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } } + private ObservableCollection _btsrApplicationTypes; + public ObservableCollection BtsrApplicationTypes + { + get { return _btsrApplicationTypes; } + set { _btsrApplicationTypes = value; RaisePropertyChangedAuto(); } + } + + private ObservableCollection _btsrYarnTypes; + public ObservableCollection BtsrYarnTypes + { + get { return _btsrYarnTypes; } + set { _btsrYarnTypes = value; RaisePropertyChangedAuto(); } + } + #endregion #region Commands @@ -281,6 +295,11 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels using (_notification.PushTaskItem("Loading Test Results Parameters ...")) { + + BtsrApplicationTypes = _active_context.BtsrApplicationTypes.ToObservableCollection(); + + BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection(); + 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) diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index 77cac3648..961c6b358 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -628,80 +628,129 @@ Tension through the thread path - + + + + + + + + + + + + + + + Tension in Zone - + Tensiometer (gr) - + Tension in Zone - - MS + + MS - + + + BTSR options + + + + + Head - + - + BTSR - + - + + Application Type + + + + + + + After dryer - + - + Puller tension - + - + + Yarn Type + + + + + + + + Winder - + - + Winder Exit Tension - + - + + Tension Error + + + + + + + + diff --git a/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs new file mode 100644 index 000000000..25ca3e8f3 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Builders/machinesCollectionBuilder.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; +using System.Data.Entity; + +namespace Tango.BL.Builders +{ + public class MachinesCollectionBuilder : EntityCollectionBuilderBase + { + public MachinesCollectionBuilder(ObservablesContext context) : base(context) + { + + } + + public virtual MachinesCollectionBuilder WithVersion() + { + return AddQueryStep(1, (query) => + { + return query.Include(x => x.MachineVersion); + }); + + } + + public virtual MachinesCollectionBuilder WithOrganization() + { + return AddStep(2, () => + { + foreach (var machine in Entities.ToList()) + { + Context.Organizations.Where(x => x.Guid == machine.OrganizationGuid) + .Include(x => x.Address) + .Include(x => x.Contact).FirstOrDefault(); + } + }); + } + + public virtual MachinesCollectionBuilder WithConfiguration() + { + return AddStep(3, () => + { + foreach (var machine in Entities.ToList()) + { + new ConfigurationBuilder(Context) + .Set(machine.ConfigurationGuid) + .WithIdsPacks() + .WithHardwareVersion() + .Build(); + } + }); + } + } +} -- cgit v1.3.1 From 13e76d80896d61c476ff755a892c795ed4af6de6 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Wed, 31 Aug 2022 12:02:47 +0300 Subject: MS. RML Extension. Added Application Type, Yarn Type and Tension Error to Test results table. Changes in database. Related Work Items: #6347 --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../ViewModels/MainViewVM.cs | 13 +- .../ViewModels/TestResultsViewVM.cs | 2 +- .../Views/TestResultsView.xaml | 18 +- .../RMLExtensionTestResultsCollectionBuilder.cs | 24 +++ .../Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs | 24 +++ .../Tango.BL/Entities/BtsrApplicationTypeBase.cs | 38 +++++ .../Tango.BL/Entities/BtsrYarnTypeBase.cs | 38 +++++ .../Entities/RmlExtensionColorCalibrationBase.cs | 76 ++++----- ...xtensionColorCalibrationsTestsLiquidDataBase.cs | 76 ++++----- .../Entities/RmlExtensionColorShadeBase.cs | 76 ++++----- .../Entities/RmlExtensionTestResultBase.cs | 176 +++++++++++++++++++ Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 3 +- .../Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs | 3 + .../Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs | 3 + .../DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs | 2 +- .../DB/RML_EXTENSION_COLOR_SHADES.cs | 2 +- .../DB/RML_EXTENSION_TEST_RESULTS.cs | 5 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 77 +++++++++ .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 188 ++++++++++----------- 21 files changed, 615 insertions(+), 229 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index e333b6ee5..58379c5c6 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index b5da0b516..447c4cdb7 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ 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 d6f3ea418..b2f3d99cf 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 @@ -973,7 +973,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels } } - private async void LoadRmlProperties() + private void LoadRmlProperties() { Applications = _active_context.YarnApplications.ToObservableCollection(); Brands = _active_context.YarnBrands.ToObservableCollection(); @@ -992,7 +992,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels YarnTypes = _active_context.YarnTypes.ToObservableCollection(); IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection(); - var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildAsync(); + var machines = new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().Build(); Machines = machines.Select(x => new MachineModel() { Guid = x.Guid, @@ -1067,12 +1067,13 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels guid = rml_extention.Guid; } - ActiveRMLExtension = await new RmlExtensionsBuilder(_active_context) - .Set(guid) - .WithUser() - .BuildAsync(); + ActiveRML = new RmlBuilder(_active_context).Set(SelectedRMLExtension.RMLGuid).WithLiquidFactors().Build(); + + ActiveRMLExtension = new RmlExtensionsBuilder(_active_context) + .Set(guid) + .Build(); if (!String.IsNullOrEmpty(ActiveRML.Manufacturer) && false == Manufacturers.Any(x => x == ActiveRML.Manufacturer)) { 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 03c87a3a6..ba7ae7238 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 @@ -300,7 +300,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection(); - var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().BuildAsync(); + 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(); foreach (var result in SelectedTestResults) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml index 961c6b358..4ebc9077b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml @@ -686,9 +686,9 @@ Application Type - - - + + + After dryer @@ -714,11 +714,9 @@ Yarn Type - - - - + + + Winder @@ -745,9 +743,7 @@ - - + diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs index 19c027976..a9aabdbdd 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs @@ -80,5 +80,29 @@ namespace Tango.BL.Builders } }); } + + public virtual RMLExtensionTestResultsCollectionBuilder WithBtsrApplicationTypes() + { + return AddStep(5, () => + { + foreach (var result in Entities.ToList()) + { + if(!String.IsNullOrEmpty(result.BtsrApplicationTypeGuid)) + result.BtsrApplicationType = Context.BtsrApplicationTypes.FirstOrDefault(x => x.Guid == result.BtsrApplicationTypeGuid); + } + }); + } + + public virtual RMLExtensionTestResultsCollectionBuilder WithBtsrYarnTypes() + { + return AddStep(6, () => + { + foreach (var result in Entities.ToList()) + { + if (!String.IsNullOrEmpty(result.BtsrYarnTypeGuid)) + result.BtsrYarnType = Context.BtsrYarnTypes.FirstOrDefault(x => x.Guid == result.BtsrYarnTypeGuid); + } + }); + } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs index d48a36b22..0f2fa1675 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs @@ -277,5 +277,29 @@ namespace Tango.BL.DTO get; set; } + /// + /// btsr application type guid + /// + public String BtsrApplicationTypeGuid + { + get; set; + } + + /// + /// btsr yarn type guid + /// + public String BtsrYarnTypeGuid + { + get; set; + } + + /// + /// btsr tension error + /// + public Double BtsrTensionError + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs index ee1ff6ecc..70fd2c41e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs @@ -33,6 +33,8 @@ namespace Tango.BL.Entities public event EventHandler DescriptionChanged; + public event EventHandler> RmlExtensionTestResultsChanged; + public event EventHandler> RmlsChanged; protected Int32 _code; @@ -116,6 +118,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection _rmlextensiontestresults; + + /// + /// Gets or sets the btsrapplicationtypebase rml extension test results. + /// + + public virtual SynchronizedObservableCollection RmlExtensionTestResults + { + get + { + return _rmlextensiontestresults; + } + + set + { + if (_rmlextensiontestresults != value) + { + _rmlextensiontestresults = value; + + OnRmlExtensionTestResultsChanged(value); + + } + } + } + protected SynchronizedObservableCollection _rmls; /// @@ -168,6 +195,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Description)); } + /// + /// Called when the RmlExtensionTestResults has changed. + /// + protected virtual void OnRmlExtensionTestResultsChanged(SynchronizedObservableCollection rmlextensiontestresults) + { + RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults); + RaisePropertyChanged(nameof(RmlExtensionTestResults)); + } + /// /// Called when the Rmls has changed. /// @@ -183,6 +219,8 @@ namespace Tango.BL.Entities public BtsrApplicationTypeBase() : base() { + RmlExtensionTestResults = new SynchronizedObservableCollection(); + Rmls = new SynchronizedObservableCollection(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs index 608989fab..8128c8998 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs @@ -33,6 +33,8 @@ namespace Tango.BL.Entities public event EventHandler DescriptionChanged; + public event EventHandler> RmlExtensionTestResultsChanged; + public event EventHandler> RmlsChanged; protected Int32 _code; @@ -116,6 +118,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection _rmlextensiontestresults; + + /// + /// Gets or sets the btsryarntypebase rml extension test results. + /// + + public virtual SynchronizedObservableCollection RmlExtensionTestResults + { + get + { + return _rmlextensiontestresults; + } + + set + { + if (_rmlextensiontestresults != value) + { + _rmlextensiontestresults = value; + + OnRmlExtensionTestResultsChanged(value); + + } + } + } + protected SynchronizedObservableCollection _rmls; /// @@ -168,6 +195,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Description)); } + /// + /// Called when the RmlExtensionTestResults has changed. + /// + protected virtual void OnRmlExtensionTestResultsChanged(SynchronizedObservableCollection rmlextensiontestresults) + { + RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults); + RaisePropertyChanged(nameof(RmlExtensionTestResults)); + } + /// /// Called when the Rmls has changed. /// @@ -183,6 +219,8 @@ namespace Tango.BL.Entities public BtsrYarnTypeBase() : base() { + RmlExtensionTestResults = new SynchronizedObservableCollection(); + Rmls = new SynchronizedObservableCollection(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs index b858163d2..b2af4322d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs @@ -27,12 +27,12 @@ namespace Tango.BL.Entities public abstract class RmlExtensionColorCalibrationBase : ObservableEntity { - public event EventHandler MachineChanged; - public event EventHandler RmlsExtensionsChanged; public event EventHandler> RmlExtensionColorCalibrationsTestsChanged; + public event EventHandler MachineChanged; + protected String _rmlsextensionsguid; /// @@ -85,38 +85,6 @@ namespace Tango.BL.Entities } } - protected Machine _machine; - - /// - /// Gets or sets the rmlextensioncolorcalibrationbase machine. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual Machine Machine - { - get - { - return _machine; - } - - set - { - if (_machine != value) - { - _machine = value; - - if (Machine != null) - { - MachineGuid = Machine.Guid; - } - - OnMachineChanged(value); - - } - } - } - protected RmlsExtension _rmlsextensions; /// @@ -174,13 +142,36 @@ namespace Tango.BL.Entities } } + protected Machine _machine; + /// - /// Called when the Machine has changed. + /// Gets or sets the rmlextensioncolorcalibrationbase machine. /// - protected virtual void OnMachineChanged(Machine machine) + + [XmlIgnore] + [JsonIgnore] + public virtual Machine Machine { - MachineChanged?.Invoke(this, machine); - RaisePropertyChanged(nameof(Machine)); + get + { + return _machine; + } + + set + { + if (_machine != value) + { + _machine = value; + + if (Machine != null) + { + MachineGuid = Machine.Guid; + } + + OnMachineChanged(value); + + } + } } /// @@ -201,6 +192,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); } + /// + /// Called when the Machine has changed. + /// + protected virtual void OnMachineChanged(Machine machine) + { + MachineChanged?.Invoke(this, machine); + RaisePropertyChanged(nameof(Machine)); + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs index d55773809..d6ee701ba 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs @@ -27,12 +27,12 @@ namespace Tango.BL.Entities public abstract class RmlExtensionColorCalibrationsTestsLiquidDataBase : ObservableEntity { - public event EventHandler LiquidTypeChanged; - public event EventHandler RmlExtensionColorCalibrationsTestChanged; public event EventHandler> RmlExtensionColorCalibrationsTestsLiquidDataPointsChanged; + public event EventHandler LiquidTypeChanged; + protected String _rmlextensioncolorcalibrationstestguid; /// @@ -85,38 +85,6 @@ namespace Tango.BL.Entities } } - protected LiquidType _liquidtype; - - /// - /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase liquid types. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual LiquidType LiquidType - { - get - { - return _liquidtype; - } - - set - { - if (_liquidtype != value) - { - _liquidtype = value; - - if (LiquidType != null) - { - LiquidTypeGuid = LiquidType.Guid; - } - - OnLiquidTypeChanged(value); - - } - } - } - protected RmlExtensionColorCalibrationsTest _rmlextensioncolorcalibrationstest; /// @@ -174,13 +142,36 @@ namespace Tango.BL.Entities } } + protected LiquidType _liquidtype; + /// - /// Called when the LiquidType has changed. + /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase liquid types. /// - protected virtual void OnLiquidTypeChanged(LiquidType liquidtype) + + [XmlIgnore] + [JsonIgnore] + public virtual LiquidType LiquidType { - LiquidTypeChanged?.Invoke(this, liquidtype); - RaisePropertyChanged(nameof(LiquidType)); + get + { + return _liquidtype; + } + + set + { + if (_liquidtype != value) + { + _liquidtype = value; + + if (LiquidType != null) + { + LiquidTypeGuid = LiquidType.Guid; + } + + OnLiquidTypeChanged(value); + + } + } } /// @@ -201,6 +192,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); } + /// + /// Called when the LiquidType has changed. + /// + protected virtual void OnLiquidTypeChanged(LiquidType liquidtype) + { + LiquidTypeChanged?.Invoke(this, liquidtype); + RaisePropertyChanged(nameof(LiquidType)); + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs index b0386f13b..c0fa2ce5d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs @@ -27,12 +27,12 @@ namespace Tango.BL.Entities public abstract class RmlExtensionColorShadeBase : ObservableEntity { - public event EventHandler MachineChanged; - public event EventHandler RmlsExtensionsChanged; public event EventHandler> RmlExtensionColorShadesTestsChanged; + public event EventHandler MachineChanged; + protected String _rmlsextensionsguid; /// @@ -85,38 +85,6 @@ namespace Tango.BL.Entities } } - protected Machine _machine; - - /// - /// Gets or sets the rmlextensioncolorshadebase machine. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual Machine Machine - { - get - { - return _machine; - } - - set - { - if (_machine != value) - { - _machine = value; - - if (Machine != null) - { - MachineGuid = Machine.Guid; - } - - OnMachineChanged(value); - - } - } - } - protected RmlsExtension _rmlsextensions; /// @@ -174,13 +142,36 @@ namespace Tango.BL.Entities } } + protected Machine _machine; + /// - /// Called when the Machine has changed. + /// Gets or sets the rmlextensioncolorshadebase machine. /// - protected virtual void OnMachineChanged(Machine machine) + + [XmlIgnore] + [JsonIgnore] + public virtual Machine Machine { - MachineChanged?.Invoke(this, machine); - RaisePropertyChanged(nameof(Machine)); + get + { + return _machine; + } + + set + { + if (_machine != value) + { + _machine = value; + + if (Machine != null) + { + MachineGuid = Machine.Guid; + } + + OnMachineChanged(value); + + } + } } /// @@ -201,6 +192,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); } + /// + /// Called when the Machine has changed. + /// + protected virtual void OnMachineChanged(Machine machine) + { + MachineChanged?.Invoke(this, machine); + RaisePropertyChanged(nameof(Machine)); + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs index c53b14327..22844741c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs @@ -87,12 +87,18 @@ namespace Tango.BL.Entities public event EventHandler> ThreadLubChanged; + public event EventHandler BtsrTensionErrorChanged; + public event EventHandler RmlsExtensionsChanged; public event EventHandler> TensileResultsChanged; public event EventHandler> RmlExtensionTestResultsFilesChanged; + public event EventHandler BtsrApplicationTypeChanged; + + public event EventHandler BtsrYarnTypeChanged; + public event EventHandler MachineChanged; public event EventHandler> RmlExtensionTestWashingResultsChanged; @@ -961,6 +967,85 @@ namespace Tango.BL.Entities } } + protected String _btsrapplicationtypeguid; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr application type guid. + /// + + [Column("BTSR_APPLICATION_TYPE_GUID")] + [ForeignKey("BtsrApplicationType")] + + public String BtsrApplicationTypeGuid + { + get + { + return _btsrapplicationtypeguid; + } + + set + { + if (_btsrapplicationtypeguid != value) + { + _btsrapplicationtypeguid = value; + + } + } + } + + protected String _btsryarntypeguid; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr yarn type guid. + /// + + [Column("BTSR_YARN_TYPE_GUID")] + [ForeignKey("BtsrYarnType")] + + public String BtsrYarnTypeGuid + { + get + { + return _btsryarntypeguid; + } + + set + { + if (_btsryarntypeguid != value) + { + _btsryarntypeguid = value; + + } + } + } + + protected Double _btsrtensionerror; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr tension error. + /// + + [Column("BTSR_TENSION_ERROR")] + + public Double BtsrTensionError + { + get + { + return _btsrtensionerror; + } + + set + { + if (_btsrtensionerror != value) + { + _btsrtensionerror = value; + + OnBtsrTensionErrorChanged(value); + + } + } + } + protected RmlsExtension _rmlsextensions; /// @@ -1043,6 +1128,70 @@ namespace Tango.BL.Entities } } + protected BtsrApplicationType _btsrapplicationtype; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr application types. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual BtsrApplicationType BtsrApplicationType + { + get + { + return _btsrapplicationtype; + } + + set + { + if (_btsrapplicationtype != value) + { + _btsrapplicationtype = value; + + if (BtsrApplicationType != null) + { + BtsrApplicationTypeGuid = BtsrApplicationType.Guid; + } + + OnBtsrApplicationTypeChanged(value); + + } + } + } + + protected BtsrYarnType _btsryarntype; + + /// + /// Gets or sets the rmlextensiontestresultbase btsr yarn types. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual BtsrYarnType BtsrYarnType + { + get + { + return _btsryarntype; + } + + set + { + if (_btsryarntype != value) + { + _btsryarntype = value; + + if (BtsrYarnType != null) + { + BtsrYarnTypeGuid = BtsrYarnType.Guid; + } + + OnBtsrYarnTypeChanged(value); + + } + } + } + protected Machine _machine; /// @@ -1395,6 +1544,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(ThreadLub)); } + /// + /// Called when the BtsrTensionError has changed. + /// + protected virtual void OnBtsrTensionErrorChanged(Double btsrtensionerror) + { + BtsrTensionErrorChanged?.Invoke(this, btsrtensionerror); + RaisePropertyChanged(nameof(BtsrTensionError)); + } + /// /// Called when the RmlsExtensions has changed. /// @@ -1422,6 +1580,24 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); } + /// + /// Called when the BtsrApplicationType has changed. + /// + protected virtual void OnBtsrApplicationTypeChanged(BtsrApplicationType btsrapplicationtype) + { + BtsrApplicationTypeChanged?.Invoke(this, btsrapplicationtype); + RaisePropertyChanged(nameof(BtsrApplicationType)); + } + + /// + /// Called when the BtsrYarnType has changed. + /// + protected virtual void OnBtsrYarnTypeChanged(BtsrYarnType btsryarntype) + { + BtsrYarnTypeChanged?.Invoke(this, btsryarntype); + RaisePropertyChanged(nameof(BtsrYarnType)); + } + /// /// Called when the Machine has changed. /// diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 259b2ce6b..ea2315046 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -116,6 +116,7 @@ + @@ -820,7 +821,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs index a4ebc4b0f..523980e37 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs @@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public BTSR_APPLICATION_TYPES() { + this.RML_EXTENSION_TEST_RESULTS = new HashSet(); this.RMLS = new HashSet(); } @@ -27,6 +28,8 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } public string DESCRIPTION { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RML_EXTENSION_TEST_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RMLS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs index 256af7baf..ef09f7498 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs @@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public BTSR_YARN_TYPES() { + this.RML_EXTENSION_TEST_RESULTS = new HashSet(); this.RMLS = new HashSet(); } @@ -27,6 +28,8 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } public string DESCRIPTION { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection RML_EXTENSION_TEST_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RMLS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs index 7f25d41a2..1a1416100 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs @@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB public string RMLS_EXTENSIONS_GUID { get; set; } public string MACHINE_GUID { get; set; } - public virtual MACHINE MACHINE { get; set; } public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } + public virtual MACHINE MACHINE { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs index 55614d7a4..cca943272 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs @@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB public string RMLS_EXTENSIONS_GUID { get; set; } public string MACHINE_GUID { get; set; } - public virtual MACHINE MACHINE { get; set; } public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } + public virtual MACHINE MACHINE { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs index e0543a58c..e4bf0b029 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs @@ -58,12 +58,17 @@ namespace Tango.DAL.Remote.DB public string THREAD_LUB_VERSION { get; set; } public Nullable THREAD_COF { get; set; } public Nullable THREAD_LUB { get; set; } + public string BTSR_APPLICATION_TYPE_GUID { get; set; } + public string BTSR_YARN_TYPE_GUID { get; set; } + public double BTSR_TENSION_ERROR { get; set; } public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection TENSILE_RESULTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual BTSR_APPLICATION_TYPES BTSR_APPLICATION_TYPES { get; set; } + public virtual BTSR_YARN_TYPES BTSR_YARN_TYPES { get; set; } public virtual MACHINE MACHINE { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index eae61d93a..7f06dbc14 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1218,6 +1218,9 @@ + + + @@ -2821,6 +2824,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -3902,6 +3929,14 @@ + + + + + + + + @@ -4360,10 +4395,18 @@ + + + + + + + + @@ -4840,6 +4883,11 @@ + + + + + @@ -5579,6 +5627,7 @@ + @@ -5591,6 +5640,7 @@ + @@ -7203,6 +7253,18 @@ + + + + + + + + + + + + @@ -7215,6 +7277,18 @@ + + + + + + + + + + + + @@ -8524,6 +8598,9 @@ + + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index f5a974c53..ea228f323 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,100 +5,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.3.1