Removed Dispensers & Cartridges!

Only Dispenser Type & CartridgeType now.

7 files changed, 37 insertions, 163 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs
deleted file mode 100644
index 23dea85e1..000000000
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE.cs
+++ /dev/null
@@ -1,23 +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 CARTRIDGE
-    {
-        public long ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public bool DELETED { get; set; }
-        public string CARTRIDGE_TYPE_GUID { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
deleted file mode 100644
index dc77b198b..000000000
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
+++ /dev/null
@@ -1,24 +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 DISPENSER
-    {
-        public long ID { get; set; }
-        public string GUID { get; set; }
-        public System.DateTime LAST_UPDATED { get; set; }
-        public bool DELETED { get; set; }
-        public string SERIAL_NUMBER { get; set; }
-        public string DISPENSER_TYPE_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
index 8091dd5d2..e2a9c4425 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
@@ -19,7 +19,7 @@ namespace Tango.DAL.Local.DB
         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 DISPENSER_TYPE_GUID { get; set; }
         public string LIQUID_TYPE_GUID { get; set; }
         public string CARTRIDGE_TYPE_GUID { get; set; }
         public string MID_TANK_TYPE_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 bcb01953b..2d9091e58 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -32,13 +32,11 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<APPLICATION_OS_VERSIONS> APPLICATION_OS_VERSIONS { get; set; }
         public virtual DbSet<APPLICATION_VERSIONS> APPLICATION_VERSIONS { get; set; }
         public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; }
-        public virtual DbSet<CARTRIDGE> CARTRIDGES { get; set; }
         public virtual DbSet<CAT> CATS { get; set; }
         public virtual DbSet<CCT> CCTS { get; set; }
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { 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; }
         public virtual DbSet<EMBEDDED_FIRMWARE_VERSIONS> EMBEDDED_FIRMWARE_VERSIONS { get; set; }
         public virtual DbSet<EMBEDDED_SOFTWARE_VERSIONS> EMBEDDED_SOFTWARE_VERSIONS { get; set; }
         public virtual DbSet<EVENT_TYPES> EVENT_TYPES { 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 85f8c0bad..ab77e4b9b 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -88,16 +88,6 @@
           <Property Name="CODE" Type="integer" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
-        <EntityType Name="CARTRIDGES">
-          <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="CARTRIDGE_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-        </EntityType>
         <EntityType Name="CATS">
           <Key>
             <PropertyRef Name="ID" />
@@ -171,17 +161,6 @@
           <Property Name="CODE" Type="integer" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
-        <EntityType Name="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="SERIAL_NUMBER" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="DISPENSER_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-        </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
             <PropertyRef Name="ID" />
@@ -269,7 +248,7 @@
           <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="DISPENSER_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="CARTRIDGE_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="MID_TANK_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
@@ -534,13 +513,11 @@
           <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="Self.APPLICATION_OS_VERSIONS" store:Type="Tables" />
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="Self.APPLICATION_VERSIONS" store:Type="Tables" />
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" store:Type="Tables" />
-          <EntitySet Name="CARTRIDGES" EntityType="Self.CARTRIDGES" store:Type="Tables" />
           <EntitySet Name="CATS" EntityType="Self.CATS" store:Type="Tables" />
           <EntitySet Name="CCTS" EntityType="Self.CCTS" store:Type="Tables" />
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" 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" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="Self.EMBEDDED_FIRMWARE_VERSIONS" store:Type="Tables" />
           <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="Self.EMBEDDED_SOFTWARE_VERSIONS" store:Type="Tables" />
           <EntitySet Name="EVENT_TYPES" EntityType="Self.EVENT_TYPES" store:Type="Tables" />
@@ -582,13 +559,11 @@
           <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="LocalModel.APPLICATION_OS_VERSIONS" />
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="LocalModel.APPLICATION_VERSIONS" />
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="LocalModel.CARTRIDGE_TYPES" />
-          <EntitySet Name="CARTRIDGES" EntityType="LocalModel.CARTRIDGE" />
           <EntitySet Name="CATS" EntityType="LocalModel.CAT" />
           <EntitySet Name="CCTS" EntityType="LocalModel.CCT" />
           <EntitySet Name="CONFIGURATIONS" EntityType="LocalModel.CONFIGURATION" />
           <EntitySet Name="CONTACTS" EntityType="LocalModel.CONTACT" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="LocalModel.DISPENSER_TYPES" />
-          <EntitySet Name="DISPENSERS" EntityType="LocalModel.DISPENSER" />
           <EntitySet Name="EMBEDDED_FIRMWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" />
           <EntitySet Name="EMBEDDED_SOFTWARE_VERSIONS" EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" />
           <EntitySet Name="EVENT_TYPES" EntityType="LocalModel.EVENT_TYPES" />
@@ -701,16 +676,6 @@
           <Property Name="CODE" Type="Int64" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
-        <EntityType Name="CARTRIDGE">
-          <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="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-        </EntityType>
         <EntityType Name="CAT">
           <Key>
             <PropertyRef Name="ID" />
@@ -784,17 +749,6 @@
           <Property Name="CODE" Type="Int64" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
-        <EntityType Name="DISPENSER">
-          <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="SERIAL_NUMBER" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-          <Property Name="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
-        </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
             <PropertyRef Name="ID" />
@@ -882,7 +836,7 @@
           <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="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="MID_TANK_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
@@ -1235,17 +1189,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="CARTRIDGES">
-            <EntityTypeMapping TypeName="LocalModel.CARTRIDGE">
-              <MappingFragment StoreEntitySet="CARTRIDGES">
-                <ScalarProperty Name="CARTRIDGE_TYPE_GUID" ColumnName="CARTRIDGE_TYPE_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="CATS">
             <EntityTypeMapping TypeName="LocalModel.CAT">
               <MappingFragment StoreEntitySet="CATS">
@@ -1324,18 +1267,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="DISPENSERS">
-            <EntityTypeMapping TypeName="LocalModel.DISPENSER">
-              <MappingFragment StoreEntitySet="DISPENSERS">
-                <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" />
-                <ScalarProperty Name="SERIAL_NUMBER" ColumnName="SERIAL_NUMBER" />
-                <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="EMBEDDED_FIRMWARE_VERSIONS">
             <EntityTypeMapping TypeName="LocalModel.EMBEDDED_FIRMWARE_VERSIONS">
               <MappingFragment StoreEntitySet="EMBEDDED_FIRMWARE_VERSIONS">
@@ -1429,7 +1360,7 @@
                 <ScalarProperty Name="MID_TANK_TYPE_GUID" ColumnName="MID_TANK_TYPE_GUID" />
                 <ScalarProperty Name="CARTRIDGE_TYPE_GUID" ColumnName="CARTRIDGE_TYPE_GUID" />
                 <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" />
-                <ScalarProperty Name="DISPENSER_GUID" ColumnName="DISPENSER_GUID" />
+                <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" />
                 <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
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 ac5b442be..9148e84b6 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -12,41 +12,39 @@
         <EntityTypeShape EntityType="LocalModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="2.75" PointY="4.75" />
         <EntityTypeShape EntityType="LocalModel.APPLICATION_VERSIONS" Width="1.5" PointX="4.75" PointY="3.75" />
         <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.CAT" Width="1.5" PointX="4.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CCT" Width="1.5" PointX="6.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="8.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="4.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="2.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="10.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="8.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="10.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="12.75" PointY="4.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="12.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="12.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="6.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="8.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="2.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="4.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.MID_TANK_TYPES" Width="1.5" PointX="10.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="12.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="16.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="16.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="0.75" PointY="17.75" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="2.75" PointY="17.75" />
+        <EntityTypeShape EntityType="LocalModel.CAT" Width="1.5" PointX="6.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.CCT" Width="1.5" PointX="0.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="2.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="4.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="8.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="10.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="10.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="8.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="10.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="12.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="0.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="2.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="4.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="8.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="10.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="12.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="4.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="14.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.MID_TANK_TYPES" Width="1.5" PointX="14.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="6.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="10.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="14.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="0.75" PointY="16.75" />
+        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="2.75" PointY="16.75" />
+        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="3.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
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 1770a031a..62e4f2953 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -83,9 +83,6 @@
     <Compile Include="DB\APPLICATION_VERSIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\CARTRIDGE.cs">
-      <DependentUpon>LocalADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\CARTRIDGE_TYPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
@@ -101,9 +98,6 @@
     <Compile Include="DB\CONTACT.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\DISPENSER.cs">
-      <DependentUpon>LocalADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\DISPENSER_TYPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>