From 8b4e0971171d40844ca1c63591aeb1fbe4add759 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 10 Dec 2017 13:21:59 +0200
Subject: Added DAL.Observables project. Changes DB table
 CONFIGURATIONS_DISPENSER to IDS_PACKS. CHanges DB table SYNC_CONFIGURATION to
 SYNC_CONFIGURATIONS

---
 .../DB/CONFIGURATIONS_DISPENSERS.cs                | 26 ------
 .../Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs  | 26 ++++++
 .../Tango.DAL.Local/DB/LocalADO.Context.cs         |  4 +-
 .../Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx | 98 +++++++++++-----------
 .../Tango.DAL.Local/DB/LocalADO.edmx.diagram       | 50 +++++------
 .../Tango.DAL.Local/DB/SYNC_CONFIGURATION.cs       | 21 -----
 .../Tango.DAL.Local/DB/SYNC_CONFIGURATIONS.cs      | 21 +++++
 .../Tango.DAL.Local/Tango.DAL.Local.csproj         |  8 +-
 8 files changed, 127 insertions(+), 127 deletions(-)
 delete mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATIONS_DISPENSERS.cs
 create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
 delete mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATION.cs
 create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATIONS.cs

(limited to 'Software/Visual_Studio/Tango.DAL.Local')

diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATIONS_DISPENSERS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATIONS_DISPENSERS.cs
deleted file mode 100644
index 2e0a1a7f3..000000000
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATIONS_DISPENSERS.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <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.Local.DB
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class CONFIGURATIONS_DISPENSERS
-    {
-        public long ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public bool DELETED { get; set; }
-        public string CONFIGURATION_GUID { get; set; }
-        public string DISPENSER_GUID { get; set; }
-        public string LIQUID_GUID { get; set; }
-        public string CARTRIDGE_GUID { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
new file mode 100644
index 000000000..f97fed77c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.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.Local.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class IDS_PACKS
+    {
+        public long ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+        public string CONFIGURATION_GUID { get; set; }
+        public string DISPENSER_GUID { get; set; }
+        public string LIQUID_GUID { get; set; }
+        public string CARTRIDGE_GUID { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
index 68f08b6b1..cef37a5d8 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -34,7 +34,6 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; }
         public virtual DbSet<CARTRIDGE> CARTRIDGES { get; set; }
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; }
-        public virtual DbSet<CONFIGURATIONS_DISPENSERS> CONFIGURATIONS_DISPENSERS { get; set; }
         public virtual DbSet<CONTACT> CONTACTS { get; set; }
         public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; }
         public virtual DbSet<DISPENSER> DISPENSERS { get; set; }
@@ -45,6 +44,7 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; }
         public virtual DbSet<FIBER_SYNTHESIS> FIBER_SYNTHESIS { get; set; }
         public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; }
+        public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; }
         public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; }
         public virtual DbSet<LIQUID> LIQUIDS { get; set; }
         public virtual DbSet<LIQUIDS_RMLS> LIQUIDS_RMLS { get; set; }
@@ -62,7 +62,7 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<RML> RMLS { get; set; }
         public virtual DbSet<ROLE> ROLES { get; set; }
         public virtual DbSet<ROLES_PERMISSIONS> ROLES_PERMISSIONS { get; set; }
-        public virtual DbSet<SYNC_CONFIGURATION> SYNC_CONFIGURATION { get; set; }
+        public virtual DbSet<SYNC_CONFIGURATIONS> SYNC_CONFIGURATIONS { get; set; }
         public virtual DbSet<USER> USERS { get; set; }
         public virtual DbSet<USERS_ROLES> USERS_ROLES { get; set; }
     }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index 67e38b06d..7b8078983 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -105,19 +105,6 @@
           <Property Name="EMBEDDED_SOFTWARE_VERSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="HARDWARE_VERSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
-        <EntityType Name="CONFIGURATIONS_DISPENSERS">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="integer" Nullable="false" />
-          <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
-          <Property Name="DELETED" Type="bit" Nullable="false" />
-          <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="DISPENSER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="LIQUID_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="CARTRIDGE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-        </EntityType>
         <EntityType Name="CONTACTS">
           <Key>
             <PropertyRef Name="ID" />
@@ -219,6 +206,19 @@
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
         </EntityType>
+        <EntityType Name="IDS_PACKS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="integer" Nullable="false" />
+          <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
+          <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="DISPENSER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LIQUID_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="CARTRIDGE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+        </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
             <PropertyRef Name="ID" />
@@ -421,7 +421,7 @@
           <Property Name="ROLE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="PERMISSION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
