Disabled job uploads from PPC to cloud.

Added Denier linear mass density unit.

16 files changed, 396 insertions, 325 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
index b4513b595..61a9f720d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
@@ -152,19 +152,20 @@ namespace Tango.PPC.Common.Synchronization
 
             using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                if (syncJobs)
-                {
-                    LogManager.Log("Checking Jobs...");
+                //Ommited because of JOBS V2
+                //if (syncJobs)
+                //{
+                //    LogManager.Log("Checking Jobs...");
 
-                    var jobs = await new JobsCollectionBuilder(db).Set(x => !x.IsSynchronized).WithSegments().WithBrushStops().Query(x => x.Take(MaxJobs).OrderByDescending(z => z.LastUpdated)).BuildListAsync();
-                    List<JobDTO> dtos = new List<JobDTO>();
+                //    var jobs = await new JobsCollectionBuilder(db).Set(x => !x.IsSynchronized).WithSegments().WithBrushStops().Query(x => x.Take(MaxJobs).OrderByDescending(z => z.LastUpdated)).BuildListAsync();
+                //    List<JobDTO> dtos = new List<JobDTO>();
 
-                    foreach (var job in jobs)
-                    {
-                        var dto = JobDTO.FromObservable(job);
-                        request.Jobs.Add(dto);
-                    }
-                }
+                //    foreach (var job in jobs)
+                //    {
+                //        var dto = JobDTO.FromObservable(job);
+                //        request.Jobs.Add(dto);
+                //    }
+                //}
 
                 if (syncDiagnostics)
                 {
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RubbingResultDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RubbingResultDTOBase.cs
index fd33dcfd7..ce8523ded 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RubbingResultDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RubbingResultDTOBase.cs
@@ -46,17 +46,17 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
-        /// deltae cie 200
+        /// gs 100
         /// </summary>
-        public Nullable<Double> DeltaeCie200 
+        public Nullable<Double> Gs100 
         {
             get; set; 
         }
 
         /// <summary>
-        /// gs 100
+        /// deltae cie 200
         /// </summary>
-        public Nullable<Double> Gs100 
+        public Nullable<Double> DeltaeCie200 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
index 1d37d8199..561b311d7 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlExtensionTestResultBase.cs
@@ -89,12 +89,12 @@ namespace Tango.BL.Entities
 
         public event EventHandler<RmlsExtension> RmlsExtensionsChanged;
 
-        public event EventHandler<SynchronizedObservableCollection<RubbingResult>> RubbingResultsChanged;
-
         public event EventHandler<SynchronizedObservableCollection<TensileResult>> TensileResultsChanged;
 
         public event EventHandler<Machine> MachineChanged;
 
+        public event EventHandler<SynchronizedObservableCollection<RubbingResult>> RubbingResultsChanged;
+
         protected String _rmlsextensionsguid;
 
         /// <summary>
@@ -989,31 +989,6 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected SynchronizedObservableCollection<RubbingResult> _rubbingresults;
-
-        /// <summary>
-        /// Gets or sets the rmlextensiontestresultbase rubbing results.
-        /// </summary>
-
-        public virtual SynchronizedObservableCollection<RubbingResult> RubbingResults
-        {
-            get 
-            {
-                return _rubbingresults; 
-            }
-
-            set 
-            {
-                if (_rubbingresults != value)
-                {
-                    _rubbingresults = value;
-
-                    OnRubbingResultsChanged(value);
-
-                }
-            }
-        }
-
         protected SynchronizedObservableCollection<TensileResult> _tensileresults;
 
         /// <summary>
@@ -1071,6 +1046,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected SynchronizedObservableCollection<RubbingResult> _rubbingresults;
+
+        /// <summary>
+        /// Gets or sets the rmlextensiontestresultbase rubbing results.
+        /// </summary>
+
+        public virtual SynchronizedObservableCollection<RubbingResult> RubbingResults
+        {
+            get 
+            {
+                return _rubbingresults; 
+            }
+
+            set 
+            {
+                if (_rubbingresults != value)
+                {
+                    _rubbingresults = value;
+
+                    OnRubbingResultsChanged(value);
+
+                }
+            }
+        }
+
         /// <summary>
         /// Called when the ResultIndex has changed.
         /// </summary>
@@ -1351,15 +1351,6 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the RubbingResults has changed.
-        /// </summary>
-        protected virtual void OnRubbingResultsChanged(SynchronizedObservableCollection<RubbingResult> rubbingresults)
-        {
-            RubbingResultsChanged?.Invoke(this, rubbingresults);
-            RaisePropertyChanged(nameof(RubbingResults));
-        }
-
-        /// <summary>
         /// Called when the TensileResults has changed.
         /// </summary>
         protected virtual void OnTensileResultsChanged(SynchronizedObservableCollection<TensileResult> tensileresults)
@@ -1378,15 +1369,24 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the RubbingResults has changed.
+        /// </summary>
+        protected virtual void OnRubbingResultsChanged(SynchronizedObservableCollection<RubbingResult> rubbingresults)
+        {
+            RubbingResultsChanged?.Invoke(this, rubbingresults);
+            RaisePropertyChanged(nameof(RubbingResults));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="RmlExtensionTestResultBase" /> class.
         /// </summary>
         public RmlExtensionTestResultBase() : base()
         {
 
-            RubbingResults = new SynchronizedObservableCollection<RubbingResult>();
-
             TensileResults = new SynchronizedObservableCollection<TensileResult>();
 
+            RubbingResults = new SynchronizedObservableCollection<RubbingResult>();
+
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RubbingResultBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RubbingResultBase.cs
index d426718f9..988defa87 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RubbingResultBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RubbingResultBase.cs
@@ -31,10 +31,10 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Nullable<Double>> DeltaeCie100Changed;
 
-        public event EventHandler<Nullable<Double>> DeltaeCie200Changed;
-
         public event EventHandler<Nullable<Double>> Gs100Changed;
 
+        public event EventHandler<Nullable<Double>> DeltaeCie200Changed;
+
         public event EventHandler<Nullable<Double>> Gs200Changed;
 
         public event EventHandler<RmlExtensionTestResult> RmlExtensionTestResultsChanged;
@@ -119,55 +119,55 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected Nullable<Double> _deltaecie200;
+        protected Nullable<Double> _gs100;
 
         /// <summary>
-        /// Gets or sets the rubbingresultbase deltae cie 200.
+        /// Gets or sets the rubbingresultbase gs 100.
         /// </summary>
 
-        [Column("DELTAE_CIE_200")]
+        [Column("GS_100")]
 
-        public  Nullable<Double> DeltaeCie200
+        public  Nullable<Double> Gs100
         {
             get 
             {
-                return _deltaecie200; 
+                return _gs100; 
             }
 
             set 
             {
-                if (_deltaecie200 != value)
+                if (_gs100 != value)
                 {
-                    _deltaecie200 = value;
+                    _gs100 = value;
 
-                    OnDeltaeCie200Changed(value);
+                    OnGs100Changed(value);
 
                 }
             }
         }
 
-        protected Nullable<Double> _gs100;
+        protected Nullable<Double> _deltaecie200;
 
         /// <summary>
-        /// Gets or sets the rubbingresultbase gs 100.
+        /// Gets or sets the rubbingresultbase deltae cie 200.
         /// </summary>
 
-        [Column("GS_100")]
+        [Column("DELTAE_CIE_200")]
 
-        public  Nullable<Double> Gs100
+        public  Nullable<Double> DeltaeCie200
         {
             get 
             {
-                return _gs100; 
+                return _deltaecie200; 
             }
 
             set 
             {
-                if (_gs100 != value)
+                if (_deltaecie200 != value)
                 {
-                    _gs100 = value;
+                    _deltaecie200 = value;
 
-                    OnGs100Changed(value);
+                    OnDeltaeCie200Changed(value);
 
                 }
             }
@@ -251,21 +251,21 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Called when the DeltaeCie200 has changed.
+        /// Called when the Gs100 has changed.
         /// </summary>
-        protected virtual void OnDeltaeCie200Changed(Nullable<Double> deltaecie200)
+        protected virtual void OnGs100Changed(Nullable<Double> gs100)
         {
-            DeltaeCie200Changed?.Invoke(this, deltaecie200);
-            RaisePropertyChanged(nameof(DeltaeCie200));
+            Gs100Changed?.Invoke(this, gs100);
+            RaisePropertyChanged(nameof(Gs100));
         }
 
         /// <summary>
-        /// Called when the Gs100 has changed.
+        /// Called when the DeltaeCie200 has changed.
         /// </summary>
-        protected virtual void OnGs100Changed(Nullable<Double> gs100)
+        protected virtual void OnDeltaeCie200Changed(Nullable<Double> deltaecie200)
         {
-            Gs100Changed?.Invoke(this, gs100);
-            RaisePropertyChanged(nameof(Gs100));
+            DeltaeCie200Changed?.Invoke(this, deltaecie200);
+            RaisePropertyChanged(nameof(DeltaeCie200));
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
index 63970e879..d254475d9 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/ColorSpaces.cs
@@ -49,11 +49,5 @@ namespace Tango.BL.Enumerations
         [Description("Catalog")]
         Catalog = 4,
 
-        /// <summary>
-        /// (HSB)
-        /// </summary>
-        [Description("HSB")]
-        HSB = 5,
-
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/LinearMassDensityUnits.cs b/Software/Visual_Studio/Tango.BL/Enumerations/LinearMassDensityUnits.cs
index 1a2478a9d..b9d1f29bb 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/LinearMassDensityUnits.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/LinearMassDensityUnits.cs
@@ -38,6 +38,12 @@ namespace Tango.BL.Enumerations
         Ne = 3,
 
         /// <summary>
+        /// (Denier)
+        /// </summary>
+        [Description("Denier")]
+        Denier = 5,
+
+        /// <summary>
         /// (Tex)
         /// </summary>
         [Description("Tex")]
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/MediaMaterials.cs b/Software/Visual_Studio/Tango.BL/Enumerations/MediaMaterials.cs
index c16bdc8ab..f22f0dad8 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/MediaMaterials.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/MediaMaterials.cs
@@ -71,7 +71,7 @@ namespace Tango.BL.Enumerations
         /// (PA 6.6)
         /// </summary>
         [Description("PA 6.6")]
-        PA_66 = 3,
+        PA_6_6 = 3,
 
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index e7e0fe0fb..a799d7860 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -71,14 +71,6 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the RubbingResults.
-        /// </summary>
-        public DbSet<RubbingResult> RubbingResults 
-        {
-            get; set; 
-        }
-
-        /// <summary>
         /// Gets or sets the TensileResults.
         /// </summary>
         public DbSet<TensileResult> TensileResults 
@@ -743,6 +735,14 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the RubbingResults.
+        /// </summary>
+        public DbSet<RubbingResult> RubbingResults 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the Segments.
         /// </summary>
         public DbSet<Segment> Segments 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index 4fc0d9936..c15da9c18 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -233,42 +233,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<RubbingResult> _rubbingresults;
-        /// <summary>
-        /// Gets or sets the RubbingResults.
-        /// </summary>
-        public ObservableCollection<RubbingResult> RubbingResults
-        {
-            get 
-            {
-                return _rubbingresults; 
-            }
-
-            set 
-            {
-                _rubbingresults = value; RaisePropertyChanged(nameof(RubbingResults)); 
-            }
-
-        }
-
-        private ICollectionView _rubbingresultsViewSource;
-        /// <summary>
-        /// Gets or sets the RubbingResults View Source.
-        ///</summary>
-        public ICollectionView RubbingResultsViewSource
-        {
-            get 
-            {
-                return _rubbingresultsViewSource; 
-            }
-
-            set 
-            {
-                _rubbingresultsViewSource = value; RaisePropertyChanged(nameof(RubbingResultsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<TensileResult> _tensileresults;
         /// <summary>
         /// Gets or sets the TensileResults.
@@ -3257,6 +3221,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<RubbingResult> _rubbingresults;
+        /// <summary>
+        /// Gets or sets the RubbingResults.
+        /// </summary>
+        public ObservableCollection<RubbingResult> RubbingResults
+        {
+            get 
+            {
+                return _rubbingresults; 
+            }
+
+            set 
+            {
+                _rubbingresults = value; RaisePropertyChanged(nameof(RubbingResults)); 
+            }
+
+        }
+
+        private ICollectionView _rubbingresultsViewSource;
+        /// <summary>
+        /// Gets or sets the RubbingResults View Source.
+        ///</summary>
+        public ICollectionView RubbingResultsViewSource
+        {
+            get 
+            {
+                return _rubbingresultsViewSource; 
+            }
+
+            set 
+            {
+                _rubbingresultsViewSource = value; RaisePropertyChanged(nameof(RubbingResultsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Segment> _segments;
         /// <summary>
         /// Gets or sets the Segments.
@@ -3959,8 +3959,6 @@ namespace Tango.BL
 
             RmlsExtensionsViewSource = CreateCollectionView(RmlsExtensions);
 
-            RubbingResultsViewSource = CreateCollectionView(RubbingResults);
-
             TensileResultsViewSource = CreateCollectionView(TensileResults);
 
             YarnApplicationsViewSource = CreateCollectionView(YarnApplications);
@@ -4127,6 +4125,8 @@ namespace Tango.BL
 
             RolesPermissionsViewSource = CreateCollectionView(RolesPermissions);
 
+            RubbingResultsViewSource = CreateCollectionView(RubbingResults);
+
             SegmentsViewSource = CreateCollectionView(Segments);
 
             SitesViewSource = CreateCollectionView(Sites);
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index 8ac2ea506..8cf9ef0f2 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -233,42 +233,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<RubbingResult> _rubbingresults;
-        /// <summary>
-        /// Gets or sets the RubbingResults.
-        /// </summary>
-        public ObservableCollection<RubbingResult> RubbingResults
-        {
-            get 
-            {
-                return _rubbingresults; 
-            }
-
-            set 
-            {
-                _rubbingresults = value; RaisePropertyChanged(nameof(RubbingResults)); 
-            }
-
-        }
-
-        private ICollectionView _rubbingresultsViewSource;
-        /// <summary>
-        /// Gets or sets the RubbingResults View Source.
-        ///</summary>
-        public ICollectionView RubbingResultsViewSource
-        {
-            get 
-            {
-                return _rubbingresultsViewSource; 
-            }
-
-            set 
-            {
-                _rubbingresultsViewSource = value; RaisePropertyChanged(nameof(RubbingResultsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<TensileResult> _tensileresults;
         /// <summary>
         /// Gets or sets the TensileResults.
@@ -3257,6 +3221,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<RubbingResult> _rubbingresults;
+        /// <summary>
+        /// Gets or sets the RubbingResults.
+        /// </summary>
+        public ObservableCollection<RubbingResult> RubbingResults
+        {
+            get 
+            {
+                return _rubbingresults; 
+            }
+
+            set 
+            {
+                _rubbingresults = value; RaisePropertyChanged(nameof(RubbingResults)); 
+            }
+
+        }
+
+        private ICollectionView _rubbingresultsViewSource;
+        /// <summary>
+        /// Gets or sets the RubbingResults View Source.
+        ///</summary>
+        public ICollectionView RubbingResultsViewSource
+        {
+            get 
+            {
+                return _rubbingresultsViewSource; 
+            }
+
+            set 
+            {
+                _rubbingresultsViewSource = value; RaisePropertyChanged(nameof(RubbingResultsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Segment> _segments;
         /// <summary>
         /// Gets or sets the Segments.
@@ -3959,8 +3959,6 @@ namespace Tango.BL
 
             RmlsExtensionsViewSource = CreateCollectionView(RmlsExtensions);
 
-            RubbingResultsViewSource = CreateCollectionView(RubbingResults);
-
             TensileResultsViewSource = CreateCollectionView(TensileResults);
 
             YarnApplicationsViewSource = CreateCollectionView(YarnApplications);
@@ -4127,6 +4125,8 @@ namespace Tango.BL
 
             RolesPermissionsViewSource = CreateCollectionView(RolesPermissions);
 
+            RubbingResultsViewSource = CreateCollectionView(RubbingResults);
+
             SegmentsViewSource = CreateCollectionView(Segments);
 
             SitesViewSource = CreateCollectionView(Sites);
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 9f38a5e7c..b1a5ae94f 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
@@ -17,8 +17,8 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public RML_EXTENSION_TEST_RESULTS()
         {
-            this.RUBBING_RESULTS = new HashSet<RUBBING_RESULTS>();
             this.TENSILE_RESULTS = new HashSet<TENSILE_RESULTS>();
+            this.RUBBING_RESULTS = new HashSet<RUBBING_RESULTS>();
         }
     
         public int ID { get; set; }
@@ -59,9 +59,9 @@ namespace Tango.DAL.Remote.DB
     
         public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<RUBBING_RESULTS> RUBBING_RESULTS { get; set; }
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<TENSILE_RESULTS> TENSILE_RESULTS { get; set; }
         public virtual MACHINE MACHINE { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RUBBING_RESULTS> RUBBING_RESULTS { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RUBBING_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RUBBING_RESULTS.cs
index 47e54fb92..9106c7c5e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RUBBING_RESULTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RUBBING_RESULTS.cs
@@ -20,8 +20,8 @@ namespace Tango.DAL.Remote.DB
         public string RML_EXTENSION_TEST_RESULTS_GUID { get; set; }
         public Nullable<int> COLOR { get; set; }
         public Nullable<double> DELTAE_CIE_100 { get; set; }
-        public Nullable<double> DELTAE_CIE_200 { get; set; }
         public Nullable<double> GS_100 { get; set; }
+        public Nullable<double> DELTAE_CIE_200 { get; set; }
         public Nullable<double> GS_200 { get; set; }
     
         public virtual RML_EXTENSION_TEST_RESULTS RML_EXTENSION_TEST_RESULTS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index 52f902524..0b51ddbda 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -31,7 +31,6 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<COLOR_PROCESS_PARAMETERS> COLOR_PROCESS_PARAMETERS { get; set; }
         public virtual DbSet<RML_EXTENSION_TEST_RESULTS> RML_EXTENSION_TEST_RESULTS { get; set; }
         public virtual DbSet<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
-        public virtual DbSet<RUBBING_RESULTS> RUBBING_RESULTS { get; set; }
         public virtual DbSet<TENSILE_RESULTS> TENSILE_RESULTS { get; set; }
         public virtual DbSet<YARN_APPLICATIONS> YARN_APPLICATIONS { get; set; }
         public virtual DbSet<YARN_BRANDS> YARN_BRANDS { get; set; }
@@ -115,6 +114,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
         public virtual DbSet<ROLE> ROLES { get; set; }
         public virtual DbSet<ROLES_PERMISSIONS> ROLES_PERMISSIONS { get; set; }
+        public virtual DbSet<RUBBING_RESULTS> RUBBING_RESULTS { get; set; }
         public virtual DbSet<SEGMENT> SEGMENTS { get; set; }
         public virtual DbSet<SITE> SITES { get; set; }
         public virtual DbSet<SITES_CATALOGS> SITES_CATALOGS { 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 57e9c8f7d..8e4a49e8f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -276,6 +276,17 @@
           <Property Name="B" Type="float" Nullable="false" />
           <Property Name="FACTOR_PERCENT" Type="int" Nullable="false" />
         </EntityType>
+        <EntityType Name="COLOR_PROCESS_INK_UPTAKE">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="COLOR_PROCESS_PARAMETERS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="INK_UPTAKE_ZONE" Type="int" Nullable="false" />
+          <Property Name="INK_VALUE" Type="int" />
+        </EntityType>
         <EntityType Name="COLOR_PROCESS_PARAMETERS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -954,7 +965,7 @@
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="CODE" Type="int" Nullable="false" />
-          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" />
+          <Property Name="DESCRIPTION" Type="varchar" MaxLength="50" />
         </EntityType>
         <EntityType Name="MEDIA_PURPOSES">
           <Key>
@@ -1261,11 +1272,9 @@
           <Property Name="RML_EXTENSION_TEST_RESULTS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="COLOR" Type="int" />
           <Property Name="DELTAE_CIE_100" Type="float" />
-          <Property Name="GS_100_MIN" Type="int" />
-          <Property Name="GS_100_MAX" Type="int" />
+          <Property Name="GS_100" Type="float" />
           <Property Name="DELTAE_CIE_200" Type="float" />
-          <Property Name="GS_200_MIN" Type="int" />
-          <Property Name="GS_200_MAX" Type="int" />
+          <Property Name="GS_200" Type="float" />
         </EntityType>
         <EntityType Name="SEGMENTS">
           <Key>
@@ -1833,6 +1842,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS">
+          <End Role="COLOR_PROCESS_PARAMETERS" Type="Self.COLOR_PROCESS_PARAMETERS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="COLOR_PROCESS_INK_UPTAKE" Type="Self.COLOR_PROCESS_INK_UPTAKE" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="COLOR_PROCESS_PARAMETERS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="COLOR_PROCESS_INK_UPTAKE">
+              <PropertyRef Name="COLOR_PROCESS_PARAMETERS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_COLOR_PROCESS_PARAMETERS_MACHINES">
           <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -3126,6 +3149,7 @@
           <EntitySet Name="COLOR_CATALOGS_ITEMS_RECIPES" EntityType="Self.COLOR_CATALOGS_ITEMS_RECIPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="COLOR_PROCESS_DATA" EntityType="Self.COLOR_PROCESS_DATA" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="COLOR_PROCESS_FACTORS" EntityType="Self.COLOR_PROCESS_FACTORS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="COLOR_PROCESS_INK_UPTAKE" EntityType="Self.COLOR_PROCESS_INK_UPTAKE" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="COLOR_PROCESS_PARAMETERS" EntityType="Self.COLOR_PROCESS_PARAMETERS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="COLOR_SPACES" EntityType="Self.COLOR_SPACES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
@@ -3272,6 +3296,10 @@
             <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
             <End Role="COLOR_PROCESS_FACTORS" EntitySet="COLOR_PROCESS_FACTORS" />
           </AssociationSet>
+          <AssociationSet Name="FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS" Association="Self.FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS">
+            <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
+            <End Role="COLOR_PROCESS_INK_UPTAKE" EntitySet="COLOR_PROCESS_INK_UPTAKE" />
+          </AssociationSet>
           <AssociationSet Name="FK_COLOR_PROCESS_PARAMETERS_MACHINES" Association="Self.FK_COLOR_PROCESS_PARAMETERS_MACHINES">
             <End Role="MACHINES" EntitySet="MACHINES" />
             <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
@@ -3676,7 +3704,6 @@
           <EntitySet Name="COLOR_PROCESS_PARAMETERS" EntityType="RemoteModel.COLOR_PROCESS_PARAMETERS" />
           <EntitySet Name="RML_EXTENSION_TEST_RESULTS" EntityType="RemoteModel.RML_EXTENSION_TEST_RESULTS" />
           <EntitySet Name="RMLS_EXTENSIONS" EntityType="RemoteModel.RMLS_EXTENSIONS" />
-          <EntitySet Name="RUBBING_RESULTS" EntityType="RemoteModel.RUBBING_RESULTS" />
           <EntitySet Name="TENSILE_RESULTS" EntityType="RemoteModel.TENSILE_RESULTS" />
           <EntitySet Name="YARN_APPLICATIONS" EntityType="RemoteModel.YARN_APPLICATIONS" />
           <EntitySet Name="YARN_BRANDS" EntityType="RemoteModel.YARN_BRANDS" />
@@ -3705,10 +3732,6 @@
             <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
             <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
           </AssociationSet>
-          <AssociationSet Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS">
-            <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
-            <End Role="RUBBING_RESULTS" EntitySet="RUBBING_RESULTS" />
-          </AssociationSet>
           <AssociationSet Name="FK_TENSILE_RESULTS_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_TENSILE_RESULTS_RML_EXTENSION_TEST_RESULTS">
             <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
             <End Role="TENSILE_RESULTS" EntitySet="TENSILE_RESULTS" />
@@ -3769,6 +3792,7 @@
           <EntitySet Name="COLOR_CATALOGS_GROUPS" EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" />
           <EntitySet Name="COLOR_CATALOGS_ITEMS" EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" />
           <EntitySet Name="COLOR_CATALOGS_ITEMS_RECIPES" EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" />
+          <EntitySet Name="COLOR_PROCESS_INK_UPTAKE" EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" />
           <EntitySet Name="COLOR_SPACES" EntityType="RemoteModel.COLOR_SPACES" />
           <EntitySet Name="CONFIGURATIONS" EntityType="RemoteModel.CONFIGURATION" />
           <EntitySet Name="CONTACTS" EntityType="RemoteModel.CONTACT" />
@@ -3823,6 +3847,7 @@
           <EntitySet Name="RMLS_SPOOLS" EntityType="RemoteModel.RMLS_SPOOLS" />
           <EntitySet Name="ROLES" EntityType="RemoteModel.ROLE" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="RemoteModel.ROLES_PERMISSIONS" />
+          <EntitySet Name="RUBBING_RESULTS" EntityType="RemoteModel.RUBBING_RESULTS" />
           <EntitySet Name="SEGMENTS" EntityType="RemoteModel.SEGMENT" />
           <EntitySet Name="SITES" EntityType="RemoteModel.SITE" />
           <EntitySet Name="SITES_CATALOGS" EntityType="RemoteModel.SITES_CATALOGS" />
@@ -3934,6 +3959,10 @@
             <End Role="RML" EntitySet="RMLS" />
             <End Role="COLOR_CATALOGS_ITEMS_RECIPES" EntitySet="COLOR_CATALOGS_ITEMS_RECIPES" />
           </AssociationSet>
+          <AssociationSet Name="FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS" Association="RemoteModel.FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS">
+            <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
+            <End Role="COLOR_PROCESS_INK_UPTAKE" EntitySet="COLOR_PROCESS_INK_UPTAKE" />
+          </AssociationSet>
           <AssociationSet Name="FK_COLOR_PROCESS_PARAMETERS_MACHINES" Association="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_MACHINES">
             <End Role="MACHINE" EntitySet="MACHINES" />
             <End Role="COLOR_PROCESS_PARAMETERS" EntitySet="COLOR_PROCESS_PARAMETERS" />
@@ -4174,6 +4203,10 @@
             <End Role="PUBLISHED_PROCEDURE_PROJECTS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS" />
             <End Role="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" EntitySet="PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" />
           </AssociationSet>
+          <AssociationSet Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" Association="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS">
+            <End Role="RML_EXTENSION_TEST_RESULTS" EntitySet="RML_EXTENSION_TEST_RESULTS" />
+            <End Role="RUBBING_RESULTS" EntitySet="RUBBING_RESULTS" />
+          </AssociationSet>
           <AssociationSet Name="FK_RMLS_EXTENSIONS_RMLS" Association="RemoteModel.FK_RMLS_EXTENSIONS_RMLS">
             <End Role="RML" EntitySet="RMLS" />
             <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
@@ -4281,6 +4314,7 @@
           <NavigationProperty Name="COLOR_PROCESS_DATA" Relationship="RemoteModel.FK_COLOR_PROCESS_DATA_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="COLOR_PROCESS_DATA" />
           <NavigationProperty Name="COLOR_PROCESS_FACTORS" Relationship="RemoteModel.FK_COLOR_PROCESS_FACTOR_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="COLOR_PROCESS_FACTORS" />
           <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="RMLS_EXTENSIONS" />
+          <NavigationProperty Name="COLOR_PROCESS_INK_UPTAKE" Relationship="RemoteModel.FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="COLOR_PROCESS_INK_UPTAKE" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_MACHINES" FromRole="COLOR_PROCESS_PARAMETERS" ToRole="MACHINE" />
         </EntityType>
         <EntityType Name="RML_EXTENSION_TEST_RESULTS">
@@ -4323,9 +4357,9 @@
           <Property Name="THREAD_COF" Type="Double" />
           <Property Name="THREAD_LUB" Type="Double" />
           <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_RMLS_EXTENSIONS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RMLS_EXTENSIONS" />
-          <NavigationProperty Name="RUBBING_RESULTS" Relationship="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RUBBING_RESULTS" />
           <NavigationProperty Name="TENSILE_RESULTS" Relationship="RemoteModel.FK_TENSILE_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="TENSILE_RESULTS" />
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_MACHINES" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="MACHINE" />
+          <NavigationProperty Name="RUBBING_RESULTS" Relationship="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RML_EXTENSION_TEST_RESULTS" ToRole="RUBBING_RESULTS" />
         </EntityType>
         <EntityType Name="RMLS_EXTENSIONS">
           <Key>
@@ -4376,23 +4410,6 @@
           <Property Name="RML_LEVEL" Type="Int32" Nullable="false" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_RMLS" FromRole="RMLS_EXTENSIONS" ToRole="RML" />
         </EntityType>
-        <EntityType Name="RUBBING_RESULTS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="RML_EXTENSION_TEST_RESULTS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="COLOR" Type="Int32" />
-          <Property Name="DELTAE_CIE_100" Type="Double" />
-          <Property Name="GS_100_MIN" Type="Int32" />
-          <Property Name="GS_100_MAX" Type="Int32" />
-          <Property Name="DELTAE_CIE_200" Type="Double" />
-          <Property Name="GS_200_MIN" Type="Int32" />
-          <Property Name="GS_200_MAX" Type="Int32" />
-          <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RUBBING_RESULTS" ToRole="RML_EXTENSION_TEST_RESULTS" />
-        </EntityType>
         <EntityType Name="TENSILE_RESULTS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4576,20 +4593,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS">
-          <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1">
-            <OnDelete Action="Cascade" />
-          </End>
-          <End Type="RemoteModel.RUBBING_RESULTS" Role="RUBBING_RESULTS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="RML_EXTENSION_TEST_RESULTS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="RUBBING_RESULTS">
-              <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_TENSILE_RESULTS_RML_EXTENSION_TEST_RESULTS">
           <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -4994,6 +4997,18 @@
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_COLOR_CATALOGS_ITEMS" FromRole="COLOR_CATALOGS_ITEMS_RECIPES" ToRole="COLOR_CATALOGS_ITEMS" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="COLOR_CATALOGS_ITEMS_RECIPES" ToRole="RML" />
         </EntityType>
+        <EntityType Name="COLOR_PROCESS_INK_UPTAKE">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="COLOR_PROCESS_PARAMETERS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="INK_UPTAKE_ZONE" Type="Int32" Nullable="false" />
+          <Property Name="INK_VALUE" Type="Int32" />
+          <NavigationProperty Name="COLOR_PROCESS_PARAMETERS" Relationship="RemoteModel.FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS" FromRole="COLOR_PROCESS_INK_UPTAKE" ToRole="COLOR_PROCESS_PARAMETERS" />
+        </EntityType>
         <EntityType Name="COLOR_SPACES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -5749,7 +5764,7 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="CODE" Type="Int32" Nullable="false" />
-          <Property Name="DESCRIPTION" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DESCRIPTION" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RML_MEDIA_MATERIALS" FromRole="MEDIA_MATERIALS" ToRole="RML" />
         </EntityType>
         <EntityType Name="MEDIA_PURPOSES">
@@ -6008,6 +6023,21 @@
           <NavigationProperty Name="PERMISSION" Relationship="RemoteModel.FK_ROLES_PERMISSIONS_PERMISSIONS" FromRole="ROLES_PERMISSIONS" ToRole="PERMISSION" />
           <NavigationProperty Name="ROLE" Relationship="RemoteModel.FK_ROLES_PERMISSIONS_ROLES" FromRole="ROLES_PERMISSIONS" ToRole="ROLE" />
         </EntityType>
+        <EntityType Name="RUBBING_RESULTS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="RML_EXTENSION_TEST_RESULTS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="COLOR" Type="Int32" />
+          <Property Name="DELTAE_CIE_100" Type="Double" />
+          <Property Name="GS_100" Type="Double" />
+          <Property Name="DELTAE_CIE_200" Type="Double" />
+          <Property Name="GS_200" Type="Double" />
+          <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS" FromRole="RUBBING_RESULTS" ToRole="RML_EXTENSION_TEST_RESULTS" />
+        </EntityType>
         <EntityType Name="SEGMENT">
           <Key>
             <PropertyRef Name="GUID" />
@@ -6591,6 +6621,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_COLOR_PROCESS_INK_UPTAKE_COLOR_PROCESS_PARAMETERS">
+          <End Type="RemoteModel.COLOR_PROCESS_PARAMETERS" Role="COLOR_PROCESS_PARAMETERS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Role="COLOR_PROCESS_INK_UPTAKE" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="COLOR_PROCESS_PARAMETERS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="COLOR_PROCESS_INK_UPTAKE">
+              <PropertyRef Name="COLOR_PROCESS_PARAMETERS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_COLOR_PROCESS_PARAMETERS_MACHINES">
           <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -7373,6 +7417,20 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_RUBBING_RESULTS_RML_EXTENSION_TEST_RESULTS">
+          <End Type="RemoteModel.RML_EXTENSION_TEST_RESULTS" Role="RML_EXTENSION_TEST_RESULTS" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.RUBBING_RESULTS" Role="RUBBING_RESULTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML_EXTENSION_TEST_RESULTS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="RUBBING_RESULTS">
+              <PropertyRef Name="RML_EXTENSION_TEST_RESULTS_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_RMLS_EXTENSIONS_RMLS">
           <End Type="RemoteModel.RML" Role="RML" Multiplicity="0..1">
             <OnDelete Action="Cascade" />
@@ -7691,23 +7749,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="RUBBING_RESULTS">
-            <EntityTypeMapping TypeName="RemoteModel.RUBBING_RESULTS">
-              <MappingFragment StoreEntitySet="RUBBING_RESULTS">
-                <ScalarProperty Name="GS_200_MAX" ColumnName="GS_200_MAX" />
-                <ScalarProperty Name="GS_200_MIN" ColumnName="GS_200_MIN" />
-                <ScalarProperty Name="DELTAE_CIE_200" ColumnName="DELTAE_CIE_200" />
-                <ScalarProperty Name="GS_100_MAX" ColumnName="GS_100_MAX" />
-                <ScalarProperty Name="GS_100_MIN" ColumnName="GS_100_MIN" />
-                <ScalarProperty Name="DELTAE_CIE_100" ColumnName="DELTAE_CIE_100" />
-                <ScalarProperty Name="COLOR" ColumnName="COLOR" />
-                <ScalarProperty Name="RML_EXTENSION_TEST_RESULTS_GUID" ColumnName="RML_EXTENSION_TEST_RESULTS_GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="TENSILE_RESULTS">
             <EntityTypeMapping TypeName="RemoteModel.TENSILE_RESULTS">
               <MappingFragment StoreEntitySet="TENSILE_RESULTS">
@@ -8094,6 +8135,18 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="COLOR_PROCESS_INK_UPTAKE">
+            <EntityTypeMapping TypeName="RemoteModel.COLOR_PROCESS_INK_UPTAKE">
+              <MappingFragment StoreEntitySet="COLOR_PROCESS_INK_UPTAKE">
+                <ScalarProperty Name="INK_VALUE" ColumnName="INK_VALUE" />
+                <ScalarProperty Name="INK_UPTAKE_ZONE" ColumnName="INK_UPTAKE_ZONE" />
+                <ScalarProperty Name="COLOR_PROCESS_PARAMETERS_GUID" ColumnName="COLOR_PROCESS_PARAMETERS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="COLOR_SPACES">
             <EntityTypeMapping TypeName="RemoteModel.COLOR_SPACES">
               <MappingFragment StoreEntitySet="COLOR_SPACES">
@@ -9034,6 +9087,21 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="RUBBING_RESULTS">
+            <EntityTypeMapping TypeName="RemoteModel.RUBBING_RESULTS">
+              <MappingFragment StoreEntitySet="RUBBING_RESULTS">
+                <ScalarProperty Name="GS_200" ColumnName="GS_200" />
+                <ScalarProperty Name="DELTAE_CIE_200" ColumnName="DELTAE_CIE_200" />
+                <ScalarProperty Name="GS_100" ColumnName="GS_100" />
+                <ScalarProperty Name="DELTAE_CIE_100" ColumnName="DELTAE_CIE_100" />
+                <ScalarProperty Name="COLOR" ColumnName="COLOR" />
+                <ScalarProperty Name="RML_EXTENSION_TEST_RESULTS_GUID" ColumnName="RML_EXTENSION_TEST_RESULTS_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="SEGMENTS">
             <EntityTypeMapping TypeName="RemoteModel.SEGMENT">
               <MappingFragment StoreEntitySet="SEGMENTS">
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 be198cefc..cc936cddc 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,95 +5,97 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="51.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="62.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="70.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="60" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="32.875" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="10.125" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="32.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="36" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="5.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="4.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="62.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="47.25" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="73.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="4.5" PointY="77.625" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6.75" PointY="77" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="57" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="72.25" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="29.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="13.25" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="11.875" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="11.5" PointY="81.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="13.75" PointY="73" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="73.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="68.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="77.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="65.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.5" PointY="77.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="14.75" PointY="63" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.5" PointY="57.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="14.75" PointY="55.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="46.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="58.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="65.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.5" PointY="57.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="11.75" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6.75" PointY="43.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="9" PointY="37.125" />
-        <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="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="12" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="4.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="28.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="73" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="39.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="27" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="24.125" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6.75" PointY="35.75" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="42.125" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="44.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.625" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="1.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="1.875" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="42.375" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="29" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="27.5" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="35" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="17.75" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="39.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="16.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="19.75" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="8.875" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="27.75" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="61.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="90.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="80.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="69.125" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="11.75" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="25.625" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="36.625" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="13.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="74.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="65.25" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="13.125" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="61.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="94.125" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="93.5" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="87.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="40.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="14.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="22.125" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="45.5" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="98.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="79.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="102.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="83.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="71.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="82.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="74.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="80.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="98.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="88.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="75.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="78.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="83" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="106.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="87.375" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="43.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="37.625" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="15.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="37.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="25.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="11" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="14.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="57.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="49.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="40.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="28.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="31.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="11.375" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="33.25" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="43.125" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="54" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.5" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="8.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="11" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="49.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="50" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="13.75" PointY="14" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="10.875" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="31.75" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="15.75" PointY="11" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="17.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="40.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="14" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="17.75" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="17.75" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="17.75" PointY="13" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="19.75" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="25.625" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="30" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="31.5" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index 3efe3345b..8a7ccc017 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -458,7 +458,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file