Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

18 files changed, 561 insertions, 102 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index a603ff06b..993ced97e 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 4abc93ae4..c36b538c5 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{2F0EF030-C2BF-4934-ADA8-5671C67481E5} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{1E4B42BD-2439-4780-A8B6-04BD63A428AF} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.1.6.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.1.7.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -104,6 +104,8 @@
     <ROW Component="Microsoft.VisualStudio.Services.Common.dll" ComponentId="{B42A0E4C-1207-4D28-9814-B86D392D558B}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.VisualStudio.Services.Common.dll"/>
     <ROW Component="Microsoft.VisualStudio.Services.WebApi.dll" ComponentId="{50CBA0C0-C360-433D-B720-4BDF6BB89FAC}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.VisualStudio.Services.WebApi.dll"/>
     <ROW Component="Microsoft.WITDataStore32.dll" ComponentId="{613F4323-1F90-42E5-A64A-FD05A2A02701}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.WITDataStore32.dll"/>
+    <ROW Component="Microsoft.WindowsAPICodePack.Shell.dll" ComponentId="{45DA7495-B419-487F-8BBD-AC2CA9EFE12C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.WindowsAPICodePack.Shell.dll"/>
+    <ROW Component="Microsoft.WindowsAPICodePack.dll" ComponentId="{209CD5CD-5055-44C4-BC1C-49FB136946F2}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.WindowsAPICodePack.dll"/>
     <ROW Component="Microsoft.WindowsAzure.Storage.dll" ComponentId="{7D9DF36E-5D83-49A3-A08B-4FC2A0557E0B}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.WindowsAzure.Storage.dll"/>
     <ROW Component="Newtonsoft.Json.dll" ComponentId="{E556628B-DB87-4249-AF5E-F5D0AC9E6C32}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/>
     <ROW Component="OverrideData.xml" ComponentId="{D7B559ED-70E2-42F9-996D-2D6FDB2ED752}" Directory_="Configurations_Dir" Attributes="0" KeyPath="OverrideData.xml" Type="0"/>
@@ -155,6 +157,7 @@
     <ROW Component="Tango.DragAndDrop.dll" ComponentId="{E9081F1C-7A40-402F-83B4-62F4E3D5E4BE}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.DragAndDrop.dll"/>
     <ROW Component="Tango.Emulations.dll" ComponentId="{51084E24-6781-469C-97CF-AE6CBB6E8A25}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Emulations.dll"/>
     <ROW Component="Tango.Explorer.dll" ComponentId="{0088295A-39D6-40BE-98B5-986EBF9B0BCA}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Explorer.dll"/>
+    <ROW Component="Tango.FileSystem.dll" ComponentId="{974DC8A2-EA0D-4F64-BE1A-256464B0F186}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.FileSystem.dll"/>
     <ROW Component="Tango.FirmwareUpdateLib.WPF.dll" ComponentId="{114351FD-08EC-44C4-AFFD-82357F567E58}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.FirmwareUpdateLib.WPF.dll"/>
     <ROW Component="Tango.FirmwareUpdateLib.dll" ComponentId="{627301CE-4E54-4E87-9062-E5E6119C8844}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.FirmwareUpdateLib.dll"/>
     <ROW Component="Tango.Hive.dll" ComponentId="{CA2CADC4-F5ED-4ECA-BCB9-E4C0EE085DFA}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Hive.dll"/>
@@ -185,11 +188,14 @@
     <ROW Component="Tango.Serialization.dll" ComponentId="{E8EA3C7F-0CAF-4DDC-8C3C-CB8F47F6AF0D}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Serialization.dll"/>
     <ROW Component="Tango.Settings.dll" ComponentId="{20C153C6-2CCB-4718-94AA-C9B97C73EB0E}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Settings.dll"/>
     <ROW Component="Tango.SharedUI.dll" ComponentId="{A35560B9-DD6C-4E11-BC78-2B7A1B4AA661}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.SharedUI.dll"/>
