Removed Dispensers & Cartridges!

Only Dispenser Type & CartridgeType now.

15 files changed, 19 insertions, 338 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 ca71f1897..b8b9dea44 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
@@ -100,7 +100,6 @@
     <Compile Include="ViewModels\ApplicationFirmwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\ApplicationOsVersionsViewVM.cs" />
     <Compile Include="ViewModels\ApplicationVersionsViewVM.cs" />
-    <Compile Include="ViewModels\CartridgesViewVM.cs" />
     <Compile Include="ViewModels\CartridgeTypesViewVM.cs" />
     <Compile Include="ViewModels\CatsViewVM.cs" />
     <Compile Include="ViewModels\CctsViewVM.cs" />
@@ -109,7 +108,6 @@
     <Compile Include="ViewModels\DbTableViewModel.cs" />
     <Compile Include="ViewModels\DialogOpenMode.cs" />
     <Compile Include="ViewModels\DispenserTypesViewVM.cs" />
-    <Compile Include="ViewModels\DispensersViewVM.cs" />
     <Compile Include="ViewModels\EmbeddedFirmwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\EmbeddedSoftwareVersionsViewVM.cs" />
     <Compile Include="ViewModels\EventTypesViewVM.cs" />
@@ -219,24 +217,12 @@
     <Compile Include="Views\DBViews\CartridgeTypesView.xaml.cs">
       <DependentUpon>CartridgeTypesView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\CartridgesView.xaml.cs">
-      <DependentUpon>CartridgesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DBViews\DispensersView.xaml.cs">
-      <DependentUpon>DispensersView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\DispenserTypesView.xaml.cs">
       <DependentUpon>DispenserTypesView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DBViews\CartridgeTypeView.xaml.cs">
       <DependentUpon>CartridgeTypeView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\CartridgeView.xaml.cs">
-      <DependentUpon>CartridgeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DBViews\DispenserView.xaml.cs">
-      <DependentUpon>DispenserView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\DispenserTypeView.xaml.cs">
       <DependentUpon>DispenserTypeView.xaml</DependentUpon>
     </Compile>
@@ -475,14 +461,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\CartridgesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\DBViews\DispensersView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\DispenserTypesView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -491,14 +469,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\CartridgeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\DBViews\DispenserView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\DispenserTypeView.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 3079f8e5f..87ac26c4d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -36,10 +36,8 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<HardwareVersionsViewVM>();
 
             SimpleIoc.Default.Register<IdsPacksViewVM>();
-            SimpleIoc.Default.Register<DispensersViewVM>();
             SimpleIoc.Default.Register<DispenserTypesViewVM>();
             SimpleIoc.Default.Register<LiquidTypesViewVM>();
-            SimpleIoc.Default.Register<CartridgesViewVM>();
             SimpleIoc.Default.Register<CartridgeTypesViewVM>();
             SimpleIoc.Default.Register<MidTankTypesViewVM>();
 
