MS. RML Extension. Added Application Type,

Yarn Type  and Tension Error to Test results table. Changes in database.

Related Work Items: #6347

19 files changed, 615 insertions, 229 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index d6f3ea418..b2f3d99cf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -973,7 +973,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             }
         }
 
-        private async void LoadRmlProperties()
+        private  void LoadRmlProperties()
         {
             Applications = _active_context.YarnApplications.ToObservableCollection();
             Brands = _active_context.YarnBrands.ToObservableCollection();
@@ -992,7 +992,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
             YarnTypes = _active_context.YarnTypes.ToObservableCollection();
             IndustrySector = _active_context.YarnIndustrysectors.ToObservableCollection();
 
-            var machines = await new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().BuildAsync();
+            var machines = new MachinesCollectionBuilder(_active_context).SetAll().WithConfiguration().Build();
             Machines = machines.Select(x => new MachineModel()
             {
                 Guid = x.Guid,
@@ -1067,12 +1067,13 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                         guid = rml_extention.Guid;
                     }
 
-                    ActiveRMLExtension = await new RmlExtensionsBuilder(_active_context)
-                                            .Set(guid)
-                                            .WithUser()
-                                            .BuildAsync();
+                    
 
                     ActiveRML = new RmlBuilder(_active_context).Set(SelectedRMLExtension.RMLGuid).WithLiquidFactors().Build();
+
+                    ActiveRMLExtension = new RmlExtensionsBuilder(_active_context)
+                                            .Set(guid)
+                                            .Build();
                     
                     if (!String.IsNullOrEmpty(ActiveRML.Manufacturer) && false == Manufacturers.Any(x => x == ActiveRML.Manufacturer))
                     {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
index 03c87a3a6..ba7ae7238 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
@@ -300,7 +300,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                     
                     BtsrYarnTypes = _active_context.BtsrYarnTypes.ToObservableCollection();
 
-                    var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().BuildAsync();
+                    var testResults = await new RMLExtensionTestResultsCollectionBuilder(_active_context).SetAll().ForRMLExtension(RMLExtemtionGUID).ForMachine(SelectedMachineGUID).WithRubbingAndTensileResults().WithTestResultsFiles().WithWashingTestResults().WithBtsrApplicationTypes().WithBtsrYarnTypes().BuildAsync();
                     SelectedTestResults = testResults.OrderBy(x => x.ResultIndex).ToSynchronizedObservableCollection();
                     foreach (var result in SelectedTestResults)
                     {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
index 961c6b358..4ebc9077b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
@@ -686,9 +686,9 @@
                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Application Type</TextBlock>
                                                 </Border>
                                                 <Border Grid.Row="1" Grid.Column="5" BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <ComboBox Margin="0 2 0 0" ItemsSource="{Binding BtsrApplicationTypes}" SelectedItem="{Binding SelectedBtsrApplicationType}" DisplayMemberPath="Description"></ComboBox>
-                                                    </StackPanel>
+                                                    <Border Margin="0 0 5 2">
+                                                        <ComboBox  HorizontalAlignment="Stretch" ItemsSource="{Binding BtsrApplicationTypes}" SelectedItem="{Binding SelectedTab.TestResult.BtsrApplicationType}" DisplayMemberPath="Description" FontSize="14" Background="{StaticResource MainWindow.Background}" Padding="0" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                                    </Border>
                                                 </Border>
                                                 <Border Grid.Row="2" Grid.Column="0" BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">After dryer</TextBlock>
@@ -714,11 +714,9 @@
                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Yarn Type</TextBlock>
                                                 </Border>
                                                 <Border Grid.Row="2" Grid.Column="5" BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
-                                                        <!--<TextBlock FontSize="14" VerticalAlignment="Center"> -</TextBlock>
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
-                                                    </StackPanel>
+                                                    <Border Margin="0 0 5 2">
+                                                        <ComboBox  HorizontalAlignment="Stretch" ItemsSource="{Binding BtsrYarnTypes}" SelectedItem="{Binding SelectedTab.TestResult.BtsrYarnType}" DisplayMemberPath="Description" FontSize="14" Background="{StaticResource MainWindow.Background}" Padding="0" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+                                                    </Border>
                                                 </Border>
                                                 <Border  Grid.Row="3" Grid.Column="0" BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Winder</TextBlock>
@@ -745,9 +743,7 @@
                                                 </Border>
                                                 <Border Grid.Row="3" Grid.Column="5" BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
-                                                        <!--<TextBlock FontSize="14" VerticalAlignment="Center"> -</TextBlock>
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrTensionError,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
                                                     </StackPanel>
                                                 </Border>
                                             </Grid>
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
index 19c027976..a9aabdbdd 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RMLExtensionTestResultsCollectionBuilder.cs
@@ -80,5 +80,29 @@ namespace Tango.BL.Builders
                 }
             });
         }