+    <ROW Component="Tango.SystemInfo.dll" ComponentId="{4F4A8E7E-7EA2-412E-9051-E0A821E74D97}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.SystemInfo.dll"/>
     <ROW Component="Tango.TFS.dll" ComponentId="{535E80F9-2DB0-4CD3-9110-ADA90EC92681}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.TFS.dll"/>
     <ROW Component="Tango.Touch.dll" ComponentId="{F9E2E4D3-3985-4142-AB35-E48740C2ECAE}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Touch.dll"/>
     <ROW Component="Tango.Transport.dll" ComponentId="{757E4901-D269-42C1-A70E-7B8DABB66024}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Transport.dll"/>
     <ROW Component="Tango.Web.dll" ComponentId="{131328BC-D68F-4CB8-8D8C-F89CF6F8486C}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Web.dll"/>
+    <ROW Component="Tango.WebRTC.dll" ComponentId="{2685EA71-1420-4A07-A222-6AAE9CAAB15E}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.WebRTC.dll"/>
     <ROW Component="Tango.WiFi.dll" ComponentId="{8082C9BD-5BDB-4C52-BCA6-E8604D4D232B}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.WiFi.dll"/>
+    <ROW Component="WebRtc.NET.dll" ComponentId="{11563A6C-E1FC-4578-8BDD-8A8C30677126}" Directory_="APPDIR" Attributes="0" KeyPath="WebRtc.NET.dll"/>
     <ROW Component="WindowsInput.dll" ComponentId="{916884AD-CD7D-4AB0-8B3B-A2205ACFBDF4}" Directory_="APPDIR" Attributes="0" KeyPath="WindowsInput.dll"/>
     <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/>
     <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/>
@@ -437,6 +443,16 @@
     <ROW File="turbojpeg.dll_1" Component_="turbojpeg.dll_1" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x86\turbojpeg.dll" SelfReg="false"/>
     <ROW File="turbojpeg.dll.meta_1" Component_="turbojpeg.dll.meta_1" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x86\turbojpeg.dll.meta" SelfReg="false"/>
     <ROW File="WindowsInput.dll" Component_="WindowsInput.dll" FileName="WINDOW~1.DLL|WindowsInput.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\WindowsInput.dll" SelfReg="false"/>
+    <ROW File="Microsoft.WindowsAPICodePack.dll" Component_="Microsoft.WindowsAPICodePack.dll" FileName="MICRO~37.DLL|Microsoft.WindowsAPICodePack.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.WindowsAPICodePack.dll" SelfReg="false"/>
+    <ROW File="Microsoft.WindowsAPICodePack.Shell.dll" Component_="Microsoft.WindowsAPICodePack.Shell.dll" FileName="MICRO~38.DLL|Microsoft.WindowsAPICodePack.Shell.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.WindowsAPICodePack.Shell.dll" SelfReg="false"/>
+    <ROW File="Tango.FileSystem.dll" Component_="Tango.FileSystem.dll" FileName="TANGOF~3.DLL|Tango.FileSystem.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.FileSystem.dll" SelfReg="false"/>
+    <ROW File="Tango.FileSystem.pdb" Component_="Tango.FileSystem.dll" FileName="TANGOF~3.PDB|Tango.FileSystem.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.FileSystem.pdb" SelfReg="false"/>
+    <ROW File="Tango.SystemInfo.dll" Component_="Tango.SystemInfo.dll" FileName="TANGOS~6.DLL|Tango.SystemInfo.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.SystemInfo.dll" SelfReg="false"/>
+    <ROW File="Tango.SystemInfo.pdb" Component_="Tango.SystemInfo.dll" FileName="TANGOS~6.PDB|Tango.SystemInfo.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.SystemInfo.pdb" SelfReg="false"/>
+    <ROW File="Tango.WebRTC.dll" Component_="Tango.WebRTC.dll" FileName="TANGOW~3.DLL|Tango.WebRTC.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.WebRTC.dll" SelfReg="false"/>
+    <ROW File="Tango.WebRTC.pdb" Component_="Tango.WebRTC.dll" FileName="TANGOW~3.PDB|Tango.WebRTC.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.WebRTC.pdb" SelfReg="false"/>
+    <ROW File="WebRtc.NET.dll" Component_="WebRtc.NET.dll" FileName="WEBRTC~1.DLL|WebRtc.NET.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\WebRtc.NET.dll" SelfReg="false"/>
+    <ROW File="WebRtc.NET.pdb" Component_="WebRtc.NET.dll" FileName="WEBRTC~1.PDB|WebRtc.NET.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\WebRtc.NET.pdb" SelfReg="false"/>
     <ATTRIBUTE name="DontAddFileAttributes" value="true"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
@@ -446,7 +462,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.1.6"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.1.7"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -700,6 +716,12 @@
     <ROW Feature_="MainFeature" Component_="turbojpeg.dll_1"/>
     <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta_1"/>
     <ROW Feature_="MainFeature" Component_="WindowsInput.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.WindowsAPICodePack.dll"/>
+    <ROW Feature_="MainFeature" Component_="Microsoft.WindowsAPICodePack.Shell.dll"/>
+    <ROW Feature_="MainFeature" Component_="Tango.FileSystem.dll"/>
+    <ROW Feature_="MainFeature" Component_="Tango.SystemInfo.dll"/>
+    <ROW Feature_="MainFeature" Component_="Tango.WebRTC.dll"/>
+    <ROW Feature_="MainFeature" Component_="WebRtc.NET.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
index eab4eecde..ef5527406 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
@@ -20,7 +20,7 @@ namespace Tango.MachineStudio.Statistics.Models
     {
         public string Name { get; set; }
 
-        public double Value { get; set; }
+        public object Value { get; set; }
 
         public string Unit { get; set; }
     }
@@ -139,7 +139,7 @@ namespace Tango.MachineStudio.Statistics.Models
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["OrangeBrush"]).Color);
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["GreenBrush"]).Color);
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["BlueBrush100"]).Color);
-            _pieColors.Add(Color.FromRgb(100, 184, 236));//blue
+            _pieColors.Add(Colors.Yellow);
 
 
             PieJobSource = new LabeledSeriesCollection()
@@ -175,7 +175,7 @@ namespace Tango.MachineStudio.Statistics.Models
         /// <summary>
         /// Adds the statistics value.
         /// </summary>
