RML Extension changes

5 files changed, 111 insertions, 159 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
index ceebfcbea..03bfb8613 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_EXTENSIONS.cs
@@ -27,7 +27,6 @@ namespace Tango.DAL.Remote.DB
         public string RMLS_GUID { get; set; }
         public string USERS_GUID { get; set; }
         public System.DateTime CREATED { get; set; }
-        public string YARN_MANUFACTURER_GUID { get; set; }
         public string YARN_BRAND_GUID { get; set; }
         public string COUNTRY { get; set; }
         public string YARN_APPLICATION_GUID { get; set; }
@@ -64,7 +63,6 @@ namespace Tango.DAL.Remote.DB
         public virtual YARN_GLOSS_LEVELS YARN_GLOSS_LEVELS { get; set; }
         public virtual YARN_GROUPS YARN_GROUPS { get; set; }
         public virtual YARN_INDUSTRYSECTORS YARN_INDUSTRYSECTORS { get; set; }
-        public virtual YARN_MANUFACTURERS YARN_MANUFACTURERS { get; set; }
         public virtual YARN_SUB_FAMILIES YARN_SUB_FAMILIES { get; set; }
         public virtual YARN_TEXTURINGS YARN_TEXTURINGS { get; set; }
         public virtual YARN_TYPES YARN_TYPES { 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 ab712ebb7..b9a889afd 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\Software\Visual_Studio\Tango.DAL.Remote\DB\RemoteADO.edmx'. 
+// T4 code generation is enabled for model 'C:\TFS\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 a9a953f71..e49153569 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1183,7 +1183,6 @@
           <Property Name="RMLS_GUID" Type="varchar" MaxLength="36" />
           <Property Name="USERS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="CREATED" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="YARN_MANUFACTURER_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="YARN_BRAND_GUID" Type="varchar" MaxLength="36" />
           <Property Name="COUNTRY" Type="varchar" MaxLength="60" />
           <Property Name="YARN_APPLICATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
@@ -1206,7 +1205,7 @@
           <Property Name="MAX_ELASTICITY" Type="float" />
           <Property Name="MIN_TENACITY" Type="float" />
           <Property Name="MAX_TENACITY" Type="float" />
-          <Property Name="FINISHING" Type="varchar" MaxLength="36" />
+          <Property Name="FINISHING" Type="nvarchar" MaxLength="150" />
           <Property Name="STATUS" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="RMLS_SPOOLS">
@@ -2733,18 +2732,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS">
-          <End Role="YARN_MANUFACTURERS" Type="Self.YARN_MANUFACTURERS" Multiplicity="1" />
-          <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="YARN_MANUFACTURERS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="RMLS_EXTENSIONS">
-              <PropertyRef Name="YARN_MANUFACTURER_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_RMLS_EXTENSIONS_YARN_SUB_FAMILIES">
           <End Role="YARN_SUB_FAMILIES" Type="Self.YARN_SUB_FAMILIES" Multiplicity="1" />
           <End Role="RMLS_EXTENSIONS" Type="Self.RMLS_EXTENSIONS" Multiplicity="*" />
@@ -3523,10 +3510,6 @@
             <End Role="YARN_INDUSTRYSECTORS" EntitySet="YARN_INDUSTRYSECTORS" />
             <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
           </AssociationSet>
-          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS" Association="Self.FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS">
-            <End Role="YARN_MANUFACTURERS" EntitySet="YARN_MANUFACTURERS" />
-            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
-          </AssociationSet>
           <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_SUB_FAMILIES" Association="Self.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILIES">
             <End Role="YARN_SUB_FAMILIES" EntitySet="YARN_SUB_FAMILIES" />
             <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
@@ -4132,10 +4115,6 @@
             <End Role="YARN_INDUSTRYSECTORS" EntitySet="YARN_INDUSTRYSECTORS" />
             <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
           </AssociationSet>
-          <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS">
-            <End Role="YARN_MANUFACTURERS" EntitySet="YARN_MANUFACTURERS" />
-            <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
-          </AssociationSet>
           <AssociationSet Name="FK_RMLS_EXTENSIONS_YARN_SUB_FAMILIES" Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILIES">
             <End Role="YARN_SUB_FAMILIES" EntitySet="YARN_SUB_FAMILIES" />
             <End Role="RMLS_EXTENSIONS" EntitySet="RMLS_EXTENSIONS" />
@@ -5531,7 +5510,6 @@
           <Property Name="RMLS_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="USERS_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="CREATED" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="YARN_MANUFACTURER_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="YARN_BRAND_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="COUNTRY" Type="String" MaxLength="60" FixedLength="false" Unicode="false" />
           <Property Name="YARN_APPLICATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
@@ -5554,7 +5532,7 @@
           <Property Name="MAX_ELASTICITY" Type="Double" />
           <Property Name="MIN_TENACITY" Type="Double" />
           <Property Name="MAX_TENACITY" Type="Double" />
-          <Property Name="FINISHING" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="FINISHING" Type="String" MaxLength="150" FixedLength="false" Unicode="true" />
           <Property Name="STATUS" Type="Int32" Nullable="false" />
           <NavigationProperty Name="COLOR_PROCESS_PARAMETERS" Relationship="RemoteModel.FK_COLOR_PROCESS_PARAMETERS_RMLS_EXTENSIONS" FromRole="RMLS_EXTENSIONS" ToRole="COLOR_PROCESS_PARAMETERS" />
           <NavigationProperty Name="RML_EXTENSION_TEST_RESULTS" Relationship="RemoteModel.FK_RML_EXTENSION_TEST_RESULTS_RMLS_EXTENSIONS" FromRole="RMLS_EXTENSIONS" ToRole="RML_EXTENSION_TEST_RESULTS" />
@@ -5565,7 +5543,6 @@
           <NavigationProperty Name="YARN_GLOSS_LEVELS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVELS" FromRole="RMLS_EXTENSIONS" ToRole="YARN_GLOSS_LEVELS" />
           <NavigationProperty Name="YARN_GROUPS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GROUPS" FromRole="RMLS_EXTENSIONS" ToRole="YARN_GROUPS" />
           <NavigationProperty Name="YARN_INDUSTRYSECTORS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTORS" FromRole="RMLS_EXTENSIONS" ToRole="YARN_INDUSTRYSECTORS" />
-          <NavigationProperty Name="YARN_MANUFACTURERS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS" FromRole="RMLS_EXTENSIONS" ToRole="YARN_MANUFACTURERS" />
           <NavigationProperty Name="YARN_SUB_FAMILIES" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILIES" FromRole="RMLS_EXTENSIONS" ToRole="YARN_SUB_FAMILIES" />
           <NavigationProperty Name="YARN_TEXTURINGS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TEXTURINGS" FromRole="RMLS_EXTENSIONS" ToRole="YARN_TEXTURINGS" />
           <NavigationProperty Name="YARN_TYPES" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TYPES" FromRole="RMLS_EXTENSIONS" ToRole="YARN_TYPES" />
@@ -5989,7 +5966,6 @@
           <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="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="RMLS_EXTENSIONS" Relationship="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS" FromRole="YARN_MANUFACTURERS" ToRole="RMLS_EXTENSIONS" />
         </EntityType>
         <EntityType Name="YARN_SUB_FAMILIES">
           <Key>
@@ -7307,18 +7283,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS">
-          <End Type="RemoteModel.YARN_MANUFACTURERS" Role="YARN_MANUFACTURERS" Multiplicity="1" />
-          <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="YARN_MANUFACTURERS">
-              <PropertyRef Name="GUID" />
-            </Principal>
-            <Dependent Role="RMLS_EXTENSIONS">
-              <PropertyRef Name="YARN_MANUFACTURER_GUID" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK_RMLS_EXTENSIONS_YARN_SUB_FAMILIES">
           <End Type="RemoteModel.YARN_SUB_FAMILIES" Role="YARN_SUB_FAMILIES" Multiplicity="1" />
           <End Type="RemoteModel.RMLS_EXTENSIONS" Role="RMLS_EXTENSIONS" Multiplicity="*" />
@@ -8758,7 +8722,6 @@
                 <ScalarProperty Name="YARN_APPLICATION_GUID" ColumnName="YARN_APPLICATION_GUID" />
                 <ScalarProperty Name="COUNTRY" ColumnName="COUNTRY" />
                 <ScalarProperty Name="YARN_BRAND_GUID" ColumnName="YARN_BRAND_GUID" />
-                <ScalarProperty Name="YARN_MANUFACTURER_GUID" ColumnName="YARN_MANUFACTURER_GUID" />
                 <ScalarProperty Name="CREATED" ColumnName="CREATED" />
                 <ScalarProperty Name="USERS_GUID" ColumnName="USERS_GUID" />
                 <ScalarProperty Name="RMLS_GUID" ColumnName="RMLS_GUID" />
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 4cf5ddcc0..f5d12d8fc 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,112 +5,113 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="80">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="16.875" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="87.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="80" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="90.125" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="3.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="26.25" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="45.375" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="36.5" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="101.5" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="29.5" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="19.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="9" PointY="11.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="11.25" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="13.5" PointY="19.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="29.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_DATA" Width="1.5" PointX="12.75" PointY="44.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_FACTORS" Width="1.5" PointX="12.75" PointY="48.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_PARAMETERS" Width="1.5" PointX="10.5" PointY="37.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="45.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="85.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="3.5" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="16.25" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="92.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="4.5" PointY="105" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6.75" PointY="104.5" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="93.125" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="12" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="30" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="13" />
-        <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="9.5" PointY="97.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="11.75" PointY="83.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="101.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="11.75" PointY="87.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="77.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="77.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.5" PointY="73.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="14.75" PointY="71.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.5" PointY="69.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="14.75" PointY="81.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="76.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="81.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="83" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="96.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="91.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6.75" PointY="98.25" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="9" PointY="61.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="18.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="26" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="39.625" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="37.25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="33.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="7.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="9.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="76.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="81" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="14.25" PointY="52.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="42.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="33.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="22.75" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6.75" PointY="94.875" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="12.375" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="14" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="66.625" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="69.625" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="3.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="6" PointY="1.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_RESULTS" Width="1.5" PointX="13.5" PointY="34.875" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="24" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_EXTENSIONS" Width="1.5" PointX="8.25" PointY="34.25" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="25.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="14" PointY="8.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.25" PointY="8.625" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="15.75" PointY="37.25" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="25.875" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="53.75" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="5.75" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="15.25" PointY="47.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="8.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="9.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TENSILE_RESULTS" Width="1.5" PointX="15.75" PointY="41.375" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="19.25" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="16.25" PointY="20.625" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_APPLICATIONS" Width="1.5" PointX="6" PointY="63.75" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_BRANDS" Width="1.5" PointX="6" PointY="41.875" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_FAMILIES" Width="1.5" PointX="6" PointY="55.5" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_GLOSS_LEVELS" Width="1.5" PointX="6" PointY="50.125" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_GROUPS" Width="1.5" PointX="6" PointY="52.875" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_INDUSTRYSECTORS" Width="1.5" PointX="6" PointY="44.625" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_MANUFACTURERS" Width="1.5" PointX="6" PointY="16.5" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_SUB_FAMILIES" Width="1.5" PointX="6" PointY="47.375" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_TEXTURINGS" Width="1.5" PointX="6" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_TYPES" Width="1.5" PointX="6" PointY="58.25" />
-        <EntityTypeShape EntityType="RemoteModel.YARN_WHITE_SHADES" Width="1.5" PointX="6" PointY="61" />
+        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="5.25" PointY="57.875" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="77.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="87.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="84.375" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="9.75" PointY="39.125" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="27.125" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="44.375" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="9.125" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="31.375" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="35.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="3" PointY="41.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="5.25" PointY="44.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="7.5" PointY="43.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="39.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_DATA" Width="1.5" PointX="18.75" PointY="29.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_FACTORS" Width="1.5" PointX="18.75" PointY="33.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_PARAMETERS" Width="1.5" PointX="16.5" PointY="31.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="45.875" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="79.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="3" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="87" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="4" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="74.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8" PointY="103.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="24.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="47.5" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="5.25" PointY="93.5" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="90.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="85.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="94.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="89.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="8.5" PointY="112.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="10.75" PointY="86.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.5" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8.75" PointY="76.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.5" PointY="108.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="11.75" PointY="78.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="92.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="11.75" PointY="74.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="80" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="70.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="75.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="99.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="49.5" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="11.75" PointY="6.625" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="27.875" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="31.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="35.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="3.75" PointY="6.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="51.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="70.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="75.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.25" PointY="64.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="41.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="38.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="96.375" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="14.25" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="60.875" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="63.875" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="11.75" PointY="2.875" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="14" PointY="3" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_RESULTS" Width="1.5" PointX="13.5" PointY="28.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="25.75" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_EXTENSIONS" Width="1.5" PointX="11.25" PointY="28.25" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="27.25" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="3" PointY="55.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="55.75" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="15.75" PointY="35.375" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="39.5" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="14.5" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="11.25" PointY="24.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="24.75" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="12.25" PointY="45.25" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="13.75" PointY="6.625" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="12" PointY="59.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="13.75" PointY="11.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="11.75" PointY="15.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="15.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="6.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="15.75" PointY="11.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="16.625" />
+        <EntityTypeShape EntityType="RemoteModel.TENSILE_RESULTS" Width="1.5" PointX="15.75" PointY="26.125" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="49.375" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="5.25" PointY="54.75" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="22.375" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_APPLICATIONS" Width="1.5" PointX="9" PointY="70.5" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_BRANDS" Width="1.5" PointX="9" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_FAMILIES" Width="1.5" PointX="9" PointY="19.625" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_GLOSS_LEVELS" Width="1.5" PointX="9" PointY="52.25" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_GROUPS" Width="1.5" PointX="9" PointY="49.625" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_INDUSTRYSECTORS" Width="1.5" PointX="9" PointY="55" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_MANUFACTURERS" Width="1.5" PointX="16.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_SUB_FAMILIES" Width="1.5" PointX="9" PointY="73.25" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_TEXTURINGS" Width="1.5" PointX="9" PointY="57.75" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_TYPES" Width="1.5" PointX="9" PointY="22.375" />
+        <EntityTypeShape EntityType="RemoteModel.YARN_WHITE_SHADES" Width="1.5" PointX="9" PointY="12.875" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -209,7 +210,6 @@
         <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GLOSS_LEVELS" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_GROUPS" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_INDUSTRYSECTORS" />
-        <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_MANUFACTURERS" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_SUB_FAMILIES" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TEXTURINGS" />
         <AssociationConnector Association="RemoteModel.FK_RMLS_EXTENSIONS_YARN_TYPES" />
@@ -222,7 +222,7 @@
         <AssociationConnector Association="RemoteModel.FK_SPOOLS_SPOOL_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_TANGO_VERSIONS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ROLES_USERS" />
-      </Diagram>
+        </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
 </edmx:Edmx>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MANUFACTURERS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MANUFACTURERS.cs
index f88fbffe3..068aaa28d 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MANUFACTURERS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/YARN_MANUFACTURERS.cs
@@ -14,18 +14,9 @@ namespace Tango.DAL.Remote.DB
     
     public partial class YARN_MANUFACTURERS
     {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public YARN_MANUFACTURERS()
-        {
-            this.RMLS_EXTENSIONS = new HashSet<RMLS_EXTENSIONS>();
-        }
-    
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public string NAME { get; set; }
-    
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<RMLS_EXTENSIONS> RMLS_EXTENSIONS { get; set; }
     }
 }