-        <EntityType Name="SYNC_CONFIGURATION">
+        <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -464,7 +464,6 @@
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" store:Type="Tables" />
           <EntitySet Name="CARTRIDGES" EntityType="Self.CARTRIDGES" store:Type="Tables" />
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" store:Type="Tables" />
-          <EntitySet Name="CONFIGURATIONS_DISPENSERS" EntityType="Self.CONFIGURATIONS_DISPENSERS" store:Type="Tables" />
           <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" store:Type="Tables" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" store:Type="Tables" />
           <EntitySet Name="DISPENSERS" EntityType="Self.DISPENSERS" store:Type="Tables" />
@@ -475,6 +474,7 @@
           <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" store:Type="Tables" />
           <EntitySet Name="FIBER_SYNTHESIS" EntityType="Self.FIBER_SYNTHESIS" store:Type="Tables" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" store:Type="Tables" />
+          <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" store:Type="Tables" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" store:Type="Tables" />
           <EntitySet Name="LIQUIDS" EntityType="Self.LIQUIDS" store:Type="Tables" />
           <EntitySet Name="LIQUIDS_RMLS" EntityType="Self.LIQUIDS_RMLS" store:Type="Tables" />
@@ -492,7 +492,7 @@
           <EntitySet Name="RMLS" EntityType="Self.RMLS" store:Type="Tables" />
           <EntitySet Name="ROLES" EntityType="Self.ROLES" store:Type="Tables" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="Self.ROLES_PERMISSIONS" store:Type="Tables" />
-          <EntitySet Name="SYNC_CONFIGURATION" EntityType="Self.SYNC_CONFIGURATION" store:Type="Tables" />
+          <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" store:Type="Tables" />
           <EntitySet Name="USERS" EntityType="Self.USERS" store:Type="Tables" />
           <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" store:Type="Tables" />
         </EntityContainer>
@@ -510,7 +510,6 @@
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="LocalModel.CARTRIDGE_TYPES" />
           <EntitySet Name="CARTRIDGES" EntityType="LocalModel.CARTRIDGE" />
           <EntitySet Name="CONFIGURATIONS" EntityType="LocalModel.CONFIGURATION" />
-          <EntitySet Name="CONFIGURATIONS_DISPENSERS" EntityType="LocalModel.CONFIGURATIONS_DISPENSERS" />
           <EntitySet Name="CONTACTS" EntityType="LocalModel.CONTACT" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="LocalModel.DISPENSER_TYPES" />
           <EntitySet Name="DISPENSERS" EntityType="LocalModel.DISPENSER" />
@@ -521,6 +520,7 @@
           <EntitySet Name="FIBER_SHAPES" EntityType="LocalModel.FIBER_SHAPES" />
           <EntitySet Name="FIBER_SYNTHESIS" EntityType="LocalModel.FIBER_SYNTHESIS" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="LocalModel.HARDWARE_VERSIONS" />
+          <EntitySet Name="IDS_PACKS" EntityType="LocalModel.IDS_PACKS" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" />
           <EntitySet Name="LIQUIDS" EntityType="LocalModel.LIQUID" />
           <EntitySet Name="LIQUIDS_RMLS" EntityType="LocalModel.LIQUIDS_RMLS" />
@@ -538,7 +538,7 @@
           <EntitySet Name="RMLS" EntityType="LocalModel.RML" />
           <EntitySet Name="ROLES" EntityType="LocalModel.ROLE" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="LocalModel.ROLES_PERMISSIONS" />
-          <EntitySet Name="SYNC_CONFIGURATION" EntityType="LocalModel.SYNC_CONFIGURATION" />
+          <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="LocalModel.SYNC_CONFIGURATIONS" />
           <EntitySet Name="USERS" EntityType="LocalModel.USER" />
           <EntitySet Name="USERS_ROLES" EntityType="LocalModel.USERS_ROLES" />
         </EntityContainer>
@@ -642,19 +642,6 @@
           <Property Name="EMBEDDED_SOFTWARE_VERSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="HARDWARE_VERSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
-        <EntityType Name="CONFIGURATIONS_DISPENSERS">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="Int64" Nullable="false" />
-          <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
-          <Property Name="DELETED" Type="Boolean" Nullable="false" />
-          <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-        </EntityType>
         <EntityType Name="CONTACT">
           <Key>
             <PropertyRef Name="ID" />
@@ -756,6 +743,19 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
         </EntityType>
+        <EntityType Name="IDS_PACKS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int64" Nullable="false" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
+          <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="DISPENSER_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LIQUID_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="CARTRIDGE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+        </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
             <PropertyRef Name="ID" />
@@ -958,7 +958,7 @@
           <Property Name="ROLE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="PERMISSION_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
-        <EntityType Name="SYNC_CONFIGURATION">
+        <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
@@ -1106,20 +1106,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="CONFIGURATIONS_DISPENSERS">
-            <EntityTypeMapping TypeName="LocalModel.CONFIGURATIONS_DISPENSERS">
-              <MappingFragment StoreEntitySet="CONFIGURATIONS_DISPENSERS">
-                <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" />
-                <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" />
-                <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" />
-                <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
-                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="CONTACTS">
             <EntityTypeMapping TypeName="LocalModel.CONTACT">
               <MappingFragment StoreEntitySet="CONTACTS">
@@ -1231,6 +1217,20 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="IDS_PACKS">
+            <EntityTypeMapping TypeName="LocalModel.IDS_PACKS">
+              <MappingFragment StoreEntitySet="IDS_PACKS">
+                <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" />
+                <ScalarProperty Name="LIQUID_GUID" ColumnName="LIQUID_GUID" />
+                <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" />
+                <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
+                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="LINEAR_MASS_DENSITY_UNITS">
             <EntityTypeMapping TypeName="LocalModel.LINEAR_MASS_DENSITY_UNITS">
               <MappingFragment StoreEntitySet="LINEAR_MASS_DENSITY_UNITS">
@@ -1450,9 +1450,9 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="SYNC_CONFIGURATION">
-            <EntityTypeMapping TypeName="LocalModel.SYNC_CONFIGURATION">
-              <MappingFragment StoreEntitySet="SYNC_CONFIGURATION">
+          <EntitySetMapping Name="SYNC_CONFIGURATIONS">
+            <EntityTypeMapping TypeName="LocalModel.SYNC_CONFIGURATIONS">
+              <MappingFragment StoreEntitySet="SYNC_CONFIGURATIONS">
                 <ScalarProperty Name="SYNC_TYPE" ColumnName="SYNC_TYPE" />
                 <ScalarProperty Name="TABLE_NAME" ColumnName="TABLE_NAME" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
index c47285d87..6f8768e4b 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -14,37 +14,37 @@
         <EntityTypeShape EntityType="LocalModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.CARTRIDGE" Width="1.5" PointX="6.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="4.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATIONS_DISPENSERS" Width="1.5" PointX="6.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="0.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="10.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="10.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESIS" Width="1.5" PointX="10.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="6.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT" Width="1.5" PointX="8.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENTS_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHESIS" Width="1.5" PointX="10.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="10.75" PointY="9.75" />
         <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="2.75" PointY="11.75" />
         <EntityTypeShape EntityType="LocalModel.LIQUID" Width="1.5" PointX="4.75" PointY="11.75" />
         <EntityTypeShape EntityType="LocalModel.LIQUIDS_RMLS" Width="1.5" PointX="12.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="6.75" />
         <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="6.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="8.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="12.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="14.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="10.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="12.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="14.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="2.75" PointY="15.75" />
-        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATION" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="16.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="4.75" PointY="16.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="8.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="10.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="12.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="14.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="14.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="2.75" PointY="15.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="16.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="4.75" PointY="16.75" />
+        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="6.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATION.cs
deleted file mode 100644
index ab7b23673..000000000
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATION.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-//------------------------------------------------------------------------------
-// <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.Local.DB
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class SYNC_CONFIGURATION
-    {
-        public long ID { get; set; }
-        public string TABLE_NAME { get; set; }
-        public long SYNC_TYPE { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATIONS.cs
new file mode 100644
index 000000000..cd4c89899
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/SYNC_CONFIGURATIONS.cs
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+// <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.Local.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class SYNC_CONFIGURATIONS
+    {
+        public long ID { get; set; }
+        public string TABLE_NAME { get; set; }
+        public long SYNC_TYPE { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index 7ace8155c..f891e703d 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -92,9 +92,6 @@
     <Compile Include="DB\CONFIGURATION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\CONFIGURATIONS_DISPENSERS.cs">
-      <DependentUpon>LocalADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\CONTACT.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
@@ -125,6 +122,9 @@
     <Compile Include="DB\HARDWARE_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\IDS_PACKS.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\LINEAR_MASS_DENSITY_UNITS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
@@ -191,7 +191,7 @@
     <Compile Include="DB\ROLES_PERMISSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\SYNC_CONFIGURATION.cs">
+    <Compile Include="DB\SYNC_CONFIGURATIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
     <Compile Include="DB\USER.cs">
-- 
cgit v1.3.1