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 --- .../ViewModels/TestResultsViewVM.cs | 35 +- .../Views/TestResultsView.xaml | 316 +++--- .../RMLExtensionTestResultsCollectionBuilder.cs | 16 + .../DTO/RmlExtensionTestWashingResultDTO.cs | 14 + .../DTO/RmlExtensionTestWashingResultDTOBase.cs | 57 ++ .../Tango.BL/DTO/WashingTestMaterialDTO.cs | 14 + .../Tango.BL/DTO/WashingTestMaterialDTOBase.cs | 33 + .../Entities/RmlExtensionTestResultBase.cs | 62 +- .../Entities/RmlExtensionTestWashingResult.cs | 16 + .../Entities/RmlExtensionTestWashingResultBase.cs | 251 +++++ .../Tango.BL/Entities/WashingTestMaterial.cs | 12 + .../Tango.BL/Entities/WashingTestMaterialBase.cs | 114 +++ .../Visual_Studio/Tango.BL/ObservablesContext.cs | 132 +-- .../ObservablesEntitiesAdapterExtension.cs | 818 ++++++++------- .../ObservablesStaticCollectionsExtension.cs | 818 ++++++++------- Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 10 +- ...TENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs | 2 +- .../DB/RML_EXTENSION_TEST_RESULTS.cs | 5 +- .../DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs | 28 + .../Tango.DAL.Remote/DB/RemoteADO.Context.cs | 18 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx | 1039 +++++++++++--------- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 167 ++-- .../Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs | 31 + .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 8 +- 24 files changed, 2548 insertions(+), 1468 deletions(-) create mode 100644 Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs (limited to 'Software') 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 WashingTestMaterials { get; set; } + + private SynchronizedObservableCollection _selectedTestResults; public SynchronizedObservableCollection 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(); + 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 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 @@ - + - + + - - + + diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs index 2b962d56b..19c027976 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs @@ -64,5 +64,21 @@ namespace Tango.BL.Builders } }); } + + public virtual RMLExtensionTestResultsCollectionBuilder WithWashingTestResults() + { + return AddStep(4, () => + { + foreach (var result in Entities.ToList()) + { + var tests = Context.RmlExtensionTestWashingResults.Where(x => x.RmlExtensionTestResultsGuid == result.Guid).ToList(); + foreach( var test in tests) + { + test.WashingTestMaterials = Context.WashingTestMaterials.FirstOrDefault(x => x.Guid == test.WashingTestMaterialsGuid); + } + + } + }); + } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs new file mode 100644 index 000000000..1e15767c8 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class RmlExtensionTestWashingResultDTO : RmlExtensionTestWashingResultDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs new file mode 100644 index 000000000..9f98d4aa9 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestWashingResultDTOBase.cs @@ -0,0 +1,57 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class RmlExtensionTestWashingResultDTOBase : ObservableEntityDTO + { + + /// + /// rml extension test results guid + /// + public String RmlExtensionTestResultsGuid + { + get; set; + } + + /// + /// washing test materials guid + /// + public String WashingTestMaterialsGuid + { + get; set; + } + + /// + /// color + /// + public Int32 Color + { + get; set; + } + + /// + /// washing value + /// + public Nullable WashingValue + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs new file mode 100644 index 000000000..f2c9ec25d --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class WashingTestMaterialDTO : WashingTestMaterialDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs new file mode 100644 index 000000000..8c9bc0ff1 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/WashingTestMaterialDTOBase.cs @@ -0,0 +1,33 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class WashingTestMaterialDTOBase : ObservableEntityDTO + { + + /// + /// name + /// + public String Name + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs index 7f6804039..c53b14327 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs @@ -91,9 +91,11 @@ namespace Tango.BL.Entities public event EventHandler> TensileResultsChanged; + public event EventHandler> RmlExtensionTestResultsFilesChanged; + public event EventHandler MachineChanged; - public event EventHandler> RmlExtensionTestResultsFilesChanged; + public event EventHandler> RmlExtensionTestWashingResultsChanged; public event EventHandler> RubbingResultsChanged; @@ -1016,6 +1018,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection _rmlextensiontestresultsfiles; + + /// + /// Gets or sets the rmlextensiontestresultbase rml extension test results files. + /// + + public virtual SynchronizedObservableCollection RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + if (_rmlextensiontestresultsfiles != value) + { + _rmlextensiontestresultsfiles = value; + + OnRmlExtensionTestResultsFilesChanged(value); + + } + } + } + protected Machine _machine; /// @@ -1048,26 +1075,26 @@ namespace Tango.BL.Entities } } - protected SynchronizedObservableCollection _rmlextensiontestresultsfiles; + protected SynchronizedObservableCollection _rmlextensiontestwashingresults; /// - /// Gets or sets the rmlextensiontestresultbase rml extension test results files. + /// Gets or sets the rmlextensiontestresultbase rml extension test washing results. /// - public virtual SynchronizedObservableCollection RmlExtensionTestResultsFiles + public virtual SynchronizedObservableCollection RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - if (_rmlextensiontestresultsfiles != value) + if (_rmlextensiontestwashingresults != value) { - _rmlextensiontestresultsfiles = value; + _rmlextensiontestwashingresults = value; - OnRmlExtensionTestResultsFilesChanged(value); + OnRmlExtensionTestWashingResultsChanged(value); } } @@ -1386,6 +1413,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(TensileResults)); } + /// + /// Called when the RmlExtensionTestResultsFiles has changed. + /// + protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection rmlextensiontestresultsfiles) + { + RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles); + RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + /// /// Called when the Machine has changed. /// @@ -1396,12 +1432,12 @@ namespace Tango.BL.Entities } /// - /// Called when the RmlExtensionTestResultsFiles has changed. + /// Called when the RmlExtensionTestWashingResults has changed. /// - protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection rmlextensiontestresultsfiles) + protected virtual void OnRmlExtensionTestWashingResultsChanged(SynchronizedObservableCollection rmlextensiontestwashingresults) { - RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles); - RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + RmlExtensionTestWashingResultsChanged?.Invoke(this, rmlextensiontestwashingresults); + RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } /// @@ -1423,6 +1459,8 @@ namespace Tango.BL.Entities RmlExtensionTestResultsFiles = new SynchronizedObservableCollection(); + RmlExtensionTestWashingResults = new SynchronizedObservableCollection(); + RubbingResults = new SynchronizedObservableCollection(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs new file mode 100644 index 000000000..af8858e64 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResult.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Entities +{ + public class RmlExtensionTestWashingResult: RmlExtensionTestWashingResultBase + { + public RmlExtensionTestWashingResult(): base() + { + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs new file mode 100644 index 000000000..0927baa04 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestWashingResultBase.cs @@ -0,0 +1,251 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("RML_EXTENSION_TEST_WASHING_RESULTS")] + public abstract class RmlExtensionTestWashingResultBase : ObservableEntity + { + + public event EventHandler ColorChanged; + + public event EventHandler> WashingValueChanged; + + public event EventHandler RmlExtensionTestResultsChanged; + + public event EventHandler WashingTestMaterialsChanged; + + protected String _rmlextensiontestresultsguid; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase rml extension test results guid. + /// + + [Column("RML_EXTENSION_TEST_RESULTS_GUID")] + [ForeignKey("RmlExtensionTestResults")] + + public String RmlExtensionTestResultsGuid + { + get + { + return _rmlextensiontestresultsguid; + } + + set + { + if (_rmlextensiontestresultsguid != value) + { + _rmlextensiontestresultsguid = value; + + } + } + } + + protected String _washingtestmaterialsguid; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase washing test materials guid. + /// + + [Column("WASHING_TEST_MATERIALS_GUID")] + [ForeignKey("WashingTestMaterials")] + + public String WashingTestMaterialsGuid + { + get + { + return _washingtestmaterialsguid; + } + + set + { + if (_washingtestmaterialsguid != value) + { + _washingtestmaterialsguid = value; + + } + } + } + + protected Int32 _color; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase color. + /// + + [Column("COLOR")] + + public Int32 Color + { + get + { + return _color; + } + + set + { + if (_color != value) + { + _color = value; + + OnColorChanged(value); + + } + } + } + + protected Nullable _washingvalue; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase washing value. + /// + + [Column("WASHING_VALUE")] + + public Nullable WashingValue + { + get + { + return _washingvalue; + } + + set + { + if (_washingvalue != value) + { + _washingvalue = value; + + OnWashingValueChanged(value); + + } + } + } + + protected RmlExtensionTestResult _rmlextensiontestresults; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase rml extension test results. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual RmlExtensionTestResult RmlExtensionTestResults + { + get + { + return _rmlextensiontestresults; + } + + set + { + if (_rmlextensiontestresults != value) + { + _rmlextensiontestresults = value; + + if (RmlExtensionTestResults != null) + { + RmlExtensionTestResultsGuid = RmlExtensionTestResults.Guid; + } + + OnRmlExtensionTestResultsChanged(value); + + } + } + } + + protected WashingTestMaterial _washingtestmaterials; + + /// + /// Gets or sets the rmlextensiontestwashingresultbase washing test materials. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual WashingTestMaterial WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + if (_washingtestmaterials != value) + { + _washingtestmaterials = value; + + if (WashingTestMaterials != null) + { + WashingTestMaterialsGuid = WashingTestMaterials.Guid; + } + + OnWashingTestMaterialsChanged(value); + + } + } + } + + /// + /// Called when the Color has changed. + /// + protected virtual void OnColorChanged(Int32 color) + { + ColorChanged?.Invoke(this, color); + RaisePropertyChanged(nameof(Color)); + } + + /// + /// Called when the WashingValue has changed. + /// + protected virtual void OnWashingValueChanged(Nullable washingvalue) + { + WashingValueChanged?.Invoke(this, washingvalue); + RaisePropertyChanged(nameof(WashingValue)); + } + + /// + /// Called when the RmlExtensionTestResults has changed. + /// + protected virtual void OnRmlExtensionTestResultsChanged(RmlExtensionTestResult rmlextensiontestresults) + { + RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults); + RaisePropertyChanged(nameof(RmlExtensionTestResults)); + } + + /// + /// Called when the WashingTestMaterials has changed. + /// + protected virtual void OnWashingTestMaterialsChanged(WashingTestMaterial washingtestmaterials) + { + WashingTestMaterialsChanged?.Invoke(this, washingtestmaterials); + RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + /// + /// Initializes a new instance of the class. + /// + public RmlExtensionTestWashingResultBase() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs new file mode 100644 index 000000000..7cb6bd8e3 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterial.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Entities +{ + public class WashingTestMaterial: WashingTestMaterialBase + { + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs new file mode 100644 index 000000000..84271403c --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/WashingTestMaterialBase.cs @@ -0,0 +1,114 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("WASHING_TEST_MATERIALS")] + public abstract class WashingTestMaterialBase : ObservableEntity + { + + public event EventHandler NameChanged; + + public event EventHandler> RmlExtensionTestWashingResultsChanged; + + protected String _name; + + /// + /// Gets or sets the washingtestmaterialbase name. + /// + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + if (_name != value) + { + _name = value; + + OnNameChanged(value); + + } + } + } + + protected SynchronizedObservableCollection _rmlextensiontestwashingresults; + + /// + /// Gets or sets the washingtestmaterialbase rml extension test washing results. + /// + + public virtual SynchronizedObservableCollection RmlExtensionTestWashingResults + { + get + { + return _rmlextensiontestwashingresults; + } + + set + { + if (_rmlextensiontestwashingresults != value) + { + _rmlextensiontestwashingresults = value; + + OnRmlExtensionTestWashingResultsChanged(value); + + } + } + } + + /// + /// Called when the Name has changed. + /// + protected virtual void OnNameChanged(String name) + { + NameChanged?.Invoke(this, name); + RaisePropertyChanged(nameof(Name)); + } + + /// + /// Called when the RmlExtensionTestWashingResults has changed. + /// + protected virtual void OnRmlExtensionTestWashingResultsChanged(SynchronizedObservableCollection rmlextensiontestwashingresults) + { + RmlExtensionTestWashingResultsChanged?.Invoke(this, rmlextensiontestwashingresults); + RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); + } + + /// + /// Initializes a new instance of the class. + /// + public WashingTestMaterialBase() : base() + { + + RmlExtensionTestWashingResults = new SynchronizedObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index f62ae38bd..c06af8ba5 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -166,6 +166,70 @@ namespace Tango.BL get; set; } + /// + /// Gets or sets the RmlExtensionColorCalibrations. + /// + public DbSet RmlExtensionColorCalibrations + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// + public DbSet RmlExtensionColorCalibrationsTests + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// + public DbSet RmlExtensionColorCalibrationsTestsLiquidData + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// + public DbSet RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorShades. + /// + public DbSet RmlExtensionColorShades + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorShadesTests. + /// + public DbSet RmlExtensionColorShadesTests + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// + public DbSet RmlExtensionColorShadesTestsData + { + get; set; + } + + /// + /// Gets or sets the RmlExtensionTestResultsFiles. + /// + public DbSet RmlExtensionTestResultsFiles + { + get; set; + } + /// /// Gets or sets the ActionLogs. /// @@ -703,65 +767,9 @@ namespace Tango.BL } /// - /// Gets or sets the RmlExtensionColorCalibrations. - /// - public DbSet RmlExtensionColorCalibrations - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorCalibrationsTests. - /// - public DbSet RmlExtensionColorCalibrationsTests - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. - /// - public DbSet RmlExtensionColorCalibrationsTestsLiquidData - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. - /// - public DbSet RmlExtensionColorCalibrationsTestsLiquidDataPoints - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorShades. - /// - public DbSet RmlExtensionColorShades - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorShadesTests. - /// - public DbSet RmlExtensionColorShadesTests - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionColorShadesTestsData. - /// - public DbSet RmlExtensionColorShadesTestsData - { - get; set; - } - - /// - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// - public DbSet RmlExtensionTestResultsFiles + public DbSet RmlExtensionTestWashingResults { get; set; } @@ -958,6 +966,14 @@ namespace Tango.BL get; set; } + /// + /// Gets or sets the WashingTestMaterials. + /// + public DbSet WashingTestMaterials + { + get; set; + } + /// /// Gets or sets the WindingMethods. /// diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index a9d32e87d..d06377cf3 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -665,6 +665,294 @@ namespace Tango.BL } + private ObservableCollection _rmlextensioncolorcalibrations; + /// + /// Gets or sets the RmlExtensionColorCalibrations. + /// + public ObservableCollection RmlExtensionColorCalibrations + { + get + { + return _rmlextensioncolorcalibrations; + } + + set + { + _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrations View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsViewSource + { + get + { + return _rmlextensioncolorcalibrationsViewSource; + } + + set + { + _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstests; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// + public ObservableCollection RmlExtensionColorCalibrationsTests + { + get + { + return _rmlextensioncolorcalibrationstests; + } + + set + { + _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddata; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// + public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidData + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddata; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddatapoints; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// + public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapoints; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshades; + /// + /// Gets or sets the RmlExtensionColorShades. + /// + public ObservableCollection RmlExtensionColorShades + { + get + { + return _rmlextensioncolorshades; + } + + set + { + _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + } + + } + + private ICollectionView _rmlextensioncolorshadesViewSource; + /// + /// Gets or sets the RmlExtensionColorShades View Source. + /// + public ICollectionView RmlExtensionColorShadesViewSource + { + get + { + return _rmlextensioncolorshadesViewSource; + } + + set + { + _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshadestests; + /// + /// Gets or sets the RmlExtensionColorShadesTests. + /// + public ObservableCollection RmlExtensionColorShadesTests + { + get + { + return _rmlextensioncolorshadestests; + } + + set + { + _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsViewSource; + /// + /// Gets or sets the RmlExtensionColorShadesTests View Source. + /// + public ICollectionView RmlExtensionColorShadesTestsViewSource + { + get + { + return _rmlextensioncolorshadestestsViewSource; + } + + set + { + _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshadestestsdata; + /// + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// + public ObservableCollection RmlExtensionColorShadesTestsData + { + get + { + return _rmlextensioncolorshadestestsdata; + } + + set + { + _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + /// + /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + /// + public ICollectionView RmlExtensionColorShadesTestsDataViewSource + { + get + { + return _rmlextensioncolorshadestestsdataViewSource; + } + + set + { + _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + } + + } + + private ObservableCollection _rmlextensiontestresultsfiles; + /// + /// Gets or sets the RmlExtensionTestResultsFiles. + /// + public ObservableCollection RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + + } + + private ICollectionView _rmlextensiontestresultsfilesViewSource; + /// + /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// + public ICollectionView RmlExtensionTestResultsFilesViewSource + { + get + { + return _rmlextensiontestresultsfilesViewSource; + } + + set + { + _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + } + + } + private ObservableCollection _actionlogs; /// /// Gets or sets the ActionLogs. @@ -2737,630 +3025,378 @@ namespace Tango.BL private ICollectionView _mediaconditionsViewSource; /// - /// Gets or sets the MediaConditions View Source. - /// - public ICollectionView MediaConditionsViewSource - { - get - { - return _mediaconditionsViewSource; - } - - set - { - _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); - } - - } - - private ObservableCollection _mediamaterials; - /// - /// Gets or sets the MediaMaterials. - /// - public ObservableCollection MediaMaterials - { - get - { - return _mediamaterials; - } - - set - { - _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); - } - - } - - private ICollectionView _mediamaterialsViewSource; - /// - /// Gets or sets the MediaMaterials View Source. - /// - public ICollectionView MediaMaterialsViewSource - { - get - { - return _mediamaterialsViewSource; - } - - set - { - _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); - } - - } - - private ObservableCollection _mediapurposes; - /// - /// Gets or sets the MediaPurposes. - /// - public ObservableCollection MediaPurposes - { - get - { - return _mediapurposes; - } - - set - { - _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); - } - - } - - private ICollectionView _mediapurposesViewSource; - /// - /// Gets or sets the MediaPurposes View Source. - /// - public ICollectionView MediaPurposesViewSource - { - get - { - return _mediapurposesViewSource; - } - - set - { - _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); - } - - } - - private ObservableCollection _midtanktypes; - /// - /// Gets or sets the MidTankTypes. - /// - public ObservableCollection MidTankTypes - { - get - { - return _midtanktypes; - } - - set - { - _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); - } - - } - - private ICollectionView _midtanktypesViewSource; - /// - /// Gets or sets the MidTankTypes View Source. - /// - public ICollectionView MidTankTypesViewSource - { - get - { - return _midtanktypesViewSource; - } - - set - { - _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); - } - - } - - private ObservableCollection _organizations; - /// - /// Gets or sets the Organizations. - /// - public ObservableCollection Organizations - { - get - { - return _organizations; - } - - set - { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } - - } - - private ICollectionView _organizationsViewSource; - /// - /// Gets or sets the Organizations View Source. - /// - public ICollectionView OrganizationsViewSource - { - get - { - return _organizationsViewSource; - } - - set - { - _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); - } - - } - - private ObservableCollection _permissions; - /// - /// Gets or sets the Permissions. - /// - public ObservableCollection Permissions - { - get - { - return _permissions; - } - - set - { - _permissions = value; RaisePropertyChanged(nameof(Permissions)); - } - - } - - private ICollectionView _permissionsViewSource; - /// - /// Gets or sets the Permissions View Source. - /// - public ICollectionView PermissionsViewSource - { - get - { - return _permissionsViewSource; - } - - set - { - _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); - } - - } - - private ObservableCollection _processparameterstables; - /// - /// Gets or sets the ProcessParametersTables. - /// - public ObservableCollection ProcessParametersTables - { - get - { - return _processparameterstables; - } - - set - { - _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); - } - - } - - private ICollectionView _processparameterstablesViewSource; - /// - /// Gets or sets the ProcessParametersTables View Source. - /// - public ICollectionView ProcessParametersTablesViewSource - { - get - { - return _processparameterstablesViewSource; - } - - set - { - _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); - } - - } - - private ObservableCollection _processparameterstablesgroups; - /// - /// Gets or sets the ProcessParametersTablesGroups. - /// - public ObservableCollection ProcessParametersTablesGroups - { - get - { - return _processparameterstablesgroups; - } - - set - { - _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); - } - - } - - private ICollectionView _processparameterstablesgroupsViewSource; - /// - /// Gets or sets the ProcessParametersTablesGroups View Source. + /// Gets or sets the MediaConditions View Source. /// - public ICollectionView ProcessParametersTablesGroupsViewSource + public ICollectionView MediaConditionsViewSource { get { - return _processparameterstablesgroupsViewSource; + return _mediaconditionsViewSource; } set { - _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); + _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); } } - private ObservableCollection _publishedprocedureprojects; + private ObservableCollection _mediamaterials; /// - /// Gets or sets the PublishedProcedureProjects. + /// Gets or sets the MediaMaterials. /// - public ObservableCollection PublishedProcedureProjects + public ObservableCollection MediaMaterials { get { - return _publishedprocedureprojects; + return _mediamaterials; } set { - _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); + _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); } } - private ICollectionView _publishedprocedureprojectsViewSource; + private ICollectionView _mediamaterialsViewSource; /// - /// Gets or sets the PublishedProcedureProjects View Source. + /// Gets or sets the MediaMaterials View Source. /// - public ICollectionView PublishedProcedureProjectsViewSource + public ICollectionView MediaMaterialsViewSource { get { - return _publishedprocedureprojectsViewSource; + return _mediamaterialsViewSource; } set { - _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); + _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); } } - private ObservableCollection _publishedprocedureprojectsversions; + private ObservableCollection _mediapurposes; /// - /// Gets or sets the PublishedProcedureProjectsVersions. + /// Gets or sets the MediaPurposes. /// - public ObservableCollection PublishedProcedureProjectsVersions + public ObservableCollection MediaPurposes { get { - return _publishedprocedureprojectsversions; + return _mediapurposes; } set { - _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); + _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); } } - private ICollectionView _publishedprocedureprojectsversionsViewSource; + private ICollectionView _mediapurposesViewSource; /// - /// Gets or sets the PublishedProcedureProjectsVersions View Source. + /// Gets or sets the MediaPurposes View Source. /// - public ICollectionView PublishedProcedureProjectsVersionsViewSource + public ICollectionView MediaPurposesViewSource { get { - return _publishedprocedureprojectsversionsViewSource; + return _mediapurposesViewSource; } set { - _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); + _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrations; + private ObservableCollection _midtanktypes; /// - /// Gets or sets the RmlExtensionColorCalibrations. + /// Gets or sets the MidTankTypes. /// - public ObservableCollection RmlExtensionColorCalibrations + public ObservableCollection MidTankTypes { get { - return _rmlextensioncolorcalibrations; + return _midtanktypes; } set { - _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); } } - private ICollectionView _rmlextensioncolorcalibrationsViewSource; + private ICollectionView _midtanktypesViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrations View Source. + /// Gets or sets the MidTankTypes View Source. /// - public ICollectionView RmlExtensionColorCalibrationsViewSource + public ICollectionView MidTankTypesViewSource { get { - return _rmlextensioncolorcalibrationsViewSource; + return _midtanktypesViewSource; } set { - _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstests; + private ObservableCollection _organizations; /// - /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// Gets or sets the Organizations. /// - public ObservableCollection RmlExtensionColorCalibrationsTests + public ObservableCollection Organizations { get { - return _rmlextensioncolorcalibrationstests; + return _organizations; } set { - _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + _organizations = value; RaisePropertyChanged(nameof(Organizations)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + private ICollectionView _organizationsViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + /// Gets or sets the Organizations View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + public ICollectionView OrganizationsViewSource { get { - return _rmlextensioncolorcalibrationstestsViewSource; + return _organizationsViewSource; } set { - _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddata; + private ObservableCollection _permissions; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// Gets or sets the Permissions. /// - public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidData + public ObservableCollection Permissions { get { - return _rmlextensioncolorcalibrationstestsliquiddata; + return _permissions; } set { - _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + _permissions = value; RaisePropertyChanged(nameof(Permissions)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + private ICollectionView _permissionsViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + /// Gets or sets the Permissions View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + public ICollectionView PermissionsViewSource { get { - return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + return _permissionsViewSource; } set { - _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddatapoints; + private ObservableCollection _processparameterstables; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// Gets or sets the ProcessParametersTables. /// - public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidDataPoints + public ObservableCollection ProcessParametersTables { get { - return _rmlextensioncolorcalibrationstestsliquiddatapoints; + return _processparameterstables; } set { - _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + private ICollectionView _processparameterstablesViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + /// Gets or sets the ProcessParametersTables View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + public ICollectionView ProcessParametersTablesViewSource { get { - return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + return _processparameterstablesViewSource; } set { - _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); } } - private ObservableCollection _rmlextensioncolorshades; + private ObservableCollection _processparameterstablesgroups; /// - /// Gets or sets the RmlExtensionColorShades. + /// Gets or sets the ProcessParametersTablesGroups. /// - public ObservableCollection RmlExtensionColorShades + public ObservableCollection ProcessParametersTablesGroups { get { - return _rmlextensioncolorshades; + return _processparameterstablesgroups; } set { - _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); } } - private ICollectionView _rmlextensioncolorshadesViewSource; + private ICollectionView _processparameterstablesgroupsViewSource; /// - /// Gets or sets the RmlExtensionColorShades View Source. + /// Gets or sets the ProcessParametersTablesGroups View Source. /// - public ICollectionView RmlExtensionColorShadesViewSource + public ICollectionView ProcessParametersTablesGroupsViewSource { get { - return _rmlextensioncolorshadesViewSource; + return _processparameterstablesgroupsViewSource; } set { - _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); } } - private ObservableCollection _rmlextensioncolorshadestests; + private ObservableCollection _publishedprocedureprojects; /// - /// Gets or sets the RmlExtensionColorShadesTests. + /// Gets or sets the PublishedProcedureProjects. /// - public ObservableCollection RmlExtensionColorShadesTests + public ObservableCollection PublishedProcedureProjects { get { - return _rmlextensioncolorshadestests; + return _publishedprocedureprojects; } set { - _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); } } - private ICollectionView _rmlextensioncolorshadestestsViewSource; + private ICollectionView _publishedprocedureprojectsViewSource; /// - /// Gets or sets the RmlExtensionColorShadesTests View Source. + /// Gets or sets the PublishedProcedureProjects View Source. /// - public ICollectionView RmlExtensionColorShadesTestsViewSource + public ICollectionView PublishedProcedureProjectsViewSource { get { - return _rmlextensioncolorshadestestsViewSource; + return _publishedprocedureprojectsViewSource; } set { - _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); } } - private ObservableCollection _rmlextensioncolorshadestestsdata; + private ObservableCollection _publishedprocedureprojectsversions; /// - /// Gets or sets the RmlExtensionColorShadesTestsData. + /// Gets or sets the PublishedProcedureProjectsVersions. /// - public ObservableCollection RmlExtensionColorShadesTestsData + public ObservableCollection PublishedProcedureProjectsVersions { get { - return _rmlextensioncolorshadestestsdata; + return _publishedprocedureprojectsversions; } set { - _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); } } - private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + private ICollectionView _publishedprocedureprojectsversionsViewSource; /// - /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + /// Gets or sets the PublishedProcedureProjectsVersions View Source. /// - public ICollectionView RmlExtensionColorShadesTestsDataViewSource + public ICollectionView PublishedProcedureProjectsVersionsViewSource { get { - return _rmlextensioncolorshadestestsdataViewSource; + return _publishedprocedureprojectsversionsViewSource; } set { - _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); } } - private ObservableCollection _rmlextensiontestresultsfiles; + private ObservableCollection _rmlextensiontestwashingresults; /// - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// - public ObservableCollection RmlExtensionTestResultsFiles + public ObservableCollection RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + _rmlextensiontestwashingresults = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } } - private ICollectionView _rmlextensiontestresultsfilesViewSource; + private ICollectionView _rmlextensiontestwashingresultsViewSource; /// - /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// Gets or sets the RmlExtensionTestWashingResults View Source. /// - public ICollectionView RmlExtensionTestResultsFilesViewSource + public ICollectionView RmlExtensionTestWashingResultsViewSource { get { - return _rmlextensiontestresultsfilesViewSource; + return _rmlextensiontestwashingresultsViewSource; } set { - _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + _rmlextensiontestwashingresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResultsViewSource)); } } @@ -4229,6 +4265,42 @@ namespace Tango.BL } + private ObservableCollection _washingtestmaterials; + /// + /// Gets or sets the WashingTestMaterials. + /// + public ObservableCollection WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + _washingtestmaterials = value; RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + } + + private ICollectionView _washingtestmaterialsViewSource; + /// + /// Gets or sets the WashingTestMaterials View Source. + /// + public ICollectionView WashingTestMaterialsViewSource + { + get + { + return _washingtestmaterialsViewSource; + } + + set + { + _washingtestmaterialsViewSource = value; RaisePropertyChanged(nameof(WashingTestMaterialsViewSource)); + } + + } + private ObservableCollection _windingmethods; /// /// Gets or sets the WindingMethods. @@ -4307,6 +4379,22 @@ namespace Tango.BL YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades); + RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); + + RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); + + RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); + + RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); + + RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); + + RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); + + RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); + + RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + ActionLogsViewSource = CreateCollectionView(ActionLogs); AddressesViewSource = CreateCollectionView(Addresses); @@ -4441,21 +4529,7 @@ namespace Tango.BL PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions); - RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); - - RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); - - RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); - - RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); - - RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); - - RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); - - RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); - - RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + RmlExtensionTestWashingResultsViewSource = CreateCollectionView(RmlExtensionTestWashingResults); RmlsViewSource = CreateCollectionView(Rmls); @@ -4505,6 +4579,8 @@ namespace Tango.BL UsersRolesViewSource = CreateCollectionView(UsersRoles); + WashingTestMaterialsViewSource = CreateCollectionView(WashingTestMaterials); + WindingMethodsViewSource = CreateCollectionView(WindingMethods); } diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index e3b7a68ea..b40fbb618 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -665,6 +665,294 @@ namespace Tango.BL } + private ObservableCollection _rmlextensioncolorcalibrations; + /// + /// Gets or sets the RmlExtensionColorCalibrations. + /// + public ObservableCollection RmlExtensionColorCalibrations + { + get + { + return _rmlextensioncolorcalibrations; + } + + set + { + _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrations View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsViewSource + { + get + { + return _rmlextensioncolorcalibrationsViewSource; + } + + set + { + _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstests; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// + public ObservableCollection RmlExtensionColorCalibrationsTests + { + get + { + return _rmlextensioncolorcalibrationstests; + } + + set + { + _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddata; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// + public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidData + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddata; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddatapoints; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// + public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidDataPoints + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapoints; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + } + + } + + private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + /// + /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + /// + public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + { + get + { + return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + } + + set + { + _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshades; + /// + /// Gets or sets the RmlExtensionColorShades. + /// + public ObservableCollection RmlExtensionColorShades + { + get + { + return _rmlextensioncolorshades; + } + + set + { + _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + } + + } + + private ICollectionView _rmlextensioncolorshadesViewSource; + /// + /// Gets or sets the RmlExtensionColorShades View Source. + /// + public ICollectionView RmlExtensionColorShadesViewSource + { + get + { + return _rmlextensioncolorshadesViewSource; + } + + set + { + _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshadestests; + /// + /// Gets or sets the RmlExtensionColorShadesTests. + /// + public ObservableCollection RmlExtensionColorShadesTests + { + get + { + return _rmlextensioncolorshadestests; + } + + set + { + _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsViewSource; + /// + /// Gets or sets the RmlExtensionColorShadesTests View Source. + /// + public ICollectionView RmlExtensionColorShadesTestsViewSource + { + get + { + return _rmlextensioncolorshadestestsViewSource; + } + + set + { + _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + } + + } + + private ObservableCollection _rmlextensioncolorshadestestsdata; + /// + /// Gets or sets the RmlExtensionColorShadesTestsData. + /// + public ObservableCollection RmlExtensionColorShadesTestsData + { + get + { + return _rmlextensioncolorshadestestsdata; + } + + set + { + _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + } + + } + + private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + /// + /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + /// + public ICollectionView RmlExtensionColorShadesTestsDataViewSource + { + get + { + return _rmlextensioncolorshadestestsdataViewSource; + } + + set + { + _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + } + + } + + private ObservableCollection _rmlextensiontestresultsfiles; + /// + /// Gets or sets the RmlExtensionTestResultsFiles. + /// + public ObservableCollection RmlExtensionTestResultsFiles + { + get + { + return _rmlextensiontestresultsfiles; + } + + set + { + _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + } + + } + + private ICollectionView _rmlextensiontestresultsfilesViewSource; + /// + /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// + public ICollectionView RmlExtensionTestResultsFilesViewSource + { + get + { + return _rmlextensiontestresultsfilesViewSource; + } + + set + { + _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + } + + } + private ObservableCollection _actionlogs; /// /// Gets or sets the ActionLogs. @@ -2737,630 +3025,378 @@ namespace Tango.BL private ICollectionView _mediaconditionsViewSource; /// - /// Gets or sets the MediaConditions View Source. - /// - public ICollectionView MediaConditionsViewSource - { - get - { - return _mediaconditionsViewSource; - } - - set - { - _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); - } - - } - - private ObservableCollection _mediamaterials; - /// - /// Gets or sets the MediaMaterials. - /// - public ObservableCollection MediaMaterials - { - get - { - return _mediamaterials; - } - - set - { - _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); - } - - } - - private ICollectionView _mediamaterialsViewSource; - /// - /// Gets or sets the MediaMaterials View Source. - /// - public ICollectionView MediaMaterialsViewSource - { - get - { - return _mediamaterialsViewSource; - } - - set - { - _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); - } - - } - - private ObservableCollection _mediapurposes; - /// - /// Gets or sets the MediaPurposes. - /// - public ObservableCollection MediaPurposes - { - get - { - return _mediapurposes; - } - - set - { - _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); - } - - } - - private ICollectionView _mediapurposesViewSource; - /// - /// Gets or sets the MediaPurposes View Source. - /// - public ICollectionView MediaPurposesViewSource - { - get - { - return _mediapurposesViewSource; - } - - set - { - _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); - } - - } - - private ObservableCollection _midtanktypes; - /// - /// Gets or sets the MidTankTypes. - /// - public ObservableCollection MidTankTypes - { - get - { - return _midtanktypes; - } - - set - { - _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); - } - - } - - private ICollectionView _midtanktypesViewSource; - /// - /// Gets or sets the MidTankTypes View Source. - /// - public ICollectionView MidTankTypesViewSource - { - get - { - return _midtanktypesViewSource; - } - - set - { - _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); - } - - } - - private ObservableCollection _organizations; - /// - /// Gets or sets the Organizations. - /// - public ObservableCollection Organizations - { - get - { - return _organizations; - } - - set - { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } - - } - - private ICollectionView _organizationsViewSource; - /// - /// Gets or sets the Organizations View Source. - /// - public ICollectionView OrganizationsViewSource - { - get - { - return _organizationsViewSource; - } - - set - { - _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); - } - - } - - private ObservableCollection _permissions; - /// - /// Gets or sets the Permissions. - /// - public ObservableCollection Permissions - { - get - { - return _permissions; - } - - set - { - _permissions = value; RaisePropertyChanged(nameof(Permissions)); - } - - } - - private ICollectionView _permissionsViewSource; - /// - /// Gets or sets the Permissions View Source. - /// - public ICollectionView PermissionsViewSource - { - get - { - return _permissionsViewSource; - } - - set - { - _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); - } - - } - - private ObservableCollection _processparameterstables; - /// - /// Gets or sets the ProcessParametersTables. - /// - public ObservableCollection ProcessParametersTables - { - get - { - return _processparameterstables; - } - - set - { - _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); - } - - } - - private ICollectionView _processparameterstablesViewSource; - /// - /// Gets or sets the ProcessParametersTables View Source. - /// - public ICollectionView ProcessParametersTablesViewSource - { - get - { - return _processparameterstablesViewSource; - } - - set - { - _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); - } - - } - - private ObservableCollection _processparameterstablesgroups; - /// - /// Gets or sets the ProcessParametersTablesGroups. - /// - public ObservableCollection ProcessParametersTablesGroups - { - get - { - return _processparameterstablesgroups; - } - - set - { - _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); - } - - } - - private ICollectionView _processparameterstablesgroupsViewSource; - /// - /// Gets or sets the ProcessParametersTablesGroups View Source. + /// Gets or sets the MediaConditions View Source. /// - public ICollectionView ProcessParametersTablesGroupsViewSource + public ICollectionView MediaConditionsViewSource { get { - return _processparameterstablesgroupsViewSource; + return _mediaconditionsViewSource; } set { - _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); + _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); } } - private ObservableCollection _publishedprocedureprojects; + private ObservableCollection _mediamaterials; /// - /// Gets or sets the PublishedProcedureProjects. + /// Gets or sets the MediaMaterials. /// - public ObservableCollection PublishedProcedureProjects + public ObservableCollection MediaMaterials { get { - return _publishedprocedureprojects; + return _mediamaterials; } set { - _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); + _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); } } - private ICollectionView _publishedprocedureprojectsViewSource; + private ICollectionView _mediamaterialsViewSource; /// - /// Gets or sets the PublishedProcedureProjects View Source. + /// Gets or sets the MediaMaterials View Source. /// - public ICollectionView PublishedProcedureProjectsViewSource + public ICollectionView MediaMaterialsViewSource { get { - return _publishedprocedureprojectsViewSource; + return _mediamaterialsViewSource; } set { - _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); + _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); } } - private ObservableCollection _publishedprocedureprojectsversions; + private ObservableCollection _mediapurposes; /// - /// Gets or sets the PublishedProcedureProjectsVersions. + /// Gets or sets the MediaPurposes. /// - public ObservableCollection PublishedProcedureProjectsVersions + public ObservableCollection MediaPurposes { get { - return _publishedprocedureprojectsversions; + return _mediapurposes; } set { - _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); + _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); } } - private ICollectionView _publishedprocedureprojectsversionsViewSource; + private ICollectionView _mediapurposesViewSource; /// - /// Gets or sets the PublishedProcedureProjectsVersions View Source. + /// Gets or sets the MediaPurposes View Source. /// - public ICollectionView PublishedProcedureProjectsVersionsViewSource + public ICollectionView MediaPurposesViewSource { get { - return _publishedprocedureprojectsversionsViewSource; + return _mediapurposesViewSource; } set { - _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); + _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrations; + private ObservableCollection _midtanktypes; /// - /// Gets or sets the RmlExtensionColorCalibrations. + /// Gets or sets the MidTankTypes. /// - public ObservableCollection RmlExtensionColorCalibrations + public ObservableCollection MidTankTypes { get { - return _rmlextensioncolorcalibrations; + return _midtanktypes; } set { - _rmlextensioncolorcalibrations = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrations)); + _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); } } - private ICollectionView _rmlextensioncolorcalibrationsViewSource; + private ICollectionView _midtanktypesViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrations View Source. + /// Gets or sets the MidTankTypes View Source. /// - public ICollectionView RmlExtensionColorCalibrationsViewSource + public ICollectionView MidTankTypesViewSource { get { - return _rmlextensioncolorcalibrationsViewSource; + return _midtanktypesViewSource; } set { - _rmlextensioncolorcalibrationsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsViewSource)); + _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstests; + private ObservableCollection _organizations; /// - /// Gets or sets the RmlExtensionColorCalibrationsTests. + /// Gets or sets the Organizations. /// - public ObservableCollection RmlExtensionColorCalibrationsTests + public ObservableCollection Organizations { get { - return _rmlextensioncolorcalibrationstests; + return _organizations; } set { - _rmlextensioncolorcalibrationstests = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTests)); + _organizations = value; RaisePropertyChanged(nameof(Organizations)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsViewSource; + private ICollectionView _organizationsViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTests View Source. + /// Gets or sets the Organizations View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsViewSource + public ICollectionView OrganizationsViewSource { get { - return _rmlextensioncolorcalibrationstestsViewSource; + return _organizationsViewSource; } set { - _rmlextensioncolorcalibrationstestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsViewSource)); + _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddata; + private ObservableCollection _permissions; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData. + /// Gets or sets the Permissions. /// - public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidData + public ObservableCollection Permissions { get { - return _rmlextensioncolorcalibrationstestsliquiddata; + return _permissions; } set { - _rmlextensioncolorcalibrationstestsliquiddata = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidData)); + _permissions = value; RaisePropertyChanged(nameof(Permissions)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddataViewSource; + private ICollectionView _permissionsViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidData View Source. + /// Gets or sets the Permissions View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataViewSource + public ICollectionView PermissionsViewSource { get { - return _rmlextensioncolorcalibrationstestsliquiddataViewSource; + return _permissionsViewSource; } set { - _rmlextensioncolorcalibrationstestsliquiddataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataViewSource)); + _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); } } - private ObservableCollection _rmlextensioncolorcalibrationstestsliquiddatapoints; + private ObservableCollection _processparameterstables; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints. + /// Gets or sets the ProcessParametersTables. /// - public ObservableCollection RmlExtensionColorCalibrationsTestsLiquidDataPoints + public ObservableCollection ProcessParametersTables { get { - return _rmlextensioncolorcalibrationstestsliquiddatapoints; + return _processparameterstables; } set { - _rmlextensioncolorcalibrationstestsliquiddatapoints = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPoints)); + _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); } } - private ICollectionView _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + private ICollectionView _processparameterstablesViewSource; /// - /// Gets or sets the RmlExtensionColorCalibrationsTestsLiquidDataPoints View Source. + /// Gets or sets the ProcessParametersTables View Source. /// - public ICollectionView RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource + public ICollectionView ProcessParametersTablesViewSource { get { - return _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource; + return _processparameterstablesViewSource; } set { - _rmlextensioncolorcalibrationstestsliquiddatapointsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource)); + _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); } } - private ObservableCollection _rmlextensioncolorshades; + private ObservableCollection _processparameterstablesgroups; /// - /// Gets or sets the RmlExtensionColorShades. + /// Gets or sets the ProcessParametersTablesGroups. /// - public ObservableCollection RmlExtensionColorShades + public ObservableCollection ProcessParametersTablesGroups { get { - return _rmlextensioncolorshades; + return _processparameterstablesgroups; } set { - _rmlextensioncolorshades = value; RaisePropertyChanged(nameof(RmlExtensionColorShades)); + _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); } } - private ICollectionView _rmlextensioncolorshadesViewSource; + private ICollectionView _processparameterstablesgroupsViewSource; /// - /// Gets or sets the RmlExtensionColorShades View Source. + /// Gets or sets the ProcessParametersTablesGroups View Source. /// - public ICollectionView RmlExtensionColorShadesViewSource + public ICollectionView ProcessParametersTablesGroupsViewSource { get { - return _rmlextensioncolorshadesViewSource; + return _processparameterstablesgroupsViewSource; } set { - _rmlextensioncolorshadesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesViewSource)); + _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); } } - private ObservableCollection _rmlextensioncolorshadestests; + private ObservableCollection _publishedprocedureprojects; /// - /// Gets or sets the RmlExtensionColorShadesTests. + /// Gets or sets the PublishedProcedureProjects. /// - public ObservableCollection RmlExtensionColorShadesTests + public ObservableCollection PublishedProcedureProjects { get { - return _rmlextensioncolorshadestests; + return _publishedprocedureprojects; } set { - _rmlextensioncolorshadestests = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTests)); + _publishedprocedureprojects = value; RaisePropertyChanged(nameof(PublishedProcedureProjects)); } } - private ICollectionView _rmlextensioncolorshadestestsViewSource; + private ICollectionView _publishedprocedureprojectsViewSource; /// - /// Gets or sets the RmlExtensionColorShadesTests View Source. + /// Gets or sets the PublishedProcedureProjects View Source. /// - public ICollectionView RmlExtensionColorShadesTestsViewSource + public ICollectionView PublishedProcedureProjectsViewSource { get { - return _rmlextensioncolorshadestestsViewSource; + return _publishedprocedureprojectsViewSource; } set { - _rmlextensioncolorshadestestsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsViewSource)); + _publishedprocedureprojectsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsViewSource)); } } - private ObservableCollection _rmlextensioncolorshadestestsdata; + private ObservableCollection _publishedprocedureprojectsversions; /// - /// Gets or sets the RmlExtensionColorShadesTestsData. + /// Gets or sets the PublishedProcedureProjectsVersions. /// - public ObservableCollection RmlExtensionColorShadesTestsData + public ObservableCollection PublishedProcedureProjectsVersions { get { - return _rmlextensioncolorshadestestsdata; + return _publishedprocedureprojectsversions; } set { - _rmlextensioncolorshadestestsdata = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsData)); + _publishedprocedureprojectsversions = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersions)); } } - private ICollectionView _rmlextensioncolorshadestestsdataViewSource; + private ICollectionView _publishedprocedureprojectsversionsViewSource; /// - /// Gets or sets the RmlExtensionColorShadesTestsData View Source. + /// Gets or sets the PublishedProcedureProjectsVersions View Source. /// - public ICollectionView RmlExtensionColorShadesTestsDataViewSource + public ICollectionView PublishedProcedureProjectsVersionsViewSource { get { - return _rmlextensioncolorshadestestsdataViewSource; + return _publishedprocedureprojectsversionsViewSource; } set { - _rmlextensioncolorshadestestsdataViewSource = value; RaisePropertyChanged(nameof(RmlExtensionColorShadesTestsDataViewSource)); + _publishedprocedureprojectsversionsViewSource = value; RaisePropertyChanged(nameof(PublishedProcedureProjectsVersionsViewSource)); } } - private ObservableCollection _rmlextensiontestresultsfiles; + private ObservableCollection _rmlextensiontestwashingresults; /// - /// Gets or sets the RmlExtensionTestResultsFiles. + /// Gets or sets the RmlExtensionTestWashingResults. /// - public ObservableCollection RmlExtensionTestResultsFiles + public ObservableCollection RmlExtensionTestWashingResults { get { - return _rmlextensiontestresultsfiles; + return _rmlextensiontestwashingresults; } set { - _rmlextensiontestresultsfiles = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles)); + _rmlextensiontestwashingresults = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResults)); } } - private ICollectionView _rmlextensiontestresultsfilesViewSource; + private ICollectionView _rmlextensiontestwashingresultsViewSource; /// - /// Gets or sets the RmlExtensionTestResultsFiles View Source. + /// Gets or sets the RmlExtensionTestWashingResults View Source. /// - public ICollectionView RmlExtensionTestResultsFilesViewSource + public ICollectionView RmlExtensionTestWashingResultsViewSource { get { - return _rmlextensiontestresultsfilesViewSource; + return _rmlextensiontestwashingresultsViewSource; } set { - _rmlextensiontestresultsfilesViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestResultsFilesViewSource)); + _rmlextensiontestwashingresultsViewSource = value; RaisePropertyChanged(nameof(RmlExtensionTestWashingResultsViewSource)); } } @@ -4229,6 +4265,42 @@ namespace Tango.BL } + private ObservableCollection _washingtestmaterials; + /// + /// Gets or sets the WashingTestMaterials. + /// + public ObservableCollection WashingTestMaterials + { + get + { + return _washingtestmaterials; + } + + set + { + _washingtestmaterials = value; RaisePropertyChanged(nameof(WashingTestMaterials)); + } + + } + + private ICollectionView _washingtestmaterialsViewSource; + /// + /// Gets or sets the WashingTestMaterials View Source. + /// + public ICollectionView WashingTestMaterialsViewSource + { + get + { + return _washingtestmaterialsViewSource; + } + + set + { + _washingtestmaterialsViewSource = value; RaisePropertyChanged(nameof(WashingTestMaterialsViewSource)); + } + + } + private ObservableCollection _windingmethods; /// /// Gets or sets the WindingMethods. @@ -4307,6 +4379,22 @@ namespace Tango.BL YarnWhiteShadesViewSource = CreateCollectionView(YarnWhiteShades); + RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); + + RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); + + RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); + + RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); + + RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); + + RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); + + RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); + + RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + ActionLogsViewSource = CreateCollectionView(ActionLogs); AddressesViewSource = CreateCollectionView(Addresses); @@ -4441,21 +4529,7 @@ namespace Tango.BL PublishedProcedureProjectsVersionsViewSource = CreateCollectionView(PublishedProcedureProjectsVersions); - RmlExtensionColorCalibrationsViewSource = CreateCollectionView(RmlExtensionColorCalibrations); - - RmlExtensionColorCalibrationsTestsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTests); - - RmlExtensionColorCalibrationsTestsLiquidDataViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidData); - - RmlExtensionColorCalibrationsTestsLiquidDataPointsViewSource = CreateCollectionView(RmlExtensionColorCalibrationsTestsLiquidDataPoints); - - RmlExtensionColorShadesViewSource = CreateCollectionView(RmlExtensionColorShades); - - RmlExtensionColorShadesTestsViewSource = CreateCollectionView(RmlExtensionColorShadesTests); - - RmlExtensionColorShadesTestsDataViewSource = CreateCollectionView(RmlExtensionColorShadesTestsData); - - RmlExtensionTestResultsFilesViewSource = CreateCollectionView(RmlExtensionTestResultsFiles); + RmlExtensionTestWashingResultsViewSource = CreateCollectionView(RmlExtensionTestWashingResults); RmlsViewSource = CreateCollectionView(Rmls); @@ -4505,6 +4579,8 @@ namespace Tango.BL UsersRolesViewSource = CreateCollectionView(UsersRoles); + WashingTestMaterialsViewSource = CreateCollectionView(WashingTestMaterials); + WindingMethodsViewSource = CreateCollectionView(WindingMethods); } diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 8bdb3b3f5..259b2ce6b 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -307,6 +307,8 @@ + + @@ -357,6 +359,8 @@ + + @@ -495,6 +499,8 @@ + + @@ -537,6 +543,8 @@ + + @@ -812,7 +820,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs index 5a4c082be..9f3026268 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA.cs @@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB public string RML_EXTENSION_COLOR_CALIBRATIONS_TEST_GUID { get; set; } public string LIQUID_TYPE_GUID { get; set; } - public virtual LIQUID_TYPES LIQUID_TYPES { get; set; } public virtual RML_EXTENSION_COLOR_CALIBRATIONS_TESTS RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } + public virtual LIQUID_TYPES LIQUID_TYPES { 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 c530978d8..e0543a58c 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 @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB { this.TENSILE_RESULTS = new HashSet(); this.RML_EXTENSION_TEST_RESULTS_FILES = new HashSet(); + this.RML_EXTENSION_TEST_WASHING_RESULTS = new HashSet(); this.RUBBING_RESULTS = new HashSet(); } @@ -61,9 +62,11 @@ namespace Tango.DAL.Remote.DB public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection TENSILE_RESULTS { get; set; } - public virtual MACHINE MACHINE { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RML_EXTENSION_TEST_RESULTS_FILES { 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; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection RUBBING_RESULTS { get; set; } } 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 new file mode 100644 index 000000000..c97f1ab73 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_WASHING_RESULTS.cs @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class RML_EXTENSION_TEST_WASHING_RESULTS + { + public int ID { get; set; } + public string GUID { get; set; } + 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 COLOR { get; set; } + public Nullable WASHING_VALUE { get; set; } + + public virtual RML_EXTENSION_TEST_RESULTS RML_EXTENSION_TEST_RESULTS { get; set; } + public virtual WASHING_TEST_MATERIALS WASHING_TEST_MATERIALS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index 504edd34b..a4879a500 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -43,6 +43,14 @@ namespace Tango.DAL.Remote.DB public virtual DbSet YARN_TEXTURINGS { get; set; } public virtual DbSet YARN_TYPES { get; set; } public virtual DbSet YARN_WHITE_SHADES { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } + public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; } + public virtual DbSet RML_EXTENSION_TEST_RESULTS_FILES { get; set; } public virtual DbSet ACTION_LOGS { get; set; } public virtual DbSet
ADDRESSES { get; set; } public virtual DbSet APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } @@ -110,14 +118,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet PROCESS_PARAMETERS_TABLES_GROUPS { get; set; } public virtual DbSet PUBLISHED_PROCEDURE_PROJECTS { get; set; } public virtual DbSet PUBLISHED_PROCEDURE_PROJECTS_VERSIONS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_CALIBRATIONS_TESTS_LIQUID_DATA_POINTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS { get; set; } - public virtual DbSet RML_EXTENSION_COLOR_SHADES_TESTS_DATA { get; set; } - public virtual DbSet RML_EXTENSION_TEST_RESULTS_FILES { get; set; } + public virtual DbSet RML_EXTENSION_TEST_WASHING_RESULTS { get; set; } public virtual DbSet RMLS { get; set; } public virtual DbSet RMLS_SPOOLS { get; set; } public virtual DbSet ROLES { get; set; } @@ -142,6 +143,7 @@ namespace Tango.DAL.Remote.DB public virtual DbSet TECH_VALVES { get; set; } public virtual DbSet USERS { get; set; } public virtual DbSet USERS_ROLES { get; set; } + public virtual DbSet WASHING_TEST_MATERIALS { get; set; } public virtual DbSet WINDING_METHODS { 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 ed6e629ac..f367a5aa0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1230,6 +1230,18 @@ + + + + + + + + + + + + @@ -1653,6 +1665,15 @@ + + + + + + + + + @@ -2841,6 +2862,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3499,6 +3548,7 @@ + @@ -3526,6 +3576,7 @@ + @@ -3862,6 +3913,14 @@ + + + + + + + + @@ -4126,6 +4185,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4193,14 +4292,7 @@ - - - - - - - - + @@ -4225,6 +4317,7 @@ + @@ -4578,42 +4671,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + @@ -4769,8 +4838,9 @@ - + + @@ -5141,150 +5211,375 @@ - + - - - - - - - + + + + + - + - - - - - - - - - + + + + - + - - - + + + + + - + - - - + + + + + + + - + - - - + + + + + - + - - - - - - + + + + - + - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6325,108 +6620,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6434,9 +6628,11 @@ - - - + + + + + @@ -6859,6 +7055,16 @@ + + + + + + + + + + @@ -7977,156 +8183,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - + - + - + @@ -8145,6 +8253,20 @@ + + + + + + + + + + + + + + @@ -8603,6 +8725,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9716,104 +9943,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -10207,6 +10342,16 @@ + + + + + + + + + + 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 27f6a9fa1..2cc7da5b5 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,98 +5,100 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + + - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -179,6 +181,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs new file mode 100644 index 000000000..62f08e111 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/WASHING_TEST_MATERIALS.cs @@ -0,0 +1,31 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class WASHING_TEST_MATERIALS + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public WASHING_TEST_MATERIALS() + { + this.RML_EXTENSION_TEST_WASHING_RESULTS = new HashSet(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string NAME { 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/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index e58f7fd5b..79beff832 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -327,6 +327,9 @@ RemoteADO.tt + + RemoteADO.tt + RemoteADO.tt @@ -399,6 +402,9 @@ RemoteADO.tt + + RemoteADO.tt + RemoteADO.tt @@ -485,7 +491,7 @@ - + \ No newline at end of file -- cgit v1.3.1