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.

21 files changed, 304 insertions, 57 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index b8b9dea44..2bd5bd986 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -116,6 +116,7 @@
     <Compile Include="ViewModels\HardwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\IdsPacksViewVM.cs" />
     <Compile Include="ViewModels\LinearMassDensityUnitsViewVM.cs" />
+    <Compile Include="ViewModels\LiquidTypesRmlsViewVM.cs" />
     <Compile Include="ViewModels\LiquidTypesViewVM.cs" />
     <Compile Include="ViewModels\MachinesViewVM.cs" />
     <Compile Include="ViewModels\MachineVersionsViewVM.cs" />
@@ -322,12 +323,18 @@
     <Compile Include="Views\DBViews\EventTypesView.xaml.cs">
       <DependentUpon>EventTypesView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DBViews\LiquidTypesRmlsView.xaml.cs">
+      <DependentUpon>LiquidTypesRmlsView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\UsersView.xaml.cs">
       <DependentUpon>UsersView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DBViews\EventTypeView.xaml.cs">
       <DependentUpon>EventTypeView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DBViews\LiquidTypesRmlView.xaml.cs">
+      <DependentUpon>LiquidTypesRmlView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\UserView.xaml.cs">
       <DependentUpon>UserView.xaml</DependentUpon>
     </Compile>
@@ -601,6 +608,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\DBViews\LiquidTypesRmlsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\UsersView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -609,6 +620,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\DBViews\LiquidTypesRmlView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\UserView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index 87ac26c4d..ce7eb637b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -54,6 +54,7 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<FiberShapesViewVM>();
             SimpleIoc.Default.Register<FiberSynthsViewVM>();
             SimpleIoc.Default.Register<RmlsViewVM>();
+            SimpleIoc.Default.Register<LiquidTypesRmlsViewVM>();
 
             SimpleIoc.Default.Register<CctsViewVM>();
             SimpleIoc.Default.Register<CatsViewVM>();
@@ -330,5 +331,13 @@ namespace Tango.MachineStudio.DB
                 return ServiceLocator.Current.GetInstance<MidTankTypesViewVM>();
             }
         }