-        public void AddStatisticsValue(string name, double value, string unit)
+        public void AddStatisticsValue(string name, object value, string unit)
         {
             StatisticsCollection.Add(new StatisticsValue() { Name = name, Value = value, Unit = unit });
             RaisePropertyChanged("StatisticsCollection");
@@ -206,7 +206,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "PPC",
                 Values = new ChartValues<int>() { PPCCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[4]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -274,7 +274,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Solid",
                 Values = new ChartValues<int>() { solidCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[4]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
index ca40273f9..94d06a178 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
@@ -367,6 +367,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         protected void GenerateStatistics()
         {
             StatisticsValueCollection.Clean();
+            GenerateTotalRunsCount();
             GenerateTotalRunsLength();
             GenerateTotalThreadConsumption();
             GenerateRunsDuration();
@@ -377,7 +378,13 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             CreateThreadConsumptionPerThread();
             GenerateAllLiquidQuantities();
         }
-        
+
+        protected void GenerateTotalRunsCount()
+        {//Total Runs: 
+            int val =JobRuns.Where(z => z.JobRun.EndPosition > 0).Count();
+            StatisticsValueCollection.AddStatisticsValue("Total Runs ", val, " ");
+        }
+
         /// <summary>
         /// Generates the total length of the job runs.
         /// </summary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
index ecc846903..af363b32a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
@@ -554,7 +554,7 @@
                                     <StackPanel Orientation="Horizontal" Margin="0 3">
                                         <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
                                         <TextBlock Text=": "/>
-                                        <TextBlock Text="{Binding Value, StringFormat={}{0:0.00}}"/>
+                                        <TextBlock Text="{Binding Value, StringFormat={}{0:#,0.##}}"/>
                                         <TextBlock Text="{Binding Unit}"/>
                                     </StackPanel>
                                 </DataTemplate>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 11a400fd3..751a4c316 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.1.6.0")]
+[assembly: AssemblyVersion("1.1.7.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index f06109584..45eaa0e50 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -37,7 +37,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\Build\PPC\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;DESKTOP</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -693,7 +693,7 @@ if $(ConfigurationName) == Debug copy /Y "$(TargetDir)Packages" "$(TargetDir)"</
   </PropertyGroup>
   <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
diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
index 8b5b29482..a728ef881 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs
@@ -166,6 +166,62 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// cyan quantity
+        /// </summary>
+        public Int32 CyanQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// magenta quantity
+        /// </summary>
+        public Int32 MagentaQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// yellow quantity
+        /// </summary>
+        public Int32 YellowQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// black quantity
+        /// </summary>
+        public Int32 BlackQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// transparent quantity
+        /// </summary>
+        public Int32 TransparentQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// lubricant quantity
+        /// </summary>
+        public Int32 LubricantQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// cleaner quantity
+        /// </summary>
+        public Int32 CleanerQuantity 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// end position
         /// </summary>
         public Double EndPosition 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
index 2b002d19a..9277e279b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs
@@ -55,6 +55,20 @@ namespace Tango.BL.Entities
 
         public event EventHandler<String> LiquidQuantityStringChanged;
 
+        public event EventHandler<Int32> CyanQuantityChanged;
+
+        public event EventHandler<Int32> MagentaQuantityChanged;
+
+        public event EventHandler<Int32> YellowQuantityChanged;
+
+        public event EventHandler<Int32> BlackQuantityChanged;
+
+        public event EventHandler<Int32> TransparentQuantityChanged;
+
+        public event EventHandler<Int32> LubricantQuantityChanged;
+
+        public event EventHandler<Int32> CleanerQuantityChanged;
+
         public event EventHandler<Double> EndPositionChanged;
 
         public event EventHandler<String> FailedMessageChanged;
@@ -541,6 +555,195 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _cyanquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase cyan quantity.
+        /// </summary>
+
+        [Column("CYAN_QUANTITY")]
+
+        public  Int32 CyanQuantity
+        {
+            get 
+            {
+                return _cyanquantity; 
+            }
+
+            set 
+            {
+                if (_cyanquantity != value)
+                {
+                    _cyanquantity = value;
+
+                    OnCyanQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _magentaquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase magenta quantity.
+        /// </summary>
+
+        [Column("MAGENTA_QUANTITY")]
+
+        public  Int32 MagentaQuantity
+        {
+            get 
+            {
+                return _magentaquantity; 
+            }
+
+            set 
+            {
+                if (_magentaquantity != value)
+                {
+                    _magentaquantity = value;
+
+                    OnMagentaQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _yellowquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase yellow quantity.
+        /// </summary>
+
+        [Column("YELLOW_QUANTITY")]
+
+        public  Int32 YellowQuantity
+        {
+            get 
+            {
+                return _yellowquantity; 
+            }
+
+            set 
+            {
+                if (_yellowquantity != value)
+                {
+                    _yellowquantity = value;
+
+                    OnYellowQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _blackquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase black quantity.
+        /// </summary>
+
+        [Column("BLACK_QUANTITY")]
+
+        public  Int32 BlackQuantity
+        {
+            get 
+            {
+                return _blackquantity; 
+            }
+
+            set 
+            {
+                if (_blackquantity != value)
+                {
+                    _blackquantity = value;
+
+                    OnBlackQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _transparentquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase transparent quantity.
+        /// </summary>
+
+        [Column("TRANSPARENT_QUANTITY")]
+
+        public  Int32 TransparentQuantity
+        {
+            get 
+            {
+                return _transparentquantity; 
+            }
+
+            set 
+            {
+                if (_transparentquantity != value)
+                {
+                    _transparentquantity = value;
+
+                    OnTransparentQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _lubricantquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase lubricant quantity.
+        /// </summary>
+
+        [Column("LUBRICANT_QUANTITY")]
+
+        public  Int32 LubricantQuantity
+        {
+            get 
+            {
+                return _lubricantquantity; 
+            }
+
+            set 
+            {
+                if (_lubricantquantity != value)
+                {
+                    _lubricantquantity = value;
+
+                    OnLubricantQuantityChanged(value);
+
+                }
+            }
+        }
+
+        protected Int32 _cleanerquantity;
+
+        /// <summary>
+        /// Gets or sets the jobrunbase cleaner quantity.
+        /// </summary>
+
+        [Column("CLEANER_QUANTITY")]
+
+        public  Int32 CleanerQuantity
+        {
+            get 
+            {
+                return _cleanerquantity; 
+            }
+
+            set 
+            {
+                if (_cleanerquantity != value)
+                {
+                    _cleanerquantity = value;
+
+                    OnCleanerQuantityChanged(value);
+
+                }
+            }
+        }
+
         protected Double _endposition;
 
         /// <summary>
@@ -749,6 +952,69 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the CyanQuantity has changed.
+        /// </summary>
+        protected virtual void OnCyanQuantityChanged(Int32 cyanquantity)
+        {
+            CyanQuantityChanged?.Invoke(this, cyanquantity);
+            RaisePropertyChanged(nameof(CyanQuantity));
+        }
+
+        /// <summary>
+        /// Called when the MagentaQuantity has changed.
+        /// </summary>
+        protected virtual void OnMagentaQuantityChanged(Int32 magentaquantity)
+        {
+            MagentaQuantityChanged?.Invoke(this, magentaquantity);
+            RaisePropertyChanged(nameof(MagentaQuantity));
+        }
+
+        /// <summary>
+        /// Called when the YellowQuantity has changed.
+        /// </summary>
+        protected virtual void OnYellowQuantityChanged(Int32 yellowquantity)
+        {
+            YellowQuantityChanged?.Invoke(this, yellowquantity);
+            RaisePropertyChanged(nameof(YellowQuantity));
+        }
+
+        /// <summary>
+        /// Called when the BlackQuantity has changed.
+        /// </summary>
+        protected virtual void OnBlackQuantityChanged(Int32 blackquantity)
+        {
+            BlackQuantityChanged?.Invoke(this, blackquantity);
+            RaisePropertyChanged(nameof(BlackQuantity));
+        }
+
+        /// <summary>
+        /// Called when the TransparentQuantity has changed.
+        /// </summary>
+        protected virtual void OnTransparentQuantityChanged(Int32 transparentquantity)
+        {
+            TransparentQuantityChanged?.Invoke(this, transparentquantity);
+            RaisePropertyChanged(nameof(TransparentQuantity));
+        }
+
+        /// <summary>
+        /// Called when the LubricantQuantity has changed.
+        /// </summary>
+        protected virtual void OnLubricantQuantityChanged(Int32 lubricantquantity)
+        {
+            LubricantQuantityChanged?.Invoke(this, lubricantquantity);
+            RaisePropertyChanged(nameof(LubricantQuantity));
+        }
+
+        /// <summary>
+        /// Called when the CleanerQuantity has changed.
+        /// </summary>
+        protected virtual void OnCleanerQuantityChanged(Int32 cleanerquantity)
+        {
+            CleanerQuantityChanged?.Invoke(this, cleanerquantity);
+            RaisePropertyChanged(nameof(CleanerQuantity));
+        }
+
+        /// <summary>
         /// Called when the EndPosition has changed.
         /// </summary>
         protected virtual void OnEndPositionChanged(Double endposition)
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 faad22636..834a27443 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs
@@ -35,6 +35,13 @@ namespace Tango.DAL.Remote.DB
         public bool IS_GRADIENT { get; set; }
         public int GRADIENT_RESOLUTION_CM { get; set; }
         public string LIQUID_QUANTITY_STRING { get; set; }
+        public int CYAN_QUANTITY { get; set; }
+        public int MAGENTA_QUANTITY { get; set; }
+        public int YELLOW_QUANTITY { get; set; }
+        public int BLACK_QUANTITY { get; set; }
+        public int TRANSPARENT_QUANTITY { get; set; }
+        public int LUBRICANT_QUANTITY { get; set; }
+        public int CLEANER_QUANTITY { get; set; }
         public double END_POSITION { get; set; }
         public string FAILED_MESSAGE { get; set; }
         public bool IS_SYNCHRONIZED { 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 41f24052a..3cf2baaba 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -619,6 +619,13 @@
           <Property Name="IS_GRADIENT" Type="bit" Nullable="false" />
           <Property Name="GRADIENT_RESOLUTION_CM" Type="int" Nullable="false" />
           <Property Name="LIQUID_QUANTITY_STRING" Type="nvarchar(max)" />
+          <Property Name="CYAN_QUANTITY" Type="int" Nullable="false" />
+          <Property Name="MAGENTA_QUANTITY" Type="int" Nullable="false" />
+          <Property Name="YELLOW_QUANTITY" Type="int" Nullable="false" />
+          <Property Name="BLACK_QUANTITY" Type="int" Nullable="false" />
+          <Property Name="TRANSPARENT_QUANTITY" Type="int" Nullable="false" />
+          <Property Name="LUBRICANT_QUANTITY" Type="int" Nullable="false" />
+          <Property Name="CLEANER_QUANTITY" Type="int" Nullable="false" />
           <Property Name="END_POSITION" Type="float" Nullable="false" />
           <Property Name="FAILED_MESSAGE" Type="nvarchar" MaxLength="300" />
           <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
@@ -3911,6 +3918,13 @@
           <Property Name="IS_GRADIENT" Type="Boolean" Nullable="false" />
           <Property Name="GRADIENT_RESOLUTION_CM" Type="Int32" Nullable="false" />
           <Property Name="LIQUID_QUANTITY_STRING" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="CYAN_QUANTITY" Type="Int32" Nullable="false" />
+          <Property Name="MAGENTA_QUANTITY" Type="Int32" Nullable="false" />
+          <Property Name="YELLOW_QUANTITY" Type="Int32" Nullable="false" />
+          <Property Name="BLACK_QUANTITY" Type="Int32" Nullable="false" />
+          <Property Name="TRANSPARENT_QUANTITY" Type="Int32" Nullable="false" />
+          <Property Name="LUBRICANT_QUANTITY" Type="Int32" Nullable="false" />
+          <Property Name="CLEANER_QUANTITY" Type="Int32" Nullable="false" />
           <Property Name="END_POSITION" Type="Double" Nullable="false" />
           <Property Name="FAILED_MESSAGE" Type="String" MaxLength="300" FixedLength="false" Unicode="true" />
           <Property Name="IS_SYNCHRONIZED" Type="Boolean" Nullable="false" />
@@ -6375,6 +6389,13 @@
                 <ScalarProperty Name="IS_SYNCHRONIZED" ColumnName="IS_SYNCHRONIZED" />
                 <ScalarProperty Name="FAILED_MESSAGE" ColumnName="FAILED_MESSAGE" />
                 <ScalarProperty Name="END_POSITION" ColumnName="END_POSITION" />
+                <ScalarProperty Name="CLEANER_QUANTITY" ColumnName="CLEANER_QUANTITY" />
+                <ScalarProperty Name="LUBRICANT_QUANTITY" ColumnName="LUBRICANT_QUANTITY" />
+                <ScalarProperty Name="TRANSPARENT_QUANTITY" ColumnName="TRANSPARENT_QUANTITY" />
+                <ScalarProperty Name="BLACK_QUANTITY" ColumnName="BLACK_QUANTITY" />
+                <ScalarProperty Name="YELLOW_QUANTITY" ColumnName="YELLOW_QUANTITY" />
+                <ScalarProperty Name="MAGENTA_QUANTITY" ColumnName="MAGENTA_QUANTITY" />
+                <ScalarProperty Name="CYAN_QUANTITY" ColumnName="CYAN_QUANTITY" />
                 <ScalarProperty Name="LIQUID_QUANTITY_STRING" ColumnName="LIQUID_QUANTITY_STRING" />
                 <ScalarProperty Name="GRADIENT_RESOLUTION_CM" ColumnName="GRADIENT_RESOLUTION_CM" />
                 <ScalarProperty Name="IS_GRADIENT" ColumnName="IS_GRADIENT" />
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 95c9f4744..a69b91e87 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,85 +5,85 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="5.25" PointY="41.875" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="4.5" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="69.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="63.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="66.5" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="10.75" PointY="24.875" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="83.875" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="19.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="15.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="4.5" PointY="37.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="6.75" PointY="38" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="9" PointY="36.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="11.25" PointY="19.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="29.125" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="61.875" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="4.5" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="3" PointY="33.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.75" PointY="80.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="8" PointY="79.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="56.375" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="7" PointY="71.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="23.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="52.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="57.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="71.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="11.75" PointY="52.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.5" PointY="93.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="8.75" PointY="65.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.5" PointY="75.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="11.75" PointY="56.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="6.5" PointY="67.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="8.75" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="49.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="53.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="59.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="72.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="67.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="8" PointY="89.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="46.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="16.25" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="26.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="32" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="23.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="5.25" PointY="27.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="53.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="57.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="9.25" PointY="52.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="32.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="20.25" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="86.75" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6.75" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="8" PointY="97.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="43.5" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="46.125" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.25" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="8" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="10.25" PointY="0.875" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="27.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="9" PointY="4.875" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="13.25" PointY="23.75" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="11.25" PointY="16.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="11.125" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="36.25" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="8.75" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="13" PointY="47.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="10.75" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="11.75" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="12.75" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="13.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="13.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3" PointY="42.625" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="10.25" PointY="42.875" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="3" PointY="12" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="12.875" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="60.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="85.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="75.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="78" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="42.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="20.625" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="13.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="5.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="20.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="12.875" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="69.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="56.25" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="3.75" PointY="56.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="6" PointY="56.125" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="64.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="47.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="30.625" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="24.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="89.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="81.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="88.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="77.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="73.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="75.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="71.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="78.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="93.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="85.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="96.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="85.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="81" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="92.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="81.375" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="6" PointY="45.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="42" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.75" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="16.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="37" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="45.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="28.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="27.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="21.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="33.625" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="49" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="42.25" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="53" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="33.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="35.75" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="16.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="29.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="25" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="11" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="5.25" PointY="31.125" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="13.75" PointY="9.625" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="28.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="4.75" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="15.75" PointY="9.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="6.5" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="29.125" />
         <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 0fadd1baa..75d940566 100644
--- a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
+++ b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs
@@ -115,6 +115,36 @@ namespace Tango.Integration.JobRuns
                                 run.GradientResolutionCm = MachineOperator.GradientGenerationConfiguration.ResolutionCM;
                                 run.JobString = _job.ToJobFileWhenLoaded().ToString();
 
+                                //Set individual liquid quantities
+
+                                //Cyan
+                                var cyan = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.Cyan);
+                                run.CyanQuantity = cyan != null ? cyan.Quantity : 0;
+
+                                //Magenta
+                                var magenta = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.Magenta);
+                                run.MagentaQuantity = magenta != null ? magenta.Quantity : 0;
+
+                                //Yellow
+                                var yellow = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.Yellow);
+                                run.YellowQuantity = yellow != null ? yellow.Quantity : 0;
+
+                                //Black
+                                var black = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.Black);
+                                run.BlackQuantity = black != null ? black.Quantity : 0;
+
+                                //TI
+                                var ti = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.TransparentInk);
+                                run.TransparentQuantity = ti != null ? ti.Quantity : 0;
+
+                                //Lubricant
+                                var lubricant = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.Lubricant);
+                                run.LubricantQuantity = lubricant != null ? lubricant.Quantity : 0;
+
+                                //Lubricant
+                                var cleaner = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.Cleaner);
+                                run.CleanerQuantity = cleaner != null ? cleaner.Quantity : 0;
+
                                 if (exception != null)
                                 {
                                     run.FailedMessage = exception.FlattenMessage();
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 921301cc0..476ebe1fd 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -6432,6 +6432,7 @@ Global
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.AppVeyor|x86.ActiveCfg = Release|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.AppVeyor|x86.Build.0 = Release|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Debug|Any CPU.Build.0 = Debug|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Debug|ARM.ActiveCfg = Debug|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Debug|x64.ActiveCfg = Debug|x64
@@ -6448,7 +6449,8 @@ Global
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.DefaultBuild|x64.Build.0 = Debug|x64
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.DefaultBuild|x86.ActiveCfg = Debug|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.DefaultBuild|x86.Build.0 = Debug|Win32
-		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Release|Any CPU.ActiveCfg = Release|Win32
+		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Release|Any CPU.ActiveCfg = Debug|Win32
+		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Release|Any CPU.Build.0 = Debug|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Release|ARM.ActiveCfg = Release|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Release|ARM64.ActiveCfg = Release|Win32
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}.Release|x64.ActiveCfg = Release|x64
@@ -6699,12 +6701,12 @@ Global
 		{A07E6CB4-0132-4EB1-9A38-C8C057884DC2} = {EC62BC9C-F2FE-4333-B7E4-110E38D43958}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
 		BuildVersion_UseGlobalSettings = False
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
 	EndGlobalSection
 EndGlobal
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml
index a330b4425..3eabf21b4 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml
@@ -11,7 +11,7 @@
         xmlns:local="clr-namespace:Tango.DispenserAnalyzer.UI"
         xmlns:vm ="clr-namespace:Tango.DispenserAnalyzer.UI.ViewModels"
         mc:Ignorable="d"
-        Title="Dispenser Analyser" Height="1000" Width="860" WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" ResizeMode="CanResize" Foreground="#202020" 
+        Title="{Binding WindowTitle, RelativeSource={RelativeSource Mode=Self}}" Height="1000" Width="860" WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" ResizeMode="CanResize" Foreground="#202020" 
         d:DataContext="{d:DesignInstance Type=vm:MainWindowVM, IsDesignTimeCreatable=False}">
     <Window.Resources>
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml.cs
index 26d64c995..a7bcf796e 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/MainWindow.xaml.cs
@@ -25,7 +25,17 @@ namespace Tango.DispenserAnalyzer.UI
     public partial class MainWindow : Window
     {
         private MainWindowVM _vm;
-       
+
+        public string WindowTitle
+        {
+            get
+            {
+                Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+                return "Dispenser Analyzer - Version" + version;
+            }
+        }
+        
+
         public MainWindow()
         {
             InitializeComponent();
diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs
index 4b15c6e1f..363f31ea5 100644
--- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs
index b105b8254..b8031fdaf 100644
--- a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs
@@ -78,6 +78,44 @@ namespace Tango.JobRunsGenerator
                         if (run.ActualStartDate == null) run.ActualStartDate = run.StartDate;
                         run.IsGradient = job.Segments.Any(x => x.BrushStops.Count > 1);
 
+                        //Set new liquid quantities.
+                        if (run.CyanQuantity == 0 &&
+                            run.MagentaQuantity == 0 &&
+                            run.YellowQuantity == 0 &&
+                            run.BlackQuantity == 0 &&
+                            run.TransparentQuantity == 0 &&
+                            run.LubricantQuantity == 0 &&
+                            run.CleanerQuantity == 0)
+                        {
+                            //Cyan
+                            var cyan = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.Cyan);
+                            run.CyanQuantity = cyan != null ? cyan.Quantity : 0;
+
+                            //Magenta
+                            var magenta = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.Magenta);
+                            run.MagentaQuantity = magenta != null ? magenta.Quantity : 0;
+
+                            //Yellow
+                            var yellow = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.Yellow);
+                            run.YellowQuantity = yellow != null ? yellow.Quantity : 0;
+
+                            //Black
+                            var black = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.Black);
+                            run.BlackQuantity = black != null ? black.Quantity : 0;
+
+                            //TI
+                            var ti = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.TransparentInk);
+                            run.TransparentQuantity = ti != null ? ti.Quantity : 0;
+
+                            //Lubricant
+                            var lubricant = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.Lubricant);
+                            run.LubricantQuantity = lubricant != null ? lubricant.Quantity : 0;
+
+                            //Lubricant
+                            var cleaner = run.LiquidQuantities.FirstOrDefault(x => x.LiquidType == BL.Enumerations.LiquidTypes.Cleaner);
+                            run.CleanerQuantity = cleaner != null ? cleaner.Quantity : 0;
+                        }
+
                         saveIndex++;
 
                         if (saveIndex > 100)