Incorporated machine type into machine creation and management + job runs.

30 files changed, 444 insertions, 105 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
index 47fe19a05..ab86d8356 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
@@ -19,6 +19,7 @@ using System.IO;
 using Tango.BL.ActionLogs;
 using Tango.MachineStudio.Common.Authentication;
 using Tango.BL.DTO;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 {
@@ -445,6 +446,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                     await Task.Factory.StartNew(() =>
                     {
                         CurrentVersion.LastUpdated = DateTime.UtcNow;
+                        CurrentVersion.UserName = _authentication.CurrentUser.Email;
+
                         _db.SaveChanges();
 
                         var dtoAfter = HardwareVersionDTO.FromObservable(CurrentVersion);
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
index 9ee2ffee7..134d5d455 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
@@ -14,13 +14,14 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.HardwareDesigner.ViewModels"
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:global="clr-namespace:Tango.MachineStudio.HardwareDesigner"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              mc:Ignorable="d" 
              d:DesignHeight="2000" d:DesignWidth="1280" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <UserControl.Resources>
         <converters:DoubleToIntConverter x:Key="DoubleToIntConverter" />
         <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter" />
-
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
         <Style TargetType="ListBox" x:Key="typesList" BasedOn="{StaticResource {x:Type ListBox}}">
             <Setter Property="FontSize" Value="14"></Setter>
             <Setter Property="ItemContainerStyle">
@@ -58,10 +59,11 @@
                                 <TextBlock FontSize="30" FontStyle="Italic" VerticalAlignment="Center" Margin="50 10 10 0" Foreground="Silver" FontWeight="Bold">HARDWARE DESIGNER</TextBlock>
                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="10 10 0 0">
                                     <materialDesign:PackIcon Kind="Pencil" Width="32" Height="32" Foreground="Silver" />
-                                    <controls:SearchComboBox IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}"  Width="300" SearchProperty="FullName" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
+
+                                    <controls:SearchComboBox IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}"  Width="400" SearchProperty="FullName" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
                                         <ComboBox.ItemTemplate>
                                             <DataTemplate>
-                                                <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
+                                                <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14" Text="{Binding Version}"></Run> <Run Foreground="{StaticResource AccentColorBrush}" FontSize="14" Text="{Binding ForMachineType}"></Run></TextBlock>
                                             </DataTemplate>
                                         </ComboBox.ItemTemplate>
                                     </controls:SearchComboBox>
@@ -385,8 +387,12 @@
                                         <TextBlock Margin="0 10 0 0" FontSize="10" Foreground="{StaticResource GrayBrush}">Name</TextBlock>
                                         <TextBox Text="{Binding CurrentVersion.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
+                                        <TextBlock Margin="0 20 0 0" FontSize="10" Foreground="{StaticResource GrayBrush}">Machine Type</TextBlock>
+                                        <ComboBox ItemsSource="{Binding Source={x:Type enumerations:MachineTypes},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding CurrentVersion.ForMachineType,Mode=TwoWay}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"/>
+
                                         <TextBlock Margin="0 20 0 0" FontSize="10" Foreground="{StaticResource GrayBrush}">Version</TextBlock>
                                         <mahApps:NumericUpDown Minimum="0" BorderThickness="0 0 0 1" HorizontalContentAlignment="Left" Maximum="1000" HasDecimals="True" Value="{Binding CurrentVersion.Version}" Foreground="{StaticResource GrayBrush}"/>
+
                                     </StackPanel>
                                 </materialDesign:Card>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Models/MachineModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Models/MachineModel.cs
index 8a2f5dd9f..38430e197 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Models/MachineModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Models/MachineModel.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 using Tango.Core;
 
 namespace Tango.MachineStudio.MachineDesigner.Models
@@ -12,6 +13,8 @@ namespace Tango.MachineStudio.MachineDesigner.Models
     {
         public String Guid { get; set; }
 
+        public MachineTypes MachineType { get; set; }
+
         public String SerialNumber { get; set; }
 
         public String Name { get; set; }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
index 168ff62dd..c7c7267a4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.MachineDesigner.ViewModels
@@ -32,6 +33,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _serialNumber = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
+        public MachineTypes MachineType { get; set; }
+
         private String _name;
         public String Name
         {
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 c31ea0a53..855f063fc 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
@@ -540,6 +540,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             ActiveMachine.Configuration = new Configuration();
                             ActiveMachine.SerialNumber = machineCreationDialogVM.SerialNumber;
                             ActiveMachine.Name = machineCreationDialogVM.Name;
+                            ActiveMachine.Type = machineCreationDialogVM.MachineType;
                             ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
                         }
                         else
@@ -713,6 +714,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 errors.Add("Hardware version is required.");
             }
 
+            if (ActiveMachine.Configuration.HardwareVersion != null)
+            {
+                if (ActiveMachine.Configuration.HardwareVersion.ForMachineType != ActiveMachine.Type)
+                {
+                    errors.Add($"Hardware version '{ActiveMachine.Configuration.HardwareVersion.Name}' is intended only for {ActiveMachine.Configuration.HardwareVersion.ForMachineType} machines.");
+                }
+            }
+
             foreach (var pack in ActiveMachine.Configuration.IdsPacks)
             {
                 if (pack.LiquidType != null || pack.CartridgeType != null || pack.Dispenser != null || pack.IdsPackFormula != null || pack.MidTankType != null)
@@ -1013,6 +1022,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         x.Guid,
                         x.SerialNumber,
+                        x.MachineType,
                         x.Name,
                         Organization = x.Organization.Name,
                         MachineVersion = x.MachineVersion.Name,
@@ -1030,6 +1040,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     MachineModel model = new MachineModel();
                     model.Guid = machine.Guid;
                     model.SerialNumber = machine.SerialNumber;
+                    model.MachineType = (MachineTypes)machine.MachineType;
                     model.Name = machine.Name;
                     model.Organization = machine.Organization;
                     model.HardwareVersion = machine.HardwareVersionName + " v" + machine.HardwareVersionVersion;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
index 8b3851036..b1a393875 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
@@ -8,11 +8,14 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              mc:Ignorable="d" 
              d:DesignHeight="400" d:DesignWidth="700" Height="460" Width="750" Background="{StaticResource Dialog.Background}" d:DataContext="{d:DesignInstance Type=vm:MachineCreationDialogVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource Dialog.Foreground}">
 
     <UserControl.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></converters:BooleanToVisibilityConverter>
+        <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
+        <converters:IsNullToVisibilityInverseConverter x:Key="IsNullToVisibilityInverseConverter" />
     </UserControl.Resources>
 
     <Grid Margin="10">
@@ -20,7 +23,7 @@
             <Grid DockPanel.Dock="Top">
                 <StackPanel Orientation="Horizontal">
                     <Grid>
-                        <Image Source="../Images/machine-full-fx.png" Width="120" RenderOptions.BitmapScalingMode="Fant"></Image>
+                        <Image Source="{StaticResource Machines}" Width="120" RenderOptions.BitmapScalingMode="Fant"></Image>
                         <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -10 -10" Kind="PlusCircle" Foreground="#15C315" Width="42" Height="42" />
                     </Grid>
                     <TextBlock Margin="30 0 0 0" VerticalAlignment="Bottom" FontSize="22">
@@ -52,11 +55,16 @@
             <Grid>
                 <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20 20 0 0" Width="400">
                     <TextBlock TextWrapping="Wrap" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Run>Specify a machine prototype to create the new machine with default settings and configuration.</Run>
+                        <Run>Specify a machine prototype and machine type to create the new machine with default settings and configuration.</Run>
                     </TextBlock>
 
-                    <ComboBox Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}" ItemsSource="{Binding Prototypes}" SelectedItem="{Binding SelectedPrototype}" DisplayMemberPath="Name" Margin="0 10 0 0" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
-
+                    <DockPanel Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 10 0 0">
+                        <ComboBox x:Name="comboProto" Width="200" ItemsSource="{Binding Prototypes}" SelectedItem="{Binding SelectedPrototype}" DisplayMemberPath="Name" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
+                        <ComboBox Visibility="{Binding ElementName=comboProto,Path=SelectedItem,Converter={StaticResource IsNullToVisibilityInverseConverter}}" Margin="30 0 0 0" ItemsSource="{Binding Source={x:Type enumerations:MachineTypes},Converter={StaticResource EnumToItemsSourceConverter}}" FontSize="16"  SelectedValue="{Binding MachineType,Mode=TwoWay}" SelectedValuePath="Value" DisplayMemberPath="DisplayName">
+                            
+                        </ComboBox>
+                    </DockPanel>
+                    
                     <TextBlock Margin="0 20 0 0" FontSize="10">Serial Number</TextBlock>
                     <TextBox Margin="0 2 0 0" Text="{Binding SerialNumber,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
index 5fda6dbfa..3c73ecc2b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
@@ -22,7 +22,7 @@
         <DockPanel Margin="100" MaxWidth="1200">
             <Grid DockPanel.Dock="Top">
                 <StackPanel Orientation="Horizontal">
-                    <Image  Source="../Images/machine-full-fx.png" Width="350" RenderOptions.BitmapScalingMode="Fant" Margin="10" />
+                    <Image  Source="{StaticResource Machines}" Width="350" RenderOptions.BitmapScalingMode="Fant" Margin="10" />
 
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0 0 0 10">
                         <materialDesign:PackIcon VerticalAlignment="Center" Kind="BarcodeScan" Width="32" Height="32" />
@@ -70,6 +70,7 @@
                         </Style>
                     </DataGrid.CellStyle>
                     <DataGrid.Columns>
+                        <DataGridTextColumn Header="TYPE" Binding="{Binding MachineType}" Width="Auto" />
                         <DataGridTextColumn Header="SERIAL NUMBER" Binding="{Binding SerialNumber}" Width="Auto" />
                         <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
                         <DataGridTextColumn Header="ORGANIZATION" Binding="{Binding Organization}" Width="Auto" />
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_full.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_full.png
new file mode 100644
index 000000000..484bb2ac1
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_full.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_small.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_small.png
new file mode 100644
index 000000000..c9da4ae29
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/eureka_small.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machines.png b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machines.png
new file mode 100644
index 000000000..788d1e67b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Images/machines.png
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index d8e2017ec..bd35677d2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -73,6 +73,9 @@
         <ResourceDictionary>
             <BitmapImage x:Key="MachineBig" UriSource="../Images/machine_new.png"></BitmapImage>
             <BitmapImage x:Key="MachineSmall" UriSource="../Images/machine_new_small.png"></BitmapImage>
+            <BitmapImage x:Key="MachineEurekaSmall" UriSource="../Images/eureka_small.png"></BitmapImage>
+            <BitmapImage x:Key="MachineEurekaFull" UriSource="../Images/eureka_full.png"></BitmapImage>
+            <BitmapImage x:Key="Machines" UriSource="../Images/machines.png"></BitmapImage>
         </ResourceDictionary>
 
         <!--Styles-->
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
index 91a8b5930..af0d6aab8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj
@@ -448,10 +448,15 @@
     <Resource Include="Images\Connections\ts1800.png" />
     <Resource Include="Images\Connections\wifi.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\eureka_full.png" />
+    <Resource Include="Images\eureka_small.png" />
+    <Resource Include="Images\machines.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTOBase.cs
index 84f75210e..6ef629488 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTOBase.cs
@@ -37,5 +37,21 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// machine type
+        /// </summary>
+        public Int32 MachineType 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// user name
+        /// </summary>
+        public String UserName 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
index 3f3efb015..45aa02514 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
@@ -333,5 +333,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// machine type
+        /// </summary>
+        public Int32 MachineType 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinePrototypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachinePrototypeDTOBase.cs
index 1629bbbd0..ac97ccc50 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/MachinePrototypeDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/MachinePrototypeDTOBase.cs
@@ -22,6 +22,14 @@ namespace Tango.BL.DTO
     {
 
         /// <summary>
+        /// machine type
+        /// </summary>
+        public Int32 MachineType 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// name
         /// </summary>
         public String Name 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
index bc65c33ce..1688e87fc 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersion.cs
@@ -5,12 +5,27 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Enumerations;
 using Tango.BL.Serialization;
 
 namespace Tango.BL.Entities
 {
     public partial class HardwareVersion : HardwareVersionBase
     {
+        [NotMapped]
+        [JsonIgnore]
+        public MachineTypes ForMachineType
+        {
+            get
+            {
+                return (MachineTypes)MachineType;
+            }
+            set
+            {
+                MachineType = value.ToInt32();
+            }
+        }
+
         public override HardwareVersion Clone()
         {
             var cloned = base.Clone();
@@ -99,7 +114,7 @@ namespace Tango.BL.Entities
         [JsonIgnore]
         public String FullName
         {
-            get { return $"{Name} v{Version}"; }
+            get { return $"{Name} v{Version} {ForMachineType}"; }
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs
index 3d7d555dc..e30903baa 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs
@@ -31,6 +31,10 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> NameChanged;
 
+        public event EventHandler<Int32> MachineTypeChanged;
+
+        public event EventHandler<String> UserNameChanged;
+
         public event EventHandler<SynchronizedObservableCollection<Configuration>> ConfigurationsChanged;
 
         public event EventHandler<SynchronizedObservableCollection<HardwareBlower>> HardwareBlowersChanged;
@@ -101,6 +105,60 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _machinetype;
+
+        /// <summary>
+        /// Gets or sets the hardwareversionbase machine type.
+        /// </summary>
+
+        [Column("MACHINE_TYPE")]
+
+        public  Int32 MachineType
+        {
+            get 
+            {
+                return _machinetype; 
+            }
+
+            set 
+            {
+                if (_machinetype != value)
+                {
+                    _machinetype = value;
+
+                    OnMachineTypeChanged(value);
+
+                }
+            }
+        }
+
+        protected String _username;
+
+        /// <summary>
+        /// Gets or sets the hardwareversionbase user name.
+        /// </summary>
+
+        [Column("USER_NAME")]
+
+        public  String UserName
+        {
+            get 
+            {
+                return _username; 
+            }
+
+            set 
+            {
+                if (_username != value)
+                {
+                    _username = value;
+
+                    OnUserNameChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<Configuration> _configurations;
 
         /// <summary>
@@ -320,6 +378,24 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the MachineType has changed.
+        /// </summary>
+        protected virtual void OnMachineTypeChanged(Int32 machinetype)
+        {
+            MachineTypeChanged?.Invoke(this, machinetype);
+            RaisePropertyChanged(nameof(MachineType));
+        }
+
+        /// <summary>
+        /// Called when the UserName has changed.
+        /// </summary>
+        protected virtual void OnUserNameChanged(String username)
+        {
+            UserNameChanged?.Invoke(this, username);
+            RaisePropertyChanged(nameof(UserName));
+        }
+
+        /// <summary>
         /// Called when the Configurations has changed.
         /// </summary>
         protected virtual void OnConfigurationsChanged(SynchronizedObservableCollection<Configuration> configurations)
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
index da3ff6f5b..ddb33e7d2 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
@@ -95,6 +95,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> FineTuningStringChanged;
 
+        public event EventHandler<Int32> MachineTypeChanged;
+
         protected String _machineguid;
 
         /// <summary>
@@ -1140,6 +1142,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _machinetype;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase machine type.
+        /// </summary>
+
+        [Column("MACHINE_TYPE")]
+
+        public  Int32 MachineType
+        {
+            get 
+            {
+                return _machinetype; 
+            }
+
+            set 
+            {
+                if (_machinetype != value)
+                {
+                    _machinetype = value;
+
+                    OnMachineTypeChanged(value);
+
+                }
+            }
+        }
+
         /// <summary>
         /// Called when the JobName has changed.
         /// </summary>
@@ -1447,6 +1476,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the MachineType has changed.
+        /// </summary>
+        protected virtual void OnMachineTypeChanged(Int32 machinetype)
+        {
+            MachineTypeChanged?.Invoke(this, machinetype);
+            RaisePropertyChanged(nameof(MachineType));
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="JobRunBase" /> class.
         /// </summary>
         public JobRunBase() : base()
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinePrototype.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinePrototype.cs
index a1dee5a5d..d93c80f8c 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachinePrototype.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachinePrototype.cs
@@ -129,6 +129,7 @@ namespace Tango.BL.Entities
             prototype.Name = name;
             prototype.Description = description;
             prototype.LastUpdated = DateTime.UtcNow;
+            prototype.MachineType = machine.MachineType;
             prototype.SetPrototypeMachine(machine);
             return prototype;
 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinePrototypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinePrototypeBase.cs
index 2ecaad7e4..863496860 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachinePrototypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachinePrototypeBase.cs
@@ -27,12 +27,41 @@ namespace Tango.BL.Entities
     public abstract class MachinePrototypeBase : ObservableEntity<MachinePrototype>
     {
 
+        public event EventHandler<Int32> MachineTypeChanged;
+
         public event EventHandler<String> NameChanged;
 
         public event EventHandler<String> DescriptionChanged;
 
         public event EventHandler<String> PrototypeJsonChanged;
 
+        protected Int32 _machinetype;
+
+        /// <summary>
+        /// Gets or sets the machineprototypebase machine type.
+        /// </summary>
+
+        [Column("MACHINE_TYPE")]
+
+        public  Int32 MachineType
+        {
+            get 
+            {
+                return _machinetype; 
+            }
+
+            set 
+            {
+                if (_machinetype != value)
+                {
+                    _machinetype = value;
+
+                    OnMachineTypeChanged(value);
+
+                }
+            }
+        }
+
         protected String _name;
 
         /// <summary>
@@ -115,6 +144,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the MachineType has changed.
+        /// </summary>
+        protected virtual void OnMachineTypeChanged(Int32 machinetype)
+        {
+            MachineTypeChanged?.Invoke(this, machinetype);
+            RaisePropertyChanged(nameof(MachineType));
+        }
+
+        /// <summary>
         /// Called when the Name has changed.
         /// </summary>
         protected virtual void OnNameChanged(String name)
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs
index 190ed45e6..77541c90a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs
@@ -32,6 +32,8 @@ namespace Tango.DAL.Remote.DB
         public System.DateTime LAST_UPDATED { get; set; }
         public double VERSION { get; set; }
         public string NAME { get; set; }
+        public int MACHINE_TYPE { get; set; }
+        public string USER_NAME { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<CONFIGURATION> CONFIGURATIONS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
index 069498e77..090263ff2 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
@@ -56,5 +56,6 @@ namespace Tango.DAL.Remote.DB
         public string CE_VERSION { get; set; }
         public string PROCESS_PARAMETERS_TABLE_GUID { get; set; }
         public string FINE_TUNING_STRING { get; set; }
+        public int MACHINE_TYPE { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_PROTOTYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_PROTOTYPES.cs
index 4fdfe0e0e..63930b0a3 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_PROTOTYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_PROTOTYPES.cs
@@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
+        public int MACHINE_TYPE { get; set; }
         public string NAME { get; set; }
         public string DESCRIPTION { get; set; }
         public string PROTOTYPE_JSON { 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 889a6ded6..5215bc6de 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -693,6 +693,8 @@
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
           <Property Name="VERSION" Type="float" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="MACHINE_TYPE" Type="int" Nullable="false" />
+          <Property Name="USER_NAME" Type="nvarchar" MaxLength="100" />
         </EntityType>
         <EntityType Name="HARDWARE_WINDER_TYPES">
           <Key>
@@ -791,6 +793,7 @@
           <Property Name="CE_VERSION" Type="varchar" MaxLength="30" />
           <Property Name="PROCESS_PARAMETERS_TABLE_GUID" Type="varchar" MaxLength="36" />
           <Property Name="FINE_TUNING_STRING" Type="nvarchar" MaxLength="2000" />
+          <Property Name="MACHINE_TYPE" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="JOBS">
           <Key>
@@ -893,6 +896,7 @@
           <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="MACHINE_TYPE" Type="int" Nullable="false" />
           <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
           <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
           <Property Name="PROTOTYPE_JSON" Type="varchar(max)" Nullable="false" />
@@ -6289,6 +6293,8 @@
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="VERSION" Type="Double" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="MACHINE_TYPE" Type="Int32" Nullable="false" />
+          <Property Name="USER_NAME" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="CONFIGURATIONS" Relationship="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="CONFIGURATION" />
           <NavigationProperty Name="HARDWARE_BLOWERS" Relationship="RemoteModel.FK_HARDWARE_BLOWERS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_BLOWERS" />
           <NavigationProperty Name="HARDWARE_BREAK_SENSORS" Relationship="RemoteModel.FK_HARDWARE_BREAK_SENSORS_HARDWARE_VERSIONS" FromRole="HARDWARE_VERSIONS" ToRole="HARDWARE_BREAK_SENSORS" />
@@ -6405,6 +6411,7 @@
           <Property Name="CE_VERSION" Type="String" MaxLength="30" FixedLength="false" Unicode="false" />
           <Property Name="PROCESS_PARAMETERS_TABLE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="FINE_TUNING_STRING" Type="String" MaxLength="2000" FixedLength="false" Unicode="true" />
+          <Property Name="MACHINE_TYPE" Type="Int32" Nullable="false" />
         </EntityType>
         <EntityType Name="JOB">
           <Key>
@@ -6525,6 +6532,7 @@
           <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="MACHINE_TYPE" Type="Int32" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
           <Property Name="PROTOTYPE_JSON" Type="String" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="false" />
@@ -9748,6 +9756,8 @@
           <EntitySetMapping Name="HARDWARE_VERSIONS">
             <EntityTypeMapping TypeName="RemoteModel.HARDWARE_VERSIONS">
               <MappingFragment StoreEntitySet="HARDWARE_VERSIONS">
+                <ScalarProperty Name="USER_NAME" ColumnName="USER_NAME" />
+                <ScalarProperty Name="MACHINE_TYPE" ColumnName="MACHINE_TYPE" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="VERSION" ColumnName="VERSION" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
@@ -9814,6 +9824,7 @@
           <EntitySetMapping Name="JOB_RUNS">
             <EntityTypeMapping TypeName="RemoteModel.JOB_RUNS">
               <MappingFragment StoreEntitySet="JOB_RUNS">
+                <ScalarProperty Name="MACHINE_TYPE" ColumnName="MACHINE_TYPE" />
                 <ScalarProperty Name="FINE_TUNING_STRING" ColumnName="FINE_TUNING_STRING" />
                 <ScalarProperty Name="PROCESS_PARAMETERS_TABLE_GUID" ColumnName="PROCESS_PARAMETERS_TABLE_GUID" />
                 <ScalarProperty Name="CE_VERSION" ColumnName="CE_VERSION" />
@@ -9964,6 +9975,7 @@
                 <ScalarProperty Name="PROTOTYPE_JSON" ColumnName="PROTOTYPE_JSON" />
                 <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="MACHINE_TYPE" ColumnName="MACHINE_TYPE" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
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 1d22ffc93..cddf04151 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,102 +5,102 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="32.125" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="62.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="76.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="82.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="69.625" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="8.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="53.75" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="68" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="86" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="88.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="91.875" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="0.75" />
         <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="36.75" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="36.5" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="20.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="1.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="2" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="8.75" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="34" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="75.25" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="58.375" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="78.375" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="43.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="42.75" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="79.75" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="87.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="10.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="30.875" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="28.5" />
-        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="24.625" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="90.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="80.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="86.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="70.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="8.5" PointY="93.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="10.75" PointY="78.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.5" PointY="83" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8.75" PointY="67.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.5" PointY="84.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="11.75" PointY="70.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="60.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="11.75" PointY="65.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="72.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.5" PointY="62.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="8.75" PointY="64" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="39.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="40.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="36.625" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="42.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="16.625" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="7" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="102.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="97" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="95.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="20.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="7.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="78.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="64.125" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="64.375" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="119" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="118.375" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="83" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="48.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="13.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="21.125" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="45.125" />
+        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="30.5" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="115.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="76.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="107.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="68.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.5" PointY="83.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9.75" PointY="72.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="65.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="61.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="81.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="71.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="111.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="72.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="72.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="85.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="79" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="39.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="40.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="18.75" PointY="0.75" />
         <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="28" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="24.875" />
-        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="66.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="66.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="49.25" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="27.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="16.875" />
+        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="40" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="10.75" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="39" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="52.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="52.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="49" />
         <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="33.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="40" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="7.125" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="60.25" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="5.375" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.125" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="1" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="1.25" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="11" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="24.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="10.25" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="35.875" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="46.125" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="5.875" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="25.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="10.125" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="14" PointY="1" />
         <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.625" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="9.25" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="9.375" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="18.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="12.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="13.75" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="20.625" />
         <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="30.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="9" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="40.375" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="18.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="45" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="20.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="20.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="24.875" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="26.375" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="8.75" PointY="1.5" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="8.25" PointY="55.25" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="10.875" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="34.25" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="14.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="44.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="15.75" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="10.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="38.5" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="39.875" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="11.75" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="4.875" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
index 68565679a..6285bb7b0 100644
--- a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
+++ b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
@@ -158,11 +158,20 @@ namespace Tango.Integration.JobRuns
                                 run.IsGradient = _job.Segments.Any(x => x.BrushStops.Count > 1);
                                 run.GradientResolutionCm = MachineOperator.GradientGenerationConfiguration.ResolutionCM;
 
+                                if (_defaultMachine != null)
+                                {
+                                    run.MachineType = _defaultMachine.MachineType;
+                                }
+                                else if (_job.Machine != null)
+                                {
+                                    run.MachineType = _job.Machine.MachineType;
+                                }
+
                                 var jobFile = e.Job.ToJobFileWhenLoaded();
 
-                            try
-                            {
-                                if (_job.Designation == JobDesignations.FineTuning)
+                                try
+                                {
+                                    if (_job.Designation == JobDesignations.FineTuning)
                                     {
                                         jobFile.Segments.First().BrushStops.First().ColorSpaceGuid = colorSpaces.First(x => x.Code == (int)ColorSpaces.LAB).Guid;
                                     }
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
index 763d6b078..305aed9b9 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/IsNullToVisibilityInverseConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/IsNullToVisibilityInverseConverter.cs
new file mode 100644
index 000000000..ef284b12c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/IsNullToVisibilityInverseConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Tango.SharedUI.Converters
+{
+    public class IsNullToVisibilityInverseConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value == null ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/NullObjectToBooleanInverseConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/NullObjectToBooleanInverseConverter.cs
new file mode 100644
index 000000000..73e41beea
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/NullObjectToBooleanInverseConverter.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.SharedUI.Converters
+{
+    /// <summary>
+    /// Represents a binding converter for returning true for valid object instances and false for null object reference.
+    /// </summary>
+    public class NullObjectToBooleanInverseConverter : IValueConverter
+    {
+        /// <summary>
+        /// Converts a value.
+        /// </summary>
+        /// <param name="value">The value produced by the binding source.</param>
+        /// <param name="targetType">The type of the binding target property.</param>
+        /// <param name="parameter">The converter parameter to use.</param>
+        /// <param name="culture">The culture to use in the converter.</param>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return (value == null);
+        }
+
+        /// <summary>
+        /// Converts a value.
+        /// </summary>
+        /// <param name="value">The value that is produced by the binding target.</param>
+        /// <param name="targetType">The type to convert to.</param>
+        /// <param name="parameter">The converter parameter to use.</param>
+        /// <param name="culture">The culture to use in the converter.</param>
+        /// <returns>
+        /// A converted value. If the method returns null, the valid null value is used.
+        /// </returns>
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return value;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
index c2071d296..c7eccab9f 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -119,12 +119,14 @@
     <Compile Include="Converters\IsEqualConverter.cs" />
     <Compile Include="Converters\IsEqualToVisibilityConverter.cs" />
     <Compile Include="Converters\IsNotConverter.cs" />
+    <Compile Include="Converters\IsNullToVisibilityInverseConverter.cs" />
     <Compile Include="Converters\IsNullToVisibilityConverter.cs" />
     <Compile Include="Converters\IsSegmentGradientConverter.cs" />
     <Compile Include="Converters\IsSegmentGradientToVisibilityConverter.cs" />
     <Compile Include="Converters\IsToStringEqualToVisibilityConverter.cs" />
     <Compile Include="Converters\LastItemInContainerToBooleanConverter.cs" />
     <Compile Include="Converters\MathOperatorConverter.cs" />
+    <Compile Include="Converters\NullObjectToBooleanInverseConverter.cs" />
     <Compile Include="Converters\NumberToFileSizeConverter.cs" />
     <Compile Include="Converters\ObjectToObjectTypeConverter.cs" />
     <Compile Include="Converters\ObservableCollectionToViewSourceConverter.cs" />
@@ -262,7 +264,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file