Merged Jobs V2

4 files changed, 20 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
index 34384cb8f..5671e17a3 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
@@ -55,6 +55,9 @@ namespace Tango.DAL.Remote.DB
         public string COLOR_CATALOG_GUID { get; set; }
         public string COLOR_CATALOGS_ITEM_GUID { get; set; }
         public bool IS_TRANSPARENT { get; set; }
+        public Nullable<int> BEST_MATCH_R { get; set; }
+        public Nullable<int> BEST_MATCH_G { get; set; }
+        public Nullable<int> BEST_MATCH_B { get; set; }
     
         public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; }
         public virtual COLOR_CATALOGS_ITEMS COLOR_CATALOGS_ITEMS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
index f30b43230..6df51f067 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
@@ -58,6 +58,7 @@ namespace Tango.DAL.Remote.DB
         public double LENGTH_PERCENTAGE_FACTOR { get; set; }
         public bool IS_SYNCHRONIZED { get; set; }
         public int SOURCE { get; set; }
+        public int VERSION { get; set; }
     
         public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; }
         public virtual COLOR_SPACES COLOR_SPACES { 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/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index a53e6dffb..57e9c8f7d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -123,6 +123,9 @@
           <Property Name="COLOR_CATALOG_GUID" Type="varchar" MaxLength="36" />
           <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="varchar" MaxLength="36" />
           <Property Name="IS_TRANSPARENT" Type="bit" Nullable="false" />
+          <Property Name="BEST_MATCH_R" Type="int" />
+          <Property Name="BEST_MATCH_G" Type="int" />
+          <Property Name="BEST_MATCH_B" Type="int" />
         </EntityType>
         <EntityType Name="BTSR_APPLICATION_TYPES">
           <Key>
@@ -800,6 +803,7 @@
           <Property Name="LENGTH_PERCENTAGE_FACTOR" Type="float" Nullable="false" />
           <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
           <Property Name="SOURCE" Type="int" Nullable="false" />
+          <Property Name="VERSION" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
@@ -950,6 +954,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" />
         </EntityType>
         <EntityType Name="MEDIA_PURPOSES">
           <Key>
@@ -4843,6 +4848,9 @@
           <Property Name="COLOR_CATALOG_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="IS_TRANSPARENT" Type="Boolean" Nullable="false" />
+          <Property Name="BEST_MATCH_R" Type="Int32" />
+          <Property Name="BEST_MATCH_G" Type="Int32" />
+          <Property Name="BEST_MATCH_B" Type="Int32" />
           <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS" FromRole="BRUSH_STOPS" ToRole="COLOR_CATALOGS" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS_ITEMS" FromRole="BRUSH_STOPS" ToRole="COLOR_CATALOGS_ITEMS" />
           <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" FromRole="BRUSH_STOPS" ToRole="COLOR_SPACES" />
@@ -5558,6 +5566,7 @@
           <Property Name="LENGTH_PERCENTAGE_FACTOR" Type="Double" Nullable="false" />
           <Property Name="IS_SYNCHRONIZED" Type="Boolean" Nullable="false" />
           <Property Name="SOURCE" Type="Int32" Nullable="false" />
+          <Property Name="VERSION" Type="Int32" Nullable="false" />
           <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_JOBS_COLOR_CATALOGS" FromRole="JOB" ToRole="COLOR_CATALOGS" />
           <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_JOBS_COLOR_SPACES" FromRole="JOB" ToRole="COLOR_SPACES" />
           <NavigationProperty Name="CUSTOMER" Relationship="RemoteModel.FK_JOBS_CUSTOMERS" FromRole="JOB" ToRole="CUSTOMER" />
@@ -5740,6 +5749,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" />
           <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RML_MEDIA_MATERIALS" FromRole="MEDIA_MATERIALS" ToRole="RML" />
         </EntityType>
         <EntityType Name="MEDIA_PURPOSES">
@@ -7908,6 +7918,9 @@
           <EntitySetMapping Name="BRUSH_STOPS">
             <EntityTypeMapping TypeName="RemoteModel.BRUSH_STOPS">
               <MappingFragment StoreEntitySet="BRUSH_STOPS">
+                <ScalarProperty Name="BEST_MATCH_B" ColumnName="BEST_MATCH_B" />
+                <ScalarProperty Name="BEST_MATCH_G" ColumnName="BEST_MATCH_G" />
+                <ScalarProperty Name="BEST_MATCH_R" ColumnName="BEST_MATCH_R" />
                 <ScalarProperty Name="IS_TRANSPARENT" ColumnName="IS_TRANSPARENT" />
                 <ScalarProperty Name="COLOR_CATALOGS_ITEM_GUID" ColumnName="COLOR_CATALOGS_ITEM_GUID" />
                 <ScalarProperty Name="COLOR_CATALOG_GUID" ColumnName="COLOR_CATALOG_GUID" />
@@ -8587,6 +8600,7 @@
           <EntitySetMapping Name="JOBS">
             <EntityTypeMapping TypeName="RemoteModel.JOB">
               <MappingFragment StoreEntitySet="JOBS">
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="SOURCE" ColumnName="SOURCE" />
                 <ScalarProperty Name="IS_SYNCHRONIZED" ColumnName="IS_SYNCHRONIZED" />
                 <ScalarProperty Name="LENGTH_PERCENTAGE_FACTOR" ColumnName="LENGTH_PERCENTAGE_FACTOR" />
@@ -8780,6 +8794,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" />