+
+        public virtual RMLExtensionTestResultsCollectionBuilder WithBtsrApplicationTypes()
+        {
+            return AddStep(5, () =>
+            {
+                foreach (var result in Entities.ToList())
+                {
+                    if(!String.IsNullOrEmpty(result.BtsrApplicationTypeGuid))
+                        result.BtsrApplicationType = Context.BtsrApplicationTypes.FirstOrDefault(x => x.Guid == result.BtsrApplicationTypeGuid);
+                }
+            });
+        }
+
+        public virtual RMLExtensionTestResultsCollectionBuilder WithBtsrYarnTypes()
+        {
+            return AddStep(6, () =>
+            {
+                foreach (var result in Entities.ToList())
+                {
+                    if (!String.IsNullOrEmpty(result.BtsrYarnTypeGuid))
+                        result.BtsrYarnType = Context.BtsrYarnTypes.FirstOrDefault(x => x.Guid == result.BtsrYarnTypeGuid);
+                }
+            });
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs
index d48a36b22..0f2fa1675 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlExtensionTestResultDTOBase.cs
@@ -277,5 +277,29 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// btsr application type guid
+        /// </summary>
+        public String BtsrApplicationTypeGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// btsr yarn type guid
+        /// </summary>
+        public String BtsrYarnTypeGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// btsr tension error
+        /// </summary>
+        public Double BtsrTensionError 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs
index ee1ff6ecc..70fd2c41e 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs
@@ -33,6 +33,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> DescriptionChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResult>> RmlExtensionTestResultsChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged;
 
         protected Int32 _code;
@@ -116,6 +118,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlExtensionTestResult> _rmlextensiontestresults;
+
+        /// <summary>
+        /// Gets or sets the btsrapplicationtypebase rml extension test results.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionTestResult> RmlExtensionTestResults
+        {
+            get 
+            {
+                return _rmlextensiontestresults; 
+            }
+
+            set 
+            {
+                if (_rmlextensiontestresults != value)
+                {
+                    _rmlextensiontestresults = value;
+
+                    OnRmlExtensionTestResultsChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
@@ -169,6 +196,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlExtensionTestResults has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionTestResultsChanged(SynchronizedObservableCollection<RmlExtensionTestResult> rmlextensiontestresults)
+        {
+            RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults);
+            RaisePropertyChanged(nameof(RmlExtensionTestResults));
+        }
+
+        /// <summary>
         /// Called when the Rmls has changed.
         /// </summary>
         protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
@@ -183,6 +219,8 @@ namespace Tango.BL.Entities
         public BtsrApplicationTypeBase() : base()
         {
 
+            RmlExtensionTestResults = new SynchronizedObservableCollection<RmlExtensionTestResult>();
+
             Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs
index 608989fab..8128c8998 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs
@@ -33,6 +33,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> DescriptionChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResult>> RmlExtensionTestResultsChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged;
 
         protected Int32 _code;
@@ -116,6 +118,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RmlExtensionTestResult> _rmlextensiontestresults;
+
+        /// <summary>
+        /// Gets or sets the btsryarntypebase rml extension test results.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RmlExtensionTestResult> RmlExtensionTestResults
+        {
+            get 
+            {
+                return _rmlextensiontestresults; 
+            }
+
+            set 
+            {
+                if (_rmlextensiontestresults != value)
+                {
+                    _rmlextensiontestresults = value;
+
+                    OnRmlExtensionTestResultsChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Rml> _rmls;
 
         /// <summary>
@@ -169,6 +196,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RmlExtensionTestResults has changed.
+        /// </summary>
+        protected virtual void OnRmlExtensionTestResultsChanged(SynchronizedObservableCollection<RmlExtensionTestResult> rmlextensiontestresults)
+        {
+            RmlExtensionTestResultsChanged?.Invoke(this, rmlextensiontestresults);
+            RaisePropertyChanged(nameof(RmlExtensionTestResults));
+        }
+
+        /// <summary>
         /// Called when the Rmls has changed.
         /// </summary>
         protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls)
@@ -183,6 +219,8 @@ namespace Tango.BL.Entities
         public BtsrYarnTypeBase() : base()
         {
 
+            RmlExtensionTestResults = new SynchronizedObservableCollection<RmlExtensionTestResult>();
+
             Rmls = new SynchronizedObservableCollection<Rml>();
 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs
index b858163d2..b2af4322d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationBase.cs
@@ -27,12 +27,12 @@ namespace Tango.BL.Entities
     public abstract class RmlExtensionColorCalibrationBase : ObservableEntity<RmlExtensionColorCalibration>
     {
 
-        public event EventHandler<Machine> MachineChanged;
-
         public event EventHandler<RmlsExtension> RmlsExtensionsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorCalibrationsTest>> RmlExtensionColorCalibrationsTestsChanged;
 
+        public event EventHandler<Machine> MachineChanged;
+
         protected String _rmlsextensionsguid;
 
         /// <summary>
@@ -85,38 +85,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Machine _machine;
-
-        /// <summary>
-        /// Gets or sets the rmlextensioncolorcalibrationbase machine.
-        /// </summary>
-
-        [XmlIgnore]
-        [JsonIgnore]
-        public virtual Machine Machine
-        {
-            get 
-            {
-                return _machine; 
-            }
-
-            set 
-            {
-                if (_machine != value)
-                {
-                    _machine = value;
-
-                    if (Machine != null)
-                    {
-                        MachineGuid = Machine.Guid;
-                    }
-
-                    OnMachineChanged(value);
-
-                }
-            }
-        }
-
         protected RmlsExtension _rmlsextensions;
 
         /// <summary>
@@ -174,13 +142,36 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Machine _machine;
+
         /// <summary>
-        /// Called when the Machine has changed.
+        /// Gets or sets the rmlextensioncolorcalibrationbase machine.
         /// </summary>
-        protected virtual void OnMachineChanged(Machine machine)
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual Machine Machine
         {
-            MachineChanged?.Invoke(this, machine);
-            RaisePropertyChanged(nameof(Machine));
+            get 
+            {
+                return _machine; 
+            }
+
+            set 
+            {
+                if (_machine != value)
+                {
+                    _machine = value;
+
+                    if (Machine != null)
+                    {
+                        MachineGuid = Machine.Guid;
+                    }
+
+                    OnMachineChanged(value);
+
+                }
+            }
         }
 
         /// <summary>
@@ -202,6 +193,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the Machine has changed.
+        /// </summary>
+        protected virtual void OnMachineChanged(Machine machine)
+        {
+            MachineChanged?.Invoke(this, machine);
+            RaisePropertyChanged(nameof(Machine));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="RmlExtensionColorCalibrationBase" /> class.
         /// </summary>
         public RmlExtensionColorCalibrationBase() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs
index d55773809..d6ee701ba 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorCalibrationsTestsLiquidDataBase.cs
@@ -27,12 +27,12 @@ namespace Tango.BL.Entities
     public abstract class RmlExtensionColorCalibrationsTestsLiquidDataBase : ObservableEntity<RmlExtensionColorCalibrationsTestsLiquidData>
     {
 
-        public event EventHandler<LiquidType> LiquidTypeChanged;
-
         public event EventHandler<RmlExtensionColorCalibrationsTest> RmlExtensionColorCalibrationsTestChanged;
 
         public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorCalibrationsTestsLiquidDataPoint>> RmlExtensionColorCalibrationsTestsLiquidDataPointsChanged;
 
+        public event EventHandler<LiquidType> LiquidTypeChanged;
+
         protected String _rmlextensioncolorcalibrationstestguid;
 
         /// <summary>
@@ -85,38 +85,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected LiquidType _liquidtype;
-
-        /// <summary>
-        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase liquid types.
-        /// </summary>
-
-        [XmlIgnore]
-        [JsonIgnore]
-        public virtual LiquidType LiquidType
-        {
-            get 
-            {
-                return _liquidtype; 
-            }
-
-            set 
-            {
-                if (_liquidtype != value)
-                {
-                    _liquidtype = value;
-
-                    if (LiquidType != null)
-                    {
-                        LiquidTypeGuid = LiquidType.Guid;
-                    }
-
-                    OnLiquidTypeChanged(value);
-
-                }
-            }
-        }
-
         protected RmlExtensionColorCalibrationsTest _rmlextensioncolorcalibrationstest;
 
         /// <summary>
@@ -174,13 +142,36 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected LiquidType _liquidtype;
+
         /// <summary>
-        /// Called when the LiquidType has changed.
+        /// Gets or sets the rmlextensioncolorcalibrationstestsliquiddatabase liquid types.
         /// </summary>
-        protected virtual void OnLiquidTypeChanged(LiquidType liquidtype)
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual LiquidType LiquidType
         {
-            LiquidTypeChanged?.Invoke(this, liquidtype);
-            RaisePropertyChanged(nameof(LiquidType));
+            get 
+            {
+                return _liquidtype; 
+            }
+
+            set 
+            {
+                if (_liquidtype != value)
+                {
+                    _liquidtype = value;
+
+                    if (LiquidType != null)
+                    {
+                        LiquidTypeGuid = LiquidType.Guid;
+                    }
+
+                    OnLiquidTypeChanged(value);
+
+                }
+            }
         }
 
         /// <summary>
@@ -202,6 +193,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the LiquidType has changed.
+        /// </summary>
+        protected virtual void OnLiquidTypeChanged(LiquidType liquidtype)
+        {
+            LiquidTypeChanged?.Invoke(this, liquidtype);
+            RaisePropertyChanged(nameof(LiquidType));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="RmlExtensionColorCalibrationsTestsLiquidDataBase" /> class.
         /// </summary>
         public RmlExtensionColorCalibrationsTestsLiquidDataBase() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs
index b0386f13b..c0fa2ce5d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionColorShadeBase.cs
@@ -27,12 +27,12 @@ namespace Tango.BL.Entities
     public abstract class RmlExtensionColorShadeBase : ObservableEntity<RmlExtensionColorShade>
     {
 
-        public event EventHandler<Machine> MachineChanged;
-
         public event EventHandler<RmlsExtension> RmlsExtensionsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<RmlExtensionColorShadesTest>> RmlExtensionColorShadesTestsChanged;
 
+        public event EventHandler<Machine> MachineChanged;
+
         protected String _rmlsextensionsguid;
 
         /// <summary>
@@ -85,38 +85,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Machine _machine;
-
-        /// <summary>
-        /// Gets or sets the rmlextensioncolorshadebase machine.
-        /// </summary>
-
-        [XmlIgnore]
-        [JsonIgnore]
-        public virtual Machine Machine
-        {
-            get 
-            {
-                return _machine; 
-            }
-
-            set 
-            {
-                if (_machine != value)
-                {
-                    _machine = value;
-
-                    if (Machine != null)
-                    {
-                        MachineGuid = Machine.Guid;
-                    }
-
-                    OnMachineChanged(value);
-
-                }
-            }
-        }
-
         protected RmlsExtension _rmlsextensions;
 
         /// <summary>
@@ -174,13 +142,36 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Machine _machine;
+
         /// <summary>
-        /// Called when the Machine has changed.
+        /// Gets or sets the rmlextensioncolorshadebase machine.
         /// </summary>
-        protected virtual void OnMachineChanged(Machine machine)
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual Machine Machine
         {
-            MachineChanged?.Invoke(this, machine);
-            RaisePropertyChanged(nameof(Machine));
+            get 
+            {
+                return _machine; 
+            }
+
+            set 
+            {
+                if (_machine != value)
+                {
+                    _machine = value;
+
+                    if (Machine != null)
+                    {
+                        MachineGuid = Machine.Guid;
+                    }
+
+                    OnMachineChanged(value);
+
+                }
+            }
         }
 
         /// <summary>
@@ -202,6 +193,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the Machine has changed.
+        /// </summary>
+        protected virtual void OnMachineChanged(Machine machine)
+        {
+            MachineChanged?.Invoke(this, machine);
+            RaisePropertyChanged(nameof(Machine));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="RmlExtensionColorShadeBase" /> class.
         /// </summary>
         public RmlExtensionColorShadeBase() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
index c53b14327..22844741c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
@@ -87,12 +87,18 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Nullable<Double>> ThreadLubChanged;
 
+        public event EventHandler<Double> BtsrTensionErrorChanged;
+
         public event EventHandler<RmlsExtension> RmlsExtensionsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<TensileResult>> TensileResultsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestResultsFile>> RmlExtensionTestResultsFilesChanged;
 
+        public event EventHandler<BtsrApplicationType> BtsrApplicationTypeChanged;
+
+        public event EventHandler<BtsrYarnType> BtsrYarnTypeChanged;
+
         public event EventHandler<Machine> MachineChanged;
 
         public event EventHandler<SynchronizedObservableCollection<RmlExtensionTestWashingResult>> RmlExtensionTestWashingResultsChanged;
@@ -961,6 +967,85 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _btsrapplicationtypeguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultbase btsr application type guid.
+        /// </summary>
+
+        [Column("BTSR_APPLICATION_TYPE_GUID")]
+        [ForeignKey("BtsrApplicationType")]
+
+        public  String BtsrApplicationTypeGuid
+        {
+            get 
+            {
+                return _btsrapplicationtypeguid; 
+            }
+
+            set 
+            {
+                if (_btsrapplicationtypeguid != value)
+                {
+                    _btsrapplicationtypeguid = value;
+
+                }
+            }
+        }
+
+        protected String _btsryarntypeguid;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultbase btsr yarn type guid.
+        /// </summary>
+
+        [Column("BTSR_YARN_TYPE_GUID")]
+        [ForeignKey("BtsrYarnType")]
+
+        public  String BtsrYarnTypeGuid
+        {
+            get 
+            {
+                return _btsryarntypeguid; 
+            }
+
+            set 
+            {
+                if (_btsryarntypeguid != value)
+                {
+                    _btsryarntypeguid = value;
+
+                }
+            }
+        }
+
+        protected Double _btsrtensionerror;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultbase btsr tension error.
+        /// </summary>
+
+        [Column("BTSR_TENSION_ERROR")]
+
+        public  Double BtsrTensionError
+        {
+            get 
+            {
+                return _btsrtensionerror; 
+            }
+
+            set 
+            {
+                if (_btsrtensionerror != value)
+                {
+                    _btsrtensionerror = value;
+
+                    OnBtsrTensionErrorChanged(value);
+
+                }
+            }
+        }
+
         protected RmlsExtension _rmlsextensions;
 
         /// <summary>
@@ -1043,6 +1128,70 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected BtsrApplicationType _btsrapplicationtype;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultbase btsr application types.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual BtsrApplicationType BtsrApplicationType
+        {
+            get 
+            {
+                return _btsrapplicationtype; 
+            }
+
+            set 
+            {
+                if (_btsrapplicationtype != value)
+                {
+                    _btsrapplicationtype = value;
+
+                    if (BtsrApplicationType != null)
+                    {
+                        BtsrApplicationTypeGuid = BtsrApplicationType.Guid;
+                    }
+
+                    OnBtsrApplicationTypeChanged(value);
+
+                }
+            }
+        }
+
+        protected BtsrYarnType _btsryarntype;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultbase btsr yarn types.
+        /// </summary>
+
+        [XmlIgnore]
+        [JsonIgnore]
+        public virtual BtsrYarnType BtsrYarnType
+        {
+            get 
+            {
+                return _btsryarntype; 
+            }
+
+            set 
+            {
+                if (_btsryarntype != value)
+                {
+                    _btsryarntype = value;
+
+                    if (BtsrYarnType != null)
+                    {
+                        BtsrYarnTypeGuid = BtsrYarnType.Guid;
+                    }
+
+                    OnBtsrYarnTypeChanged(value);
+
+                }
+            }
+        }
+
         protected Machine _machine;
 
         /// <summary>
@@ -1396,6 +1545,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the BtsrTensionError has changed.
+        /// </summary>
+        protected virtual void OnBtsrTensionErrorChanged(Double btsrtensionerror)
+        {
+            BtsrTensionErrorChanged?.Invoke(this, btsrtensionerror);
+            RaisePropertyChanged(nameof(BtsrTensionError));
+        }
+
+        /// <summary>
         /// Called when the RmlsExtensions has changed.
         /// </summary>
         protected virtual void OnRmlsExtensionsChanged(RmlsExtension rmlsextensions)
@@ -1423,6 +1581,24 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the BtsrApplicationType has changed.
+        /// </summary>
+        protected virtual void OnBtsrApplicationTypeChanged(BtsrApplicationType btsrapplicationtype)
+        {
+            BtsrApplicationTypeChanged?.Invoke(this, btsrapplicationtype);
+            RaisePropertyChanged(nameof(BtsrApplicationType));
+        }
+
+        /// <summary>
+        /// Called when the BtsrYarnType has changed.
+        /// </summary>
+        protected virtual void OnBtsrYarnTypeChanged(BtsrYarnType btsryarntype)
+        {
+            BtsrYarnTypeChanged?.Invoke(this, btsryarntype);
+            RaisePropertyChanged(nameof(BtsrYarnType));
+        }
+
+        /// <summary>
         /// Called when the Machine has changed.
         /// </summary>
         protected virtual void OnMachineChanged(Machine machine)
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 259b2ce6b..ea2315046 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -116,6 +116,7 @@
     <Compile Include="Builders\JobBuilder.cs" />
     <Compile Include="Builders\JobRunsCollectionBuilder.cs" />
     <Compile Include="Builders\CatalogsCollectionBuilder.cs" />
+    <Compile Include="Builders\MachinesCollectionBuilder.cs" />
     <Compile Include="Builders\RMLExtensionColorCalibrationBuilder.cs" />
     <Compile Include="Builders\RMLExtensionColorShadeBuilder.cs" />
     <Compile Include="Builders\RmlExtensionsBuilder.cs" />
@@ -820,7 +821,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs
index a4ebc4b0f..523980e37 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs
@@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public BTSR_APPLICATION_TYPES()
         {
+            this.RML_EXTENSION_TEST_RESULTS = new HashSet<RML_EXTENSION_TEST_RESULTS>();
             this.RMLS = new HashSet<RML>();
         }
     
@@ -28,6 +29,8 @@ namespace Tango.DAL.Remote.DB
         public string DESCRIPTION { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_TEST_RESULTS> RML_EXTENSION_TEST_RESULTS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RML> RMLS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs
index 256af7baf..ef09f7498 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs
@@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public BTSR_YARN_TYPES()
         {
+            this.RML_EXTENSION_TEST_RESULTS = new HashSet<RML_EXTENSION_TEST_RESULTS>();
             this.RMLS = new HashSet<RML>();
         }
     
@@ -28,6 +29,8 @@ namespace Tango.DAL.Remote.DB
         public string DESCRIPTION { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RML_EXTENSION_TEST_RESULTS> RML_EXTENSION_TEST_RESULTS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RML> RMLS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs
index 7f25d41a2..1a1416100 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_CALIBRATIONS.cs
@@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB
         public string RMLS_EXTENSIONS_GUID { get; set; }
         public string MACHINE_GUID { get; set; }
     
-        public virtual MACHINE MACHINE { get; set; }
         public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RML_EXTENSION_COLOR_CALIBRATIONS_TESTS> RML_EXTENSION_COLOR_CALIBRATIONS_TESTS { get; set; }
+        public virtual MACHINE MACHINE { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs
index 55614d7a4..cca943272 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_COLOR_SHADES.cs
@@ -26,9 +26,9 @@ namespace Tango.DAL.Remote.DB
         public string RMLS_EXTENSIONS_GUID { get; set; }
         public string MACHINE_GUID { get; set; }
     
-        public virtual MACHINE MACHINE { get; set; }
         public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RML_EXTENSION_COLOR_SHADES_TESTS> RML_EXTENSION_COLOR_SHADES_TESTS { get; set; }
+        public virtual MACHINE MACHINE { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs
index e0543a58c..e4bf0b029 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML_EXTENSION_TEST_RESULTS.cs
@@ -58,12 +58,17 @@ namespace Tango.DAL.Remote.DB
         public string THREAD_LUB_VERSION { get; set; }
         public Nullable<double> THREAD_COF { get; set; }
         public Nullable<double> THREAD_LUB { get; set; }
+        public string BTSR_APPLICATION_TYPE_GUID { get; set; }
+        public string BTSR_YARN_TYPE_GUID { get; set; }
+        public double BTSR_TENSION_ERROR { get; set; }
     
         public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<TENSILE_RESULTS> TENSILE_RESULTS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RML_EXTENSION_TEST_RESULTS_FILES> RML_EXTENSION_TEST_RESULTS_FILES { get; set; }
+        public virtual BTSR_APPLICATION_TYPES BTSR_APPLICATION_TYPES { get; set; }
+        public virtual BTSR_YARN_TYPES BTSR_YARN_TYPES { get; set; }
         public virtual MACHINE MACHINE { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RML_EXTENSION_TEST_WASHING_RESULTS> RML_EXTENSION_TEST_WASHING_RESULTS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index eae61d93a..7f06dbc14 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1218,6 +1218,9 @@
           <Property Name="THREAD_LUB_VERSION" Type="nvarchar" MaxLength="50" />
           <Property Name="THREAD_COF" Type="float" />
           <Property Name="THREAD_LUB" Type="float" />
+          <Property Name="BTSR_APPLICATION_TYPE_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="BTSR_YARN_TYPE_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="BTSR_TENSION_ERROR" Type="float" Nullable="false" />
         </EntityType>
         <EntityType Name="RML_EXTENSION_TEST_RESULTS_FILES">
           <Key>
@@ -2821,6 +2824,30 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_TEST_RESULTS_BTSR_APPLICATION_TYPES">
+          <End Role="BTSR_APPLICATION_TYPES" Type="Self.BTSR_APPLICATION_TYPES" Multiplicity="0..1" />
+          <End Role="RML_EXTENSION_TEST_RESULTS" Type="Self.RML_EXTENSION_TEST_RESULTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="BTSR_APPLICATION_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_TEST_RESULTS">
+              <PropertyRef Name="BTSR_APPLICATION_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_RML_EXTENSION_TEST_RESULTS_BTSR_YARN_TYPES">
+          <End Role="BTSR_YARN_TYPES" Type="Self.BTSR_YARN_TYPES" Multiplicity="0..1" />
+          <End Role="RML_EXTENSION_TEST_RESULTS" Type="Self.RML_EXTENSION_TEST_RESULTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="BTSR_YARN_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_TEST_RESULTS">
+              <PropertyRef Name="BTSR_YARN_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS">
           <End Role="RML_EXTENSION_TEST_RESULTS" Type="Self.RML_EXTENSION_TEST_RESULTS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -3902,6 +3929,14 @@
             <End Role="RML_EXTENSION_COLOR_SHADES" EntitySet="RML_EXTENSION_COLOR_SHADES" />
             <End Role="RML_EXTENSION_COLOR_SHADES_TESTS" EntitySet="RML_EXTENSION_COLOR_SHADES_TESTS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_BTSR_APPLICATION_TYPES" Association="Self.FK_RML_EXTENSION_TEST_RESULTS_BTSR_APPLICATION_TYPES">
+            <End Role="BTSR_APPLICATION_TYPES" EntitySet="BTSR_APPLICATION_TYPES" />
+            <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_BTSR_YARN_TYPES" Association="Self.FK_RML_EXTENSION_TEST_RESULTS_BTSR_YARN_TYPES">
+            <End Role="BTSR_YARN_TYPES" EntitySet="BTSR_YARN_TYPES" />
+            <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" Association="Self.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS">
             <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
             <End Role="RML_EXTENSION_TEST_RESULTS_FILES" EntitySet="RML_EXTENSION_TEST_RESULTS_FILES" />
@@ -4360,10 +4395,18 @@
             <End Role="SEGMENT" EntitySet="SEGMENTS" />
             <End Role="BRUSH_STOPS" EntitySet="BRUSH_STOPS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_BTSR_APPLICATION_TYPES" Association="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_BTSR_APPLICATION_TYPES">
+            <End Role="BTSR_APPLICATION_TYPES" EntitySet="BTSR_APPLICATION_TYPES" />
+            <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RMLS_BTSR_APPLICATION_TYPES" Association="RemoteModel.FK_RMLS_BTSR_APPLICATION_TYPES">
             <End Role="BTSR_APPLICATION_TYPES" EntitySet="BTSR_APPLICATION_TYPES" />
             <End Role="RML" EntitySet="RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RML_EXTENSION_TEST_RESULTS_BTSR_YARN_TYPES" Association="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_BTSR_YARN_TYPES">
+            <End Role="BTSR_YARN_TYPES" EntitySet="BTSR_YARN_TYPES" />
+            <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RMLS_BTSR_YARN_TYPES" Association="RemoteModel.FK_RMLS_BTSR_YARN_TYPES">
             <End Role="BTSR_YARN_TYPES" EntitySet="BTSR_YARN_TYPES" />
             <End Role="RML" EntitySet="RMLS" />
@@ -4840,6 +4883,11 @@
           <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_RMLS_EXTENSIONS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RMLS_EXTENSIONS" />
           <NavigationProperty Name="TENSILE_RESULTS" Relationship="RemoteModel.FK_TENSILE_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="TENSILE_RESULTS" />
           <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS_FILES" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_FILES_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RML_EXTENSION_TEST_RESULTS_FILES" />
+          <Property Name="BTSR_APPLICATION_TYPE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="BTSR_YARN_TYPE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="BTSR_TENSION_ERROR" Type="Double" Nullable="false" />
+          <NavigationProperty Name="BTSR_APPLICATION_TYPES" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_BTSR_APPLICATION_TYPES" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="BTSR_APPLICATION_TYPES" />
+          <NavigationProperty Name="BTSR_YARN_TYPES" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_BTSR_YARN_TYPES" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="BTSR_YARN_TYPES" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_MACHINES" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="MACHINE" />
           <NavigationProperty Name="RML_EXTENSION_TEST_WASHING_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_WASHING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RML_EXTENSION_TEST_WASHING_RESULTS" />
           <NavigationProperty Name="RUBBING_RESULTS" Relationship="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RUBBING_RESULTS" />
@@ -5579,6 +5627,7 @@
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_BTSR_APPLICATION_TYPES" FromRole="BTSR_APPLICATION_TYPES" ToRole="RML_EXTENSION_TEST_RESULTS" />
           <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RMLS_BTSR_APPLICATION_TYPES" FromRole="BTSR_APPLICATION_TYPES" ToRole="RML" />
         </EntityType>
         <EntityType Name="BTSR_YARN_TYPES">
@@ -5591,6 +5640,7 @@
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_BTSR_YARN_TYPES" FromRole="BTSR_YARN_TYPES" ToRole="RML_EXTENSION_TEST_RESULTS" />
           <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RMLS_BTSR_YARN_TYPES" FromRole="BTSR_YARN_TYPES" ToRole="RML" />
         </EntityType>
         <EntityType Name="CARTRIDGE_TYPES">
@@ -7203,6 +7253,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_TEST_RESULTS_BTSR_APPLICATION_TYPES">
+          <End Type="RemoteModel.BTSR_APPLICATION_TYPES" Role="BTSR_APPLICATION_TYPES" Multiplicity="0..1" />
+          <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="BTSR_APPLICATION_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_TEST_RESULTS">
+              <PropertyRef Name="BTSR_APPLICATION_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RMLS_BTSR_APPLICATION_TYPES">
           <End Type="RemoteModel.BTSR_APPLICATION_TYPES" Role="BTSR_APPLICATION_TYPES" Multiplicity="0..1" />
           <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" />
@@ -7215,6 +7277,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RML_EXTENSION_TEST_RESULTS_BTSR_YARN_TYPES">
+          <End Type="RemoteModel.BTSR_YARN_TYPES" Role="BTSR_YARN_TYPES" Multiplicity="0..1" />
+          <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="BTSR_YARN_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RML_EXTENSION_TEST_RESULTS">
+              <PropertyRef Name="BTSR_YARN_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RMLS_BTSR_YARN_TYPES">
           <End Type="RemoteModel.BTSR_YARN_TYPES" Role="BTSR_YARN_TYPES" Multiplicity="0..1" />
           <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" />
@@ -8524,6 +8598,9 @@
           <EntitySetMapping Name="RML_EXTENSION_TEST_RESULTS">
             <EntityTypeMapping TypeName="RemoteModel.RML_EXTENSION_TEST_RESULTS">
               <MappingFragment StoreEntitySet="RML_EXTENSION_TEST_RESULTS">
+                <ScalarProperty Name="BTSR_TENSION_ERROR" ColumnName="BTSR_TENSION_ERROR" />
+                <ScalarProperty Name="BTSR_YARN_TYPE_GUID" ColumnName="BTSR_YARN_TYPE_GUID" />
+                <ScalarProperty Name="BTSR_APPLICATION_TYPE_GUID" ColumnName="BTSR_APPLICATION_TYPE_GUID" />
                 <ScalarProperty Name="THREAD_LUB" ColumnName="THREAD_LUB" />
                 <ScalarProperty Name="THREAD_COF" ColumnName="THREAD_COF" />
                 <ScalarProperty Name="THREAD_LUB_VERSION" ColumnName="THREAD_LUB_VERSION" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index f5a974c53..ea228f323 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,100 +5,100 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="86">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="28" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="5.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="60.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="63.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="57.25" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="16.875" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="36.25" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="27.125" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="35.25" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="24.5" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="46.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="39.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="5.75" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="62.75" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="11.25" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="73.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="4.5" PointY="83.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6.75" PointY="83.25" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="66" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="42" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="31.75" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.5" PointY="77.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="11.75" PointY="69.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="57.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="11.75" PointY="65.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="78.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="77.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="14.5" PointY="77.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="16.75" PointY="73.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.5" PointY="61.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="14.75" PointY="65.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="11.5" PointY="81.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="13.75" PointY="73.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="69" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="73.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="69.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6.75" PointY="42.5" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="9" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="33.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="10.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="40.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="73.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="48.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="10.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="30.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="16.25" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6.75" PointY="32" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="3.375" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="57.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="47.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.5" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="11.75" PointY="11" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="14" PointY="11.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="14" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.875" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="44.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="44.75" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="16.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="25.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="16.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="2.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="35.375" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="12.25" PointY="53.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="16.75" PointY="13.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="18.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="28.5" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="11.75" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="8" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="64.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="68.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="79.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="82.75" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="2.75" PointY="8.5" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="37" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="45.25" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="11" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="100" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="94.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="93.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="21.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="2.75" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="28.375" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="74.375" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="60.875" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="25.25" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="60.875" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="105.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="105" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="85.625" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="40.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="25.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="29.25" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="8.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="7.5" PointY="99.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="9.75" PointY="88.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="110.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="84.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.5" PointY="103.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9.75" PointY="93" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="82" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="78.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="81.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="87.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="114.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="88.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="88.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.5" PointY="76.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="5.75" PointY="94.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="34.375" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="38.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="14.25" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="3.25" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="16.75" PointY="10.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="56.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="48.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="33.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="33.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="28.125" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="42.875" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.25" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.25" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="5.875" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="8" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.625" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="16.75" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="29.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="65.25" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="21.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="11.5" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="8.25" PointY="35.75" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="18.75" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="4.5" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="33.125" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="18.75" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="20.75" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="4.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="14.5" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="5.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="31.875" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />