Added Ha Amma spool support via sites.

8 files changed, 228 insertions, 80 deletions

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..0810b88c8 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -118,6 +118,7 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<SITE> SITES { get; set; }
         public virtual DbSet<SITES_CATALOGS> SITES_CATALOGS { get; set; }
         public virtual DbSet<SITES_RMLS> SITES_RMLS { get; set; }
+        public virtual DbSet<SITES_SPOOL_TYPES> SITES_SPOOL_TYPES { get; set; }
         public virtual DbSet<SPOOL_TYPES> SPOOL_TYPES { get; set; }
         public virtual DbSet<SPOOL> SPOOLS { get; set; }
         public virtual DbSet<sysdiagram> sysdiagrams { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
index b9a889afd..d26e67908 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Designer.cs
@@ -1,4 +1,4 @@
-// T4 code generation is enabled for model 'C:\TFS\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
+// T4 code generation is enabled for model 'C:\DATA\Development\Tango\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
 // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
 // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
 // is open in the designer.
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 78b7b3fdf..a53e6dffb 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1305,6 +1305,16 @@
           <Property Name="SITE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
+        <EntityType Name="SITES_SPOOL_TYPES">
+          <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="SITE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="SPOOL_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
         <EntityType Name="SPOOL_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -2934,6 +2944,34 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_SITES_SPOOL_TYPES_SITES">
+          <End Role="SITES" Type="Self.SITES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="SITES_SPOOL_TYPES" Type="Self.SITES_SPOOL_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SITES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="SITES_SPOOL_TYPES">
+              <PropertyRef Name="SITE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_SITES_SPOOL_TYPES_SPOOL_TYPES">
+          <End Role="SPOOL_TYPES" Type="Self.SPOOL_TYPES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Role="SITES_SPOOL_TYPES" Type="Self.SITES_SPOOL_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SPOOL_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="SITES_SPOOL_TYPES">
+              <PropertyRef Name="SPOOL_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_SPOOLS_MACHINES">
           <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -3145,6 +3183,7 @@
           <EntitySet Name="SITES" EntityType="Self.SITES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SITES_CATALOGS" EntityType="Self.SITES_CATALOGS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SITES_RMLS" EntityType="Self.SITES_RMLS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="SITES_SPOOL_TYPES" EntityType="Self.SITES_SPOOL_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOL_TYPES" EntityType="Self.SPOOL_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOLS" EntityType="Self.SPOOLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
@@ -3572,6 +3611,14 @@
             <End Role="SITES" EntitySet="SITES" />
             <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_SITES_SPOOL_TYPES_SITES" Association="Self.FK_SITES_SPOOL_TYPES_SITES">
+            <End Role="SITES" EntitySet="SITES" />
+            <End Role="SITES_SPOOL_TYPES" EntitySet="SITES_SPOOL_TYPES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_SITES_SPOOL_TYPES_SPOOL_TYPES" Association="Self.FK_SITES_SPOOL_TYPES_SPOOL_TYPES">
+            <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
+            <End Role="SITES_SPOOL_TYPES" EntitySet="SITES_SPOOL_TYPES" />
+          </AssociationSet>
           <AssociationSet Name="FK_SPOOLS_MACHINES" Association="Self.FK_SPOOLS_MACHINES">
             <End Role="MACHINES" EntitySet="MACHINES" />
             <End Role="SPOOLS" EntitySet="SPOOLS" />
@@ -3775,6 +3822,7 @@
           <EntitySet Name="SITES" EntityType="RemoteModel.SITE" />
           <EntitySet Name="SITES_CATALOGS" EntityType="RemoteModel.SITES_CATALOGS" />
           <EntitySet Name="SITES_RMLS" EntityType="RemoteModel.SITES_RMLS" />
+          <EntitySet Name="SITES_SPOOL_TYPES" EntityType="RemoteModel.SITES_SPOOL_TYPES" />
           <EntitySet Name="SPOOL_TYPES" EntityType="RemoteModel.SPOOL_TYPES" />
           <EntitySet Name="SPOOLS" EntityType="RemoteModel.SPOOL" />
           <EntitySet Name="sysdiagrams" EntityType="RemoteModel.sysdiagram" />
@@ -4153,6 +4201,14 @@
             <End Role="SITE" EntitySet="SITES" />
             <End Role="SITES_RMLS" EntitySet="SITES_RMLS" />
           </AssociationSet>
+          <AssociationSet Name="FK_SITES_SPOOL_TYPES_SITES" Association="RemoteModel.FK_SITES_SPOOL_TYPES_SITES">
+            <End Role="SITE" EntitySet="SITES" />
+            <End Role="SITES_SPOOL_TYPES" EntitySet="SITES_SPOOL_TYPES" />
+          </AssociationSet>
+          <AssociationSet Name="FK_SITES_SPOOL_TYPES_SPOOL_TYPES" Association="RemoteModel.FK_SITES_SPOOL_TYPES_SPOOL_TYPES">
+            <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
+            <End Role="SITES_SPOOL_TYPES" EntitySet="SITES_SPOOL_TYPES" />
+          </AssociationSet>
           <AssociationSet Name="FK_SPOOLS_SPOOL_TYPES" Association="RemoteModel.FK_SPOOLS_SPOOL_TYPES">
             <End Role="SPOOL_TYPES" EntitySet="SPOOL_TYPES" />
             <End Role="SPOOL" EntitySet="SPOOLS" />
@@ -5969,6 +6025,7 @@
           <NavigationProperty Name="ORGANIZATION" Relationship="RemoteModel.FK_SITES_ORGANIZATIONS" FromRole="SITE" ToRole="ORGANIZATION" />
           <NavigationProperty Name="SITES_CATALOGS" Relationship="RemoteModel.FK_SITES_CATALOGS_SITES" FromRole="SITE" ToRole="SITES_CATALOGS" />
           <NavigationProperty Name="SITES_RMLS" Relationship="RemoteModel.FK_SITES_RMLS_SITES" FromRole="SITE" ToRole="SITES_RMLS" />
+          <NavigationProperty Name="SITES_SPOOL_TYPES" Relationship="RemoteModel.FK_SITES_SPOOL_TYPES_SITES" FromRole="SITE" ToRole="SITES_SPOOL_TYPES" />
         </EntityType>
         <EntityType Name="SITES_CATALOGS">
           <Key>
@@ -5994,6 +6051,18 @@
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_SITES_RMLS_RMLS" FromRole="SITES_RMLS" ToRole="RML" />
           <NavigationProperty Name="SITE" Relationship="RemoteModel.FK_SITES_RMLS_SITES" FromRole="SITES_RMLS" ToRole="SITE" />
         </EntityType>
+        <EntityType Name="SITES_SPOOL_TYPES">
+          <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="SITE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="SPOOL_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="SITE" Relationship="RemoteModel.FK_SITES_SPOOL_TYPES_SITES" FromRole="SITES_SPOOL_TYPES" ToRole="SITE" />
+          <NavigationProperty Name="SPOOL_TYPES" Relationship="RemoteModel.FK_SITES_SPOOL_TYPES_SPOOL_TYPES" FromRole="SITES_SPOOL_TYPES" ToRole="SPOOL_TYPES" />
+        </EntityType>
         <EntityType Name="SPOOL_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -6015,6 +6084,7 @@
           <Property Name="BTSR_SPOOL_TENSION" Type="Int32" Nullable="false" />
           <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="JOB" />
           <NavigationProperty Name="RMLS_SPOOLS" Relationship="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="RMLS_SPOOLS" />
+          <NavigationProperty Name="SITES_SPOOL_TYPES" Relationship="RemoteModel.FK_SITES_SPOOL_TYPES_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="SITES_SPOOL_TYPES" />
           <NavigationProperty Name="SPOOLS" Relationship="RemoteModel.FK_SPOOLS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="SPOOL" />
         </EntityType>
         <EntityType Name="SPOOL">
@@ -7405,6 +7475,34 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_SITES_SPOOL_TYPES_SITES">
+          <End Type="RemoteModel.SITE" Role="SITE" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.SITES_SPOOL_TYPES" Role="SITES_SPOOL_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SITE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="SITES_SPOOL_TYPES">
+              <PropertyRef Name="SITE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_SITES_SPOOL_TYPES_SPOOL_TYPES">
+          <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="1">
+            <OnDelete Action="Cascade" />
+          </End>
+          <End Type="RemoteModel.SITES_SPOOL_TYPES" Role="SITES_SPOOL_TYPES" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="SPOOL_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="SITES_SPOOL_TYPES">
+              <PropertyRef Name="SPOOL_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_SPOOLS_SPOOL_TYPES">
           <End Type="RemoteModel.SPOOL_TYPES" Role="SPOOL_TYPES" Multiplicity="1">
             <OnDelete Action="Cascade" />
@@ -8968,6 +9066,17 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="SITES_SPOOL_TYPES">
+            <EntityTypeMapping TypeName="RemoteModel.SITES_SPOOL_TYPES">
+              <MappingFragment StoreEntitySet="SITES_SPOOL_TYPES">
+                <ScalarProperty Name="SPOOL_TYPE_GUID" ColumnName="SPOOL_TYPE_GUID" />
+                <ScalarProperty Name="SITE_GUID" ColumnName="SITE_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="SPOOL_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.SPOOL_TYPES">
               <MappingFragment StoreEntitySet="SPOOL_TYPES">
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..be198cefc 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.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="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.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="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.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="13.75" PointY="0.75" />
+        <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="20.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="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.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="2.75" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="5" PointY="8.125" />
+        <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="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.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="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="29.875" />
+        <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.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.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" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -181,6 +182,8 @@
         <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_ROLES" />
         <AssociationConnector Association="RemoteModel.FK_SITES_CATALOGS_SITES" />
         <AssociationConnector Association="RemoteModel.FK_SITES_RMLS_SITES" />
+        <AssociationConnector Association="RemoteModel.FK_SITES_SPOOL_TYPES_SITES" />
+        <AssociationConnector Association="RemoteModel.FK_SITES_SPOOL_TYPES_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_SPOOLS_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_TANGO_VERSIONS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_USERS" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
index c0aa38e97..7086ccbce 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
@@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB
         {
             this.SITES_CATALOGS = new HashSet<SITES_CATALOGS>();
             this.SITES_RMLS = new HashSet<SITES_RMLS>();
+            this.SITES_SPOOL_TYPES = new HashSet<SITES_SPOOL_TYPES>();
         }
     
         public int ID { get; set; }
@@ -33,5 +34,7 @@ namespace Tango.DAL.Remote.DB
         public virtual ICollection<SITES_CATALOGS> SITES_CATALOGS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<SITES_RMLS> SITES_RMLS { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<SITES_SPOOL_TYPES> SITES_SPOOL_TYPES { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_SPOOL_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_SPOOL_TYPES.cs
new file mode 100644
index 000000000..f5d93132a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_SPOOL_TYPES.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 SITES_SPOOL_TYPES
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string SITE_GUID { get; set; }
+        public string SPOOL_TYPE_GUID { get; set; }
+    
+        public virtual SITE SITE { get; set; }
+        public virtual SPOOL_TYPES SPOOL_TYPES { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
index 836112ec7..732f56b68 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs
@@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB
         {
             this.JOBS = new HashSet<JOB>();
             this.RMLS_SPOOLS = new HashSet<RMLS_SPOOLS>();
+            this.SITES_SPOOL_TYPES = new HashSet<SITES_SPOOL_TYPES>();
             this.SPOOLS = new HashSet<SPOOL>();
         }
     
@@ -43,6 +44,8 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RMLS_SPOOLS> RMLS_SPOOLS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<SITES_SPOOL_TYPES> SITES_SPOOL_TYPES { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<SPOOL> SPOOLS { get; set; }
     }
 }
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..f299d1c52 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -321,6 +321,9 @@
     <Compile Include="DB\SITES_RMLS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\SITES_SPOOL_TYPES.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\SPOOL.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