+
+        public static LiquidTypesRmlsViewVM LiquidTypesRmlViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<LiquidTypesRmlsViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs
index 5ffe0d58c..97adfa7d4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs
@@ -12,6 +12,7 @@ namespace Tango.MachineStudio.DB.ViewModels
     {
         public DispenserTypesViewVM(INotificationProvider notification) : base(notification)
         {
+            
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs
new file mode 100644
index 000000000..5b8e3749f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class LiquidTypesRmlsViewVM : DbTableViewModel<LiquidTypesRml>
+    {
+        public LiquidTypesRmlsViewVM(INotificationProvider notification) : base(notification)
+        {
+            
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypeView.xaml
index b6e3336b3..55c995360 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypeView.xaml
@@ -24,6 +24,10 @@
             <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Code,Mode=TwoWay}"></mahapps:NumericUpDown>
             <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
             <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
+            <TextBlock Text="Nanolitter Per Pulse:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.NlPerPulse,Mode=TwoWay}"></mahapps:NumericUpDown>
+            <TextBlock Text="Capacity:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Capacity,Mode=TwoWay}"></mahapps:NumericUpDown>
         </controls:TableGrid>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
index 874629128..040ac5799 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserTypesView.xaml
@@ -17,6 +17,8 @@
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Code" Binding="{Binding Code}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Nanolitter Per Pulse" Binding="{Binding NlPerPulse}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Capacity" Binding="{Binding Capacity}"></DataGridTextColumn>
                 </DataGrid.Columns>
             </DataGrid>
         </controls:DbTableView>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml
new file mode 100644
index 000000000..a3b3f5eed
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml
@@ -0,0 +1,31 @@
+<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.LiquidTypesRmlView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
+              xmlns:global="clr-namespace:Tango.MachineStudio.DB"
+              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
+             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300" DataContext="{x:Static global:ViewModelLocator.LiquidTypesRmlViewVM}">
+
+    <Grid>
+        <controls:TableGrid>
+            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True" IsEnabled="False"></TextBox>
+            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True" IsEnabled="False"></TextBox>
+            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True" IsEnabled="False"></TextBox>
+            <TextBlock Text="Liquid Type:" FontWeight="Bold"></TextBlock>
+            <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidTypes,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <TextBlock Text="RML:" FontWeight="Bold"></TextBlock>
+            <ComboBox ItemsSource="{Binding Adapter.Rmls}" SelectedItem="{Binding EditEntity.Rml}" DisplayMemberPath="Name"></ComboBox>
+            <TextBlock Text="Max nl/cm:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.MaxNlPerCm,Mode=TwoWay}"></mahapps:NumericUpDown>
+        </controls:TableGrid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml.cs
new file mode 100644
index 000000000..baaac7633
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.DB.Views.DBViews
+{
+    /// <summary>
+    /// Interaction logic for UserView.xaml
+    /// </summary>
+    public partial class LiquidTypesRmlView : UserControl
+    {
+        public LiquidTypesRmlView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml
new file mode 100644
index 000000000..f96402432
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml
@@ -0,0 +1,26 @@
+<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.LiquidTypesRmlsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
+             xmlns:global="clr-namespace:Tango.MachineStudio.DB"
+             xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.LiquidTypesRmlViewVM}">
+
+    <Grid>
+        <controls:DbTableView>
+            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.LiquidTypesRmlsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" IsReadOnly="True">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Liquid Type" Binding="{Binding LiquidTypes.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="RML" Binding="{Binding Rml.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Maximum Nanolitter Per Centimeter" Binding="{Binding MaxNlPerCm}"></DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+        </controls:DbTableView>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml.cs
new file mode 100644
index 000000000..9bda7a713
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.MachineStudio.DB.CustomAttributes;
+
+namespace Tango.MachineStudio.DB.Views.DBViews
+{
+    /// <summary>
+    /// Interaction logic for UsersView.xaml
+    /// </summary>
+    [DBView]
+    public partial class LiquidTypesRmlsView : UserControl
+    {
+        public LiquidTypesRmlsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
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>
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs
index ace6c5d5d..d9e57c7f3 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs
@@ -48,6 +48,44 @@ namespace Tango.DAL.Observables
 
         }
 
+        private Double _nlperpulse;
+        /// <summary>
+        /// Gets or sets the dispensertype nl per pulse.
+        /// </summary>
+        [EntityFieldName("NL_PER_PULSE")]
+        public Double NlPerPulse
+        {
+            get 
+            {
+                return _nlperpulse; 
+            }
+
+            set 
+            {
+                _nlperpulse = value; RaisePropertyChanged(nameof(NlPerPulse)); 
+            }
+
+        }
+
+        private Double _capacity;
+        /// <summary>
+        /// Gets or sets the dispensertype capacity.
+        /// </summary>
+        [EntityFieldName("CAPACITY")]
+        public Double Capacity
+        {
+            get 
+            {
+                return _capacity; 
+            }
+
+            set 
+            {
+                _capacity = value; RaisePropertyChanged(nameof(Capacity)); 
+            }
+
+        }
+
         private ObservableCollection<IdsPack> _idspacks;
         /// <summary>
         /// Gets or sets the dispensertype ids packs.
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs
index 996cd8f5d..f2116bb65 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs
@@ -48,6 +48,25 @@ namespace Tango.DAL.Observables
 
         }
 
+        private Double _maxnlpercm;
+        /// <summary>
+        /// Gets or sets the liquidtypesrml max nl per cm.
+        /// </summary>
+        [EntityFieldName("MAX_NL_PER_CM")]
+        public Double MaxNlPerCm
+        {
+            get 
+            {
+                return _maxnlpercm; 
+            }
+
+            set 
+            {
+                _maxnlpercm = value; RaisePropertyChanged(nameof(MaxNlPerCm)); 
+            }
+
+        }
+
         private LiquidType _liquidtypes;
         /// <summary>
         /// Gets or sets the liquidtypesrml liquid types.
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
index 53f40fd30..384f10dc7 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
@@ -241,6 +241,8 @@ namespace Tango.DAL.Observables
 
             Rmls = Context.RMLS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Rml>(x)).ToObservableCollection();
 
+            LiquidTypesRmls = Context.LIQUID_TYPES_RMLS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<LiquidTypesRml>(x)).ToObservableCollection();
+
             Ccts = Context.CCTS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Cct>(x)).ToObservableCollection();
 
             Cats = Context.CATS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Cat>(x)).ToObservableCollection();
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs
index 878d9a14d..1bf5a8e0e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs
@@ -26,6 +26,8 @@ namespace Tango.DAL.Remote.DB
         public bool DELETED { get; set; }
         public int CODE { get; set; }
         public string NAME { get; set; }
+        public double NL_PER_PULSE { get; set; }
+        public double CAPACITY { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs
index c77b4fa5d..4a521f980 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs
@@ -20,6 +20,7 @@ namespace Tango.DAL.Remote.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; }
     
         public virtual LIQUID_TYPES LIQUID_TYPES { get; set; }
         public virtual RML RML { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index faa13393b..c1e7d53c4 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -160,6 +160,8 @@
           <Property Name="DELETED" Type="bit" Nullable="false" />
           <Property Name="CODE" Type="int" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="NL_PER_PULSE" Type="float" Nullable="false" />
+          <Property Name="CAPACITY" Type="float" 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="varchar" MaxLength="36" Nullable="false" />
           <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="MAX_NL_PER_CM" Type="float" Nullable="false" />
         </EntityType>
         <EntityType Name="MACHINE_VERSIONS">
           <Key>
@@ -1664,6 +1667,8 @@
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <Property Name="CODE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="NL_PER_PULSE" Type="Double" Nullable="false" />
+          <Property Name="CAPACITY" Type="Double" Nullable="false" />
           <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_IDS_PACKS_DISPENSER_TYPES" FromRole="DISPENSER_TYPES" ToRole="IDS_PACKS" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
@@ -1812,6 +1817,7 @@
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="MAX_NL_PER_CM" Type="Double" Nullable="false" />
           <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_LIQUIDS_RML_LIQUIDS" FromRole="LIQUID_TYPES_RMLS" ToRole="LIQUID_TYPES" />
           <NavigationProperty Name="RML" Relationship="RemoteModel.FK_LIQUIDS_RML_RML" FromRole="LIQUID_TYPES_RMLS" ToRole="RML" />
         </EntityType>
@@ -2778,6 +2784,8 @@
           <EntitySetMapping Name="DISPENSER_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.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" />
@@ -2918,6 +2926,7 @@
           <EntitySetMapping Name="LIQUID_TYPES_RMLS">
             <EntityTypeMapping TypeName="RemoteModel.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.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 7bb2e31b2..60d141af1 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,46 +5,46 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="12.5" PointY="41.625" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3" PointY="22.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="9.75" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="14.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="23.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="15.5" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3" PointY="26.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="29.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="17" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="9.625" />
         <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="12.75" PointY="11.25" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="16.25" PointY="21.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="8.125" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3" PointY="27.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="26.5" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="7.5" PointY="20.5" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="14.75" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="11.75" PointY="28.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="11.75" PointY="34.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="29.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="8.875" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="11.75" PointY="25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="14.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="16.25" PointY="17.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="5.25" PointY="14.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="7.5" PointY="10.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="10.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="9.75" PointY="14" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="11.75" PointY="31.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="11.75" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="11.75" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="11.75" PointY="18.5" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="18.75" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="5.25" PointY="25.125" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="13.5" PointY="38.25" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="14" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="13.5" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="15.75" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="5.75" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="7.5" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="15.75" PointY="12.625" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="9.75" PointY="14.125" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="17.25" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="8" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3" PointY="22.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="13.875" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="26.375" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="10.5" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="17.75" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="12.75" PointY="22.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="12.75" PointY="32" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="23.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="12.75" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="18.125" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="17.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="5.25" PointY="14.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="7.5" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="12.75" PointY="10.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="12.75" PointY="29.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="12.75" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="12.75" PointY="25.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="12.75" PointY="15" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="5.25" PointY="24.875" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="10.5" PointY="39.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="15" PointY="15.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="10.5" PointY="35.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="12.75" PointY="35.5" />
+        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="5.75" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="10.5" PointY="4.875" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="12.75" PointY="5.5" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />