RMl Default Liquid Factor + Machine Type + Improved RML Filter Loading.

3 files changed, 61 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
index 460d1f193..03bd6b656 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
@@ -445,5 +445,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// machine type
+        /// </summary>
+        public Nullable<Int32> MachineType 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index fdeb8f05e..3f35ed11f 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -106,6 +106,21 @@ namespace Tango.BL.Entities
             }
         }
 
+        [NotMapped]
+        [JsonIgnore]
+        public MachineTypes? ForMachineType
+        {
+            get
+            {
+                return MachineType != null ? (MachineTypes?)MachineType : null;
+            }
+            set
+            {
+                MachineType = (int?)value;
+                RaisePropertyChanged(nameof(ForMachineType));
+            }
+        }
+
         protected override void OnNameChanged(string name)
         {
             base.OnNameChanged(name);
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
index 357be1666..59881f3d5 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
@@ -111,6 +111,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Double> DefaultLiquidFactorChanged;
 
+        public event EventHandler<Nullable<Int32>> MachineTypeChanged;
+
         public event EventHandler<BtsrApplicationType> BtsrApplicationTypeChanged;
 
         public event EventHandler<BtsrYarnType> BtsrYarnTypeChanged;
@@ -1569,6 +1571,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Nullable<Int32> _machinetype;
+
+        /// <summary>
+        /// Gets or sets the rmlbase machine type.
+        /// </summary>
+
+        [Column("MACHINE_TYPE")]
+
+        public  Nullable<Int32> MachineType
+        {
+            get 
+            {
+                return _machinetype; 
+            }
+
+            set 
+            {
+                if (_machinetype != value)
+                {
+                    _machinetype = value;
+
+                    OnMachineTypeChanged(value);
+
+                }
+            }
+        }
+
         protected BtsrApplicationType _btsrapplicationtype;
 
         /// <summary>
@@ -2500,6 +2529,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the MachineType has changed.
+        /// </summary>
+        protected virtual void OnMachineTypeChanged(Nullable<Int32> machinetype)
+        {
+            MachineTypeChanged?.Invoke(this, machinetype);
+            RaisePropertyChanged(nameof(MachineType));
+        }
+
+        /// <summary>
         /// Called when the BtsrApplicationType has changed.
         /// </summary>
         protected virtual void OnBtsrApplicationTypeChanged(BtsrApplicationType btsrapplicationtype)