Added Max_NL_Per_CM to DB Module !!

Added Liquid_Types_Rml table to DB module.
Added new nl/cm to dispenser.
Added capacity to dispenser.

4 files changed, 30 insertions, 18 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs
index 718ab5219..0d8094f81 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs
@@ -20,5 +20,7 @@ namespace Tango.DAL.Local.DB
         public bool DELETED { get; set; }
         public long CODE { get; set; }
         public string NAME { get; set; }
+        public double NL_PER_PULSE { get; set; }
+        public double CAPACITY { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs
index cd8865526..637b61e01 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs
@@ -20,5 +20,6 @@ namespace Tango.DAL.Local.DB
         public bool DELETED { get; set; }
         public string LIQUID_TYPE_GUID { get; set; }
         public string RML_GUID { get; set; }
+        public double MAX_NL_PER_CM { 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 ab77e4b9b..60f35f27c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -160,6 +160,8 @@
           <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="NL_PER_PULSE" Type="real" Nullable="false" />
+          <Property Name="CAPACITY" Type="real" Nullable="false" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
@@ -289,6 +291,7 @@
           <Property Name="DELETED" Type="bit" Nullable="false" />
           <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="RML_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="MAX_NL_PER_CM" Type="real" Nullable="false" />
         </EntityType>
         <EntityType Name="MACHINE_VERSIONS">
           <Key>
@@ -748,6 +751,8 @@
           <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="NL_PER_PULSE" Type="Double" Nullable="false" />
+          <Property Name="CAPACITY" Type="Double" Nullable="false" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
           <Key>
@@ -877,6 +882,7 @@
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="MAX_NL_PER_CM" Type="Double" Nullable="false" />
         </EntityType>
         <EntityType Name="MACHINE_VERSIONS">
           <Key>
@@ -1258,6 +1264,8 @@
           <EntitySetMapping Name="DISPENSER_TYPES">
             <EntityTypeMapping TypeName="LocalModel.DISPENSER_TYPES">
               <MappingFragment StoreEntitySet="DISPENSER_TYPES">
+                <ScalarProperty Name="CAPACITY" ColumnName="CAPACITY" />
+                <ScalarProperty Name="NL_PER_PULSE" ColumnName="NL_PER_PULSE" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
@@ -1398,6 +1406,7 @@
           <EntitySetMapping Name="LIQUID_TYPES_RMLS">
             <EntityTypeMapping TypeName="LocalModel.LIQUID_TYPES_RMLS">
               <MappingFragment StoreEntitySet="LIQUID_TYPES_RMLS">
+                <ScalarProperty Name="MAX_NL_PER_CM" ColumnName="MAX_NL_PER_CM" />
                 <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
                 <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
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 9148e84b6..2d0a148ea 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -23,28 +23,28 @@
         <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.HARDWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="10.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="4.75" PointY="11.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.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="4.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="8.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="6.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="8.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="2.75" PointY="14.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" />
+        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="14.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="10.75" PointY="15.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" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>