Added Washing test results tables

Related Work Items: #6660

5 files changed, 443 insertions, 12 deletions

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<SynchronizedObservableCollection<TensileResult>> TensileResultsChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResultsFile>> RmlExtensionTestResultsFilesChanged;
+
         public event EventHandler<Machine> MachineChanged;
 
-        public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResultsFile>> RmlExtensionTestResultsFilesChanged;
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestWashingResult>> RmlExtensionTestWashingResultsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<RubbingResult>> RubbingResultsChanged;
 
@@ -1016,6 +1018,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultbase rml extension test results files.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles
+        {
+            get 
+            {
+                return _rmlextensiontestresultsfiles; 
+            }
+
+            set 
+            {
+                if (_rmlextensiontestresultsfiles != value)
+                {
+                    _rmlextensiontestresultsfiles = value;
+
+                    OnRmlExtensionTestResultsFilesChanged(value);
+
+                }
+            }
+        }
+
         protected Machine _machine;
 
         /// <summary>
@@ -1048,26 +1075,26 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected SynchronizedObservableCollection<RmlExtensionTestResultsFile> _rmlextensiontestresultsfiles;
+        protected SynchronizedObservableCollection<RmlExtensionTestWashingResult> _rmlextensiontestwashingresults;
 
         /// <summary>
-        /// Gets or sets the rmlextensiontestresultbase rml extension test results files.
+        /// Gets or sets the rmlextensiontestresultbase rml extension test washing results.
         /// </summary>
 
-        public virtual SynchronizedObservableCollection<RmlExtensionTestResultsFile> RmlExtensionTestResultsFiles
+        public virtual SynchronizedObservableCollection<RmlExtensionTestWashingResult> RmlExtensionTestWashingResults
         {
             get 
             {
-                return _rmlextensiontestresultsfiles; 
+                return _rmlextensiontestwashingresults; 
             }
 
             set 
             {
-                if (_rmlextensiontestresultsfiles != value)
+                if (_rmlextensiontestwashingresults != value)
                 {
-                    _rmlextensiontestresultsfiles = value;
+                    _rmlextensiontestwashingresults = value;
 
-                    OnRmlExtensionTestResultsFilesChanged(value);
+                    OnRmlExtensionTestWashingResultsChanged(value);
 
                 }
             }
@@ -1387,6 +1414,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlExtensionTestResultsFiles has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection<RmlExtensionTestResultsFile> rmlextensiontestresultsfiles)
+        {
+            RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles);
+            RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles));
+        }
+
+        /// <summary>
         /// Called when the Machine has changed.
         /// </summary>
         protected virtual void OnMachineChanged(Machine machine)
@@ -1396,12 +1432,12 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the RmlExtensionTestResultsFiles has changed.
+        /// Called when the RmlExtensionTestWashingResults has changed.
         /// </summary>
-        protected virtual void OnRmlExtensionTestResultsFilesChanged(SynchronizedObservableCollection<RmlExtensionTestResultsFile> rmlextensiontestresultsfiles)
+        protected virtual void OnRmlExtensionTestWashingResultsChanged(SynchronizedObservableCollection<RmlExtensionTestWashingResult> rmlextensiontestwashingresults)
         {
-            RmlExtensionTestResultsFilesChanged?.Invoke(this, rmlextensiontestresultsfiles);
-            RaisePropertyChanged(nameof(RmlExtensionTestResultsFiles));
+            RmlExtensionTestWashingResultsChanged?.Invoke(this, rmlextensiontestwashingresults);
+            RaisePropertyChanged(nameof(RmlExtensionTestWashingResults));
         }
 
         /// <summary>
@@ -1423,6 +1459,8 @@ namespace Tango.BL.Entities
 
             RmlExtensionTestResultsFiles = new SynchronizedObservableCollection<RmlExtensionTestResultsFile>();
 
