RML EXTANSION- item 5745, 5909, 5823. DataBase changes:

table Rubbing results , remove GS 100 min and  GS 100 max and add GS 100, remove GS 200 min and  GS 200 max and add GS 200. Created new table COLOR_PROCESS_INK_UPTAKE

8 files changed, 209 insertions, 105 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_INK_UPTAKE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_INK_UPTAKE.cs
new file mode 100644
index 000000000..20cd2fbc1
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_INK_UPTAKE.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class COLOR_PROCESS_INK_UPTAKE
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string COLOR_PROCESS_PARAMETERS_GUID { get; set; }
+        public int INK_UPTAKE_ZONE { get; set; }
+        public Nullable<int> INK_VALUE { get; set; }
+    
+        public virtual COLOR_PROCESS_PARAMETERS COLOR_PROCESS_PARAMETERS { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_PARAMETERS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_PARAMETERS.cs
index e3ff8e462..9c4510ccd 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_PARAMETERS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_PROCESS_PARAMETERS.cs
@@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB
         {
             this.COLOR_PROCESS_DATA = new HashSet<COLOR_PROCESS_DATA>();
             this.COLOR_PROCESS_FACTORS = new HashSet<COLOR_PROCESS_FACTORS>();
+            this.COLOR_PROCESS_INK_UPTAKE = new HashSet<COLOR_PROCESS_INK_UPTAKE>();
         }
     
         public int ID { get; set; }
@@ -35,6 +36,8 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<COLOR_PROCESS_FACTORS> COLOR_PROCESS_FACTORS { get; set; }
         public virtual RMLS_EXTENSIONS RMLS_EXTENSIONS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<COLOR_PROCESS_INK_UPTAKE> COLOR_PROCESS_INK_UPTAKE { get; set; }
         public virtual MACHINE MACHINE { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs
index 9f08788ac..d54051db5 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs
@@ -25,6 +25,7 @@ namespace Tango.DAL.Remote.DB
         public System.DateTime LAST_UPDATED { get; set; }
         public string NAME { get; set; }
         public int CODE { get; set; }
+        public string DESCRIPTION { 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/RUBBING_RESULTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RUBBING_RESULTS.cs
index 956852ad9..47e54fb92 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RUBBING_RESULTS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RUBBING_RESULTS.cs
@@ -20,11 +20,9 @@ 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<int> GS_100_MIN { get; set; }
-        public Nullable<int> GS_100_MAX { get; set; }
         public Nullable<double> DELTAE_CIE_200 { get; set; }
-        public Nullable<int> GS_200_MIN { get; set; }
-        public Nullable<int> GS_200_MAX { get; set; }
+        public Nullable<double> GS_100 { 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 702ce780c..269c2c5de 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -60,6 +60,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<COLOR_CATALOGS_GROUPS> COLOR_CATALOGS_GROUPS { get; set; }
         public virtual DbSet<COLOR_CATALOGS_ITEMS> COLOR_CATALOGS_ITEMS { get; set; }
         public virtual DbSet<COLOR_CATALOGS_ITEMS_RECIPES> COLOR_CATALOGS_ITEMS_RECIPES { get; set; }
+        public virtual DbSet<COLOR_PROCESS_INK_UPTAKE> COLOR_PROCESS_INK_UPTAKE { get; set; }
         public virtual DbSet<COLOR_SPACES> COLOR_SPACES { get; set; }
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; }
         public virtual DbSet<CONTACT> CONTACTS { 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 78b7b3fdf..5b585e73b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -273,6 +273,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" />
@@ -950,6 +961,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="varchar" MaxLength="50" />
         </EntityType>
         <EntityType Name="MEDIA_PURPOSES">
           <Key>
@@ -1256,11 +1268,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>
@@ -1818,6 +1828,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" />
@@ -3083,6 +3107,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" />
@@ -3228,6 +3253,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" />
@@ -3717,6 +3746,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" />
@@ -3881,6 +3911,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" />
@@ -4220,6 +4254,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">
@@ -4325,12 +4360,10 @@
           <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" />
+          <Property Name="GS_100" Type="Double" />
+          <Property Name="GS_200" Type="Double" />
         </EntityType>
         <EntityType Name="TENSILE_RESULTS">
           <Key>
@@ -4930,6 +4963,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" />
@@ -5684,6 +5729,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="50" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RML_MEDIA_MATERIALS" FromRole="MEDIA_MATERIALS" ToRole="RML" />
         </EntityType>
         <EntityType Name="MEDIA_PURPOSES">
@@ -6511,6 +6557,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" />
@@ -7586,11 +7646,9 @@
           <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="GS_200" ColumnName="GS_200" />
+                <ScalarProperty Name="GS_100" ColumnName="GS_100" />
                 <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" />
@@ -7983,6 +8041,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">
@@ -8682,6 +8752,7 @@
           <EntitySetMapping Name="MEDIA_MATERIALS">
             <EntityTypeMapping TypeName="RemoteModel.MEDIA_MATERIALS">
               <MappingFragment StoreEntitySet="MEDIA_MATERIALS">
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
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 10bd85a35..ad16c680e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,94 +5,95 @@
     <!-- 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="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="40.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="70" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="61.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="64.125" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.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="33.25" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="37" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="24.25" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="10.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="55" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="49.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="48.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="27.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="62.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="44.25" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="24.375" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="73" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="4.5" PointY="33.375" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6.75" PointY="32.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="67" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="31.5" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="27.375" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="24.5" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="5.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="10.5" PointY="47.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12.75" PointY="50.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="44.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="57.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.5" PointY="76.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9.75" PointY="55.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="10.5" PointY="77.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="12.75" PointY="54.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="13.5" PointY="46.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15.75" PointY="55.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="43.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9.75" PointY="51.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="57" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.5" PointY="81.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="11.75" PointY="64.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6.75" PointY="40" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="9" PointY="37.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.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="20.75" />
-        <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="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="2.75" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="28.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="72.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="61.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="35" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="30.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6.75" PointY="29.25" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="3.125" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="85.5" />
-        <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="2.75" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="5" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.625" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="72.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="69.5" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="29.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="40" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="13.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="13.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="37" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="15.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="10.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="13.25" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="10.25" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="80" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="66.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="63.875" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="6.625" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18.875" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="32.125" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="29" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="32.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="94.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="89.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="88.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="13.75" PointY="10.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="32.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="47.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="84" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="29.625" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="61.75" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="104.875" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="104.25" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="61" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="7.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="38.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="15" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="14.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="7.5" PointY="58.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="9.75" PointY="41.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="10.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="36" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.5" PointY="62.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9.75" PointY="51.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="100.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="38.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="40.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="10.5" PointY="61.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12.75" PointY="51" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="41.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="10.5" PointY="57.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="12.75" PointY="42.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="18.625" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="11.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="26.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="2.75" PointY="13.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="29.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="57.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="49.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="34.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="22.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="35.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="26" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="35.5" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="74.875" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="3" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.75" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="2.875" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="3" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.5" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="6.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="22.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="14.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="13.25" PointY="55.25" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="36.25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="46.375" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="16.75" PointY="11.625" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="14.625" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="17.75" PointY="19.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="18.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="18.75" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="13.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="19.75" PointY="18.625" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="12.625" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="14" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="26.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 424b9585f..5bc34f83a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -120,6 +120,9 @@
     <Compile Include="DB\COLOR_PROCESS_FACTORS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\COLOR_PROCESS_INK_UPTAKE.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\COLOR_PROCESS_PARAMETERS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -452,7 +455,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