Added Mid Tanks to DB.

Started implementing Machine Designer.

6 files changed, 89 insertions, 12 deletions

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 cb94d5f67..c4ffb0cf2 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
@@ -21,6 +21,8 @@ namespace Tango.DAL.Local.DB
         public string CONFIGURATION_GUID { get; set; }
         public string DISPENSER_GUID { get; set; }
         public string LIQUID_TYPE_GUID { get; set; }
-        public string CARTRIDGE_GUID { get; set; }
+        public string CARTRIDGE_TYPE_GUID { get; set; }
+        public string MID_TANK_TYPE_GUID { get; set; }
+        public string NAME { 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 5577ba99f..bcb01953b 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -58,6 +58,7 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<MEDIA_CONDITIONS> MEDIA_CONDITIONS { get; set; }
         public virtual DbSet<MEDIA_MATERIALS> MEDIA_MATERIALS { get; set; }
         public virtual DbSet<MEDIA_PURPOSES> MEDIA_PURPOSES { get; set; }
+        public virtual DbSet<MID_TANK_TYPES> MID_TANK_TYPES { get; set; }
         public virtual DbSet<ORGANIZATION> ORGANIZATIONS { get; set; }
         public virtual DbSet<PERMISSION> PERMISSIONS { get; set; }
         public virtual DbSet<RML> RMLS { 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 bd3f0e69c..c90afa5ef 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -271,7 +271,9 @@
           <Property Name="CONFIGURATION_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="DISPENSER_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
-          <Property Name="CARTRIDGE_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" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
@@ -403,6 +405,18 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="CODE" Type="integer" Nullable="false" />
         </EntityType>
+        <EntityType Name="MID_TANK_TYPES">
+          <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="CODE" Type="integer" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LITER_CAPACITY" Type="real" Nullable="false" />
+        </EntityType>
         <EntityType Name="ORGANIZATIONS">
           <Key>
             <PropertyRef Name="ID" />
@@ -545,6 +559,7 @@
           <EntitySet Name="MEDIA_CONDITIONS" EntityType="Self.MEDIA_CONDITIONS" store:Type="Tables" />
           <EntitySet Name="MEDIA_MATERIALS" EntityType="Self.MEDIA_MATERIALS" store:Type="Tables" />
           <EntitySet Name="MEDIA_PURPOSES" EntityType="Self.MEDIA_PURPOSES" store:Type="Tables" />
+          <EntitySet Name="MID_TANK_TYPES" EntityType="Self.MID_TANK_TYPES" store:Type="Tables" />
           <EntitySet Name="ORGANIZATIONS" EntityType="Self.ORGANIZATIONS" store:Type="Tables" />
           <EntitySet Name="PERMISSIONS" EntityType="Self.PERMISSIONS" store:Type="Tables" />
           <EntitySet Name="RMLS" EntityType="Self.RMLS" store:Type="Tables" />
@@ -592,6 +607,7 @@
           <EntitySet Name="MEDIA_CONDITIONS" EntityType="LocalModel.MEDIA_CONDITIONS" />
           <EntitySet Name="MEDIA_MATERIALS" EntityType="LocalModel.MEDIA_MATERIALS" />
           <EntitySet Name="MEDIA_PURPOSES" EntityType="LocalModel.MEDIA_PURPOSES" />
+          <EntitySet Name="MID_TANK_TYPES" EntityType="LocalModel.MID_TANK_TYPES" />
           <EntitySet Name="ORGANIZATIONS" EntityType="LocalModel.ORGANIZATION" />
           <EntitySet Name="PERMISSIONS" EntityType="LocalModel.PERMISSION" />
           <EntitySet Name="RMLS" EntityType="LocalModel.RML" />
@@ -867,7 +883,9 @@
           <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_TYPE_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" />
+          <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" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
@@ -999,6 +1017,18 @@
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="CODE" Type="Int64" Nullable="false" />
         </EntityType>
+        <EntityType Name="MID_TANK_TYPES">
+          <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="CODE" Type="Int64" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LITER_CAPACITY" Type="Double" Nullable="false" />
+        </EntityType>
         <EntityType Name="ORGANIZATION">
           <Key>
             <PropertyRef Name="ID" />
@@ -1392,7 +1422,9 @@
           <EntitySetMapping Name="IDS_PACKS">
             <EntityTypeMapping TypeName="LocalModel.IDS_PACKS">
               <MappingFragment StoreEntitySet="IDS_PACKS">
-                <ScalarProperty Name="CARTRIDGE_GUID" ColumnName="CARTRIDGE_GUID" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <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="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
@@ -1544,6 +1576,19 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="MID_TANK_TYPES">
+            <EntityTypeMapping TypeName="LocalModel.MID_TANK_TYPES">
+              <MappingFragment StoreEntitySet="MID_TANK_TYPES">
+                <ScalarProperty Name="LITER_CAPACITY" ColumnName="LITER_CAPACITY" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
+                <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="ORGANIZATIONS">
             <EntityTypeMapping TypeName="LocalModel.ORGANIZATION">
               <MappingFragment StoreEntitySet="ORGANIZATIONS">
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 f9884e5ba..ac5b442be 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -38,14 +38,15 @@
         <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.ORGANIZATION" Width="1.5" PointX="10.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="12.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="14.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="4.75" />
-        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="16.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="16.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="14.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" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MID_TANK_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MID_TANK_TYPES.cs
new file mode 100644
index 000000000..75eb1ba64
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MID_TANK_TYPES.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <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 MID_TANK_TYPES
+    {
+        public long ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+        public long CODE { get; set; }
+        public string NAME { get; set; }
+        public double LITER_CAPACITY { 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 16e1101a7..1770a031a 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -179,6 +179,9 @@
     <Compile Include="DB\MEDIA_PURPOSES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\MID_TANK_TYPES.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\ORGANIZATION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>