@@ -197,14 +195,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static DispensersViewVM DispensersViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<DispensersViewVM>();
-            }
-        }
-
         public static DispenserTypesViewVM DispenserTypesViewVM
         {
             get
@@ -221,14 +211,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static CartridgesViewVM CartridgesViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<CartridgesViewVM>();
-            }
-        }
-
         public static CartridgeTypesViewVM CartridgeTypesViewVM
         {
             get
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgesViewVM.cs
deleted file mode 100644
index 8db217013..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgesViewVM.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-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 CartridgesViewVM : DbTableViewModel<Cartridge>
-    {
-        public CartridgesViewVM(INotificationProvider notification) : base(notification)
-        {
-            
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispensersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispensersViewVM.cs
deleted file mode 100644
index 0242c1dc7..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispensersViewVM.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-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 DispensersViewVM : DbTableViewModel<Dispenser>
-    {
-        public DispensersViewVM(INotificationProvider notification) : base(notification)
-        {
-            
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml
deleted file mode 100644
index 98adef136..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.CartridgeView"
-             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:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels"
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:CartridgesViewVM, IsDesignTimeCreatable=False}">
-    
-    <Grid>
-        <controls:TableGrid>
-            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Serial Number:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.SerialNumber}"></TextBox>
-            <TextBlock Text="Cartridge Type:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.CartridgeTypes}" SelectedItem="{Binding EditEntity.CartridgeTypes,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
-        </controls:TableGrid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml.cs
deleted file mode 100644
index d2402426c..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgeView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-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 MachineView.xaml
-    /// </summary>
-    public partial class CartridgeView : UserControl
-    {
-        public CartridgeView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml
deleted file mode 100644
index 3fa7d0200..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.CartridgesView"
-             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:global="clr-namespace:Tango.MachineStudio.DB"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.CartridgesViewVM}">
-    <Grid>
-        <controls:DbTableView>
-            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.CartridgesViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Serial Number" Binding="{Binding SerialNumber}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Cartridge Type" Binding="{Binding CartridgeTypes.Name}"></DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-        </controls:DbTableView>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml.cs
deleted file mode 100644
index 27adfa44e..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CartridgesView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-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;
-using Tango.MachineStudio.DB.Managers;
-using Tango.SharedUI.Controls;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachinesView.xaml
-    /// </summary>
-    [DBView]
-    public partial class CartridgesView : UserControl
-    {
-        public CartridgesView() : base()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml
deleted file mode 100644
index 7dc4ec1ff..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.DispenserView"
-             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:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels"
-             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
-             mc:Ignorable="d" 
-             d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:DispensersViewVM, IsDesignTimeCreatable=False}">
-    
-    <Grid>
-        <controls:TableGrid>
-            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Serial Number:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.SerialNumber}"></TextBox>
-            <TextBlock Text="Dispenser Type:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.DispenserTypes}" SelectedItem="{Binding EditEntity.DispenserTypes,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
-        </controls:TableGrid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml.cs
deleted file mode 100644
index 4ad5d74fe..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispenserView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-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 MachineView.xaml
-    /// </summary>
-    public partial class DispenserView : UserControl
-    {
-        public DispenserView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml
deleted file mode 100644
index 7fdb70bbe..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.DispensersView"
-             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:global="clr-namespace:Tango.MachineStudio.DB"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.DispensersViewVM}">
-    <Grid>
-        <controls:DbTableView>
-            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.DispensersViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Serial Number" Binding="{Binding SerialNumber}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Dispenser Type" Binding="{Binding DispenserTypes.Name}"></DataGridTextColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-        </controls:DbTableView>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml.cs
deleted file mode 100644
index d86bd2e31..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/DispensersView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-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;
-using Tango.MachineStudio.DB.Managers;
-using Tango.SharedUI.Controls;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachinesView.xaml
-    /// </summary>
-    [DBView]
-    public partial class DispensersView : UserControl
-    {
-        public DispensersView() : base()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index d87527fa7..96b66c204 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -20,6 +20,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
     {
         private bool _isSaving;
         private INotificationProvider _notification;
+        
 
         #region Properties
 
@@ -190,7 +191,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             collections.Add(Adapter.EmbeddedFirmwareVersionsViewSource);
             collections.Add(Adapter.ApplicationOsVersionsViewSource);
             collections.Add(Adapter.ApplicationVersionsViewSource);
-            collections.Add(Adapter.DispensersViewSource);
+            collections.Add(Adapter.DispenserTypesViewSource);
             collections.Add(Adapter.CartridgeTypesViewSource);
             collections.Add(Adapter.LiquidTypesViewSource);
             collections.Add(Adapter.MidTankTypesViewSource);
@@ -316,12 +317,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <summary>
         /// Drops the dispenser.
         /// </summary>
-        /// <param name="dispenser">The dispenser.</param>
+        /// <param name="dispenserType">The dispenser.</param>
         /// <param name="idsPack">The ids pack.</param>
-        public void DropDispenser(Dispenser dispenser, IdsPack idsPack)
+        public void DropDispenserType(DispenserType dispenserType, IdsPack idsPack)
         {
-            idsPack.Dispenser = dispenser;
-            idsPack.DispenserGuid = dispenser.Guid;
+            idsPack.DispenserTypes = dispenserType;
+            idsPack.DispenserTypeGuid = dispenserType.Guid;
         }
 
         /// <summary>
@@ -455,9 +456,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 {
                     errors.Add(String.Format("Cartridge type is required on IDS pack '{0}'.", pack.Name));
                 }
-                if (pack.Dispenser == null)
+                if (pack.DispenserTypes == null)
                 {
-                    errors.Add(String.Format("Dispenser is required on IDS pack '{0}'.", pack.Name));
+                    errors.Add(String.Format("Dispenser type is required on IDS pack '{0}'.", pack.Name));
                 }
                 if (pack.LiquidTypes == null)
                 {
@@ -467,15 +468,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 {
                     errors.Add(String.Format("Mid Tank type is required on IDS pack '{0}'.", pack.Name));
                 }
-
-                var taken_ids = Adapter.Machines.Where(x => x.SerialNumber.ToLower() != Machine.SerialNumber).SelectMany(x => x.MachinesConfigurations).Select(x => x.Configuration).SelectMany(x => x.IdsPacks).ToList().FirstOrDefault(x => x.Dispenser.SerialNumber.ToLower() == pack.Dispenser.SerialNumber.ToLower());
-                if (taken_ids != null && taken_ids.Configuration.MachinesConfigurations.Count > 0)
-                {
-                    if (!_notification.ShowQuestion(String.Format("The Dispenser '{1}' on IDS pack '{0}' is already taken by another machine ('{2}', '{3}'). Are you sure you want to assign it to this machine?", pack.Name, pack.Dispenser.SerialNumber, taken_ids.Configuration.MachinesConfigurations.First().Machine.Name, taken_ids.Configuration.MachinesConfigurations.First().Machine.SerialNumber)))
-                    {
-                        return;
-                    }
-                }
             }
 
             if (errors.Count > 0)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
index 5324959e4..8f955beea 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
@@ -189,7 +189,7 @@
                                                                 <Image.Style>
                                                                     <Style TargetType="Image">
                                                                         <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding Dispenser}" Value="{x:Null}">
+                                                                            <DataTrigger Binding="{Binding DispenserTypes}" Value="{x:Null}">
                                                                                 <Setter Property="Opacity" Value="0.2"></Setter>
                                                                             </DataTrigger>
                                                                         </Style.Triggers>
@@ -403,17 +403,17 @@
                                         <StackPanel Margin="20 0 0 0">
                                             <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
                                                 <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/injection.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Dispenser:</Run> <Run FontStyle="Italic" Text="{Binding Dispenser.SerialNumber}"></Run></TextBlock>
-                                            </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
-                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/cartridge.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Cartridge:</Run> <Run FontStyle="Italic" Text="{Binding CartridgeTypes.Name}"></Run></TextBlock>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Dispenser:</Run> <Run FontStyle="Italic" Text="{Binding DispenserTypes.Name}"></Run></TextBlock>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
                                                 <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/tank.png" Width="12" VerticalAlignment="Center"></Image>
                                                 <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Mid Tank:</Run> <Run FontStyle="Italic" Text="{Binding MidTankTypes.Name}"></Run></TextBlock>
                                             </StackPanel>
                                             <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
+                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/cartridge.png" Width="12" VerticalAlignment="Center"></Image>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Cartridge:</Run> <Run FontStyle="Italic" Text="{Binding CartridgeTypes.Name}"></Run></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
                                                 <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/liquid.png" Width="12" VerticalAlignment="Center"></Image>
                                                 <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Liquid:</Run> <Run FontStyle="Italic" Text="{Binding LiquidTypes.Name}"></Run></TextBlock>
                                             </StackPanel>
@@ -502,7 +502,7 @@
                             <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
                                 <StackPanel>
                                     <Expander HorizontalAlignment="Stretch" Header="Dispensers">
-                                        <ListBox ItemsSource="{Binding Adapter.DispensersViewSource}" HorizontalContentAlignment="Stretch">
+                                        <ListBox ItemsSource="{Binding Adapter.DispenserTypesViewSource}" HorizontalContentAlignment="Stretch">
                                             <ListBox.ItemContainerStyle>
                                                 <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                                                     <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
@@ -516,8 +516,7 @@
                                                         <StackPanel Orientation="Horizontal" Margin="2 8">
                                                             <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/injection.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
                                                             <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding DispenserTypes.Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray" Margin="0 2 0 0"><Run Text="{Binding SerialNumber}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
index 44ce75c12..6d08a10e0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
@@ -70,7 +70,7 @@ namespace Tango.MachineStudio.MachineDesigner.Views
             {
                 SetHighlightRegion(gridEmbedded);
             }
-            else if (e.DataContext is Dispenser || e.DataContext is Cartridge || e.DataContext is LiquidType || e.DataContext is MidTankType)
+            else if (e.DataContext is DispenserType || e.DataContext is CartridgeType || e.DataContext is LiquidType || e.DataContext is MidTankType)
             {
                 SetHighlightRegion(gridIds);
             }
@@ -86,9 +86,9 @@ namespace Tango.MachineStudio.MachineDesigner.Views
 
         private void OnDropOnIdsPack(object sender, DropEventArgs e)
         {
-            if (e.Draggable.DataContext is Dispenser)
+            if (e.Draggable.DataContext is DispenserType)
             {
-                _vm.DropDispenser(e.Draggable.DataContext as Dispenser, e.Droppable.DataContext as IdsPack);
+                _vm.DropDispenserType(e.Draggable.DataContext as DispenserType, e.Droppable.DataContext as IdsPack);
             }
             else if (e.Draggable.DataContext is LiquidType)
             {