+            RmlExtensionTestWashingResults = new SynchronizedObservableCollection<RmlExtensionTestWashingResult>();
+
             RubbingResults = new SynchronizedObservableCollection<RubbingResult>();
 
         }
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 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// 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!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+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<RmlExtensionTestWashingResult>
+    {
+
+        public event EventHandler<Int32> ColorChanged;
+
+        public event EventHandler<Nullable<Double>> WashingValueChanged;
+
+        public event EventHandler<RmlExtensionTestResult> RmlExtensionTestResultsChanged;
+
+        public event EventHandler<WashingTestMaterial> WashingTestMaterialsChanged;
+
+        protected String _rmlextensiontestresultsguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestwashingresultbase rml extension test results guid.
+        /// </summary>
+
+        [Column("RML_EXTENSION_TEST_RESULTS_GUID")]
+        [ForeignKey("RmlExtensionTestResults")]
+
+        public  String RmlExtensionTestResultsGuid
+        {
+            get 
+            {
+                return _rmlextensiontestresultsguid; 
+            }
+
+            set 
+            {
+                if (_rmlextensiontestresultsguid != value)
+                {
+                    _rmlextensiontestresultsguid = value;
+
+                }
+            }
+        }
+
+        protected String _washingtestmaterialsguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestwashingresultbase washing test materials guid.
+        /// </summary>
+
+        [Column("WASHING_TEST_MATERIALS_GUID")]
+        [ForeignKey("WashingTestMaterials")]
+
+        public  String WashingTestMaterialsGuid
+        {
+            get 
+            {
+                return _washingtestmaterialsguid; 
+            }
+
+            set 
+            {
+                if (_washingtestmaterialsguid != value)
+                {
+                    _washingtestmaterialsguid = value;
+
+                }
+            }
+        }
+
+        protected Int32 _color;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestwashingresultbase color.
+        /// </summary>
+
+        [Column("COLOR")]
+
+        public  Int32 Color
+        {
+            get 
+            {
+                return _color; 
+            }
+
+            set 
+            {
+                if (_color != value)
+                {
+                    _color = value;
+
+                    OnColorChanged(value);
+
+                }
+            }
+        }
+
+        protected Nullable<Double> _washingvalue;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestwashingresultbase washing value.
+        /// </summary>
+
+        [Column("WASHING_VALUE")]
+
+        public  Nullable<Double> WashingValue
+        {
+            get 
+            {
+                return _washingvalue; 
+            }
+
+            set 
+            {
+                if (_washingvalue != value)
+                {
+                    _washingvalue = value;
+
+                    OnWashingValueChanged(value);
+
+                }
+            }
+        }
+
+        protected RmlExtensionTestResult _rmlextensiontestresults;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestwashingresultbase rml extension test results.
+        /// </summary>
+
+        [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;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestwashingresultbase washing test materials.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual WashingTestMaterial WashingTestMaterials
+        {
+            get 
+            {
+                return _washingtestmaterials; 
+            }
+
+            set 
+            {
+                if (_washingtestmaterials != value)
+                {
+                    _washingtestmaterials = value;
+
+                    if (WashingTestMaterials != null)
+                    {
+                        WashingTestMaterialsGuid = WashingTestMaterials.Guid;
+                    }
+
+                    OnWashingTestMaterialsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Color has changed.
+        /// </summary>
+        protected virtual void OnColorChanged(Int32 color)
+        {
+            ColorChanged?.Invoke(this, color);
+            RaisePropertyChanged(nameof(Color));
+        }
+
+        /// <summary>
+        /// Called when the WashingValue has changed.
+        /// </summary>
+        protected virtual void OnWashingValueChanged(Nullable<Double> washingvalue)
+        {
+            WashingValueChanged?.Invoke(this, washingvalue);
+            RaisePropertyChanged(nameof(WashingValue));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionTestResults has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionTestResultsChanged(RmlExtensionTestResult rmlextensiontestresults)
+        {
+            RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults);
+            RaisePropertyChanged(nameof(RmlExtensionTestResults));
+        }
+
+        /// <summary>
+        /// Called when the WashingTestMaterials has changed.
+        /// </summary>
+        protected virtual void OnWashingTestMaterialsChanged(WashingTestMaterial washingtestmaterials)
+        {
+            WashingTestMaterialsChanged?.Invoke(this, washingtestmaterials);
+            RaisePropertyChanged(nameof(WashingTestMaterials));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RmlExtensionTestWashingResultBase" /> class.
+        /// </summary>
+        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 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// 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!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+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<WashingTestMaterial>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestWashingResult>> RmlExtensionTestWashingResultsChanged;
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the washingtestmaterialbase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected SynchronizedObservableCollection<RmlExtensionTestWashingResult> _rmlextensiontestwashingresults;
+
+        /// <summary>
+        /// Gets or sets the washingtestmaterialbase rml extension test washing results.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionTestWashingResult> RmlExtensionTestWashingResults
+        {
+            get 
+            {
+                return _rmlextensiontestwashingresults; 
+            }
+
+            set 
+            {
+                if (_rmlextensiontestwashingresults != value)
+                {
+                    _rmlextensiontestwashingresults = value;
+
+                    OnRmlExtensionTestWashingResultsChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the RmlExtensionTestWashingResults has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionTestWashingResultsChanged(SynchronizedObservableCollection<RmlExtensionTestWashingResult> rmlextensiontestwashingresults)
+        {
+            RmlExtensionTestWashingResultsChanged?.Invoke(this, rmlextensiontestwashingresults);
+            RaisePropertyChanged(nameof(RmlExtensionTestWashingResults));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WashingTestMaterialBase" /> class.
+        /// </summary>
+        public WashingTestMaterialBase() : base()
+        {
+
+            RmlExtensionTestWashingResults = new SynchronizedObservableCollection<RmlExtensionTestWashingResult>();
+
+        }
+    }
+}