From adeeb0ee759b886f902ace9bb68998e1ecf320a7 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 12 Mar 2020 17:45:30 +0200
Subject: Implement statistic values in Job runs View.

Related Work Items: #2509
---
 .../Views/ChartsView.xaml                          |  27 +-
 .../Views/JobRunsView.xaml                         | 281 +++++++++++++++++----
 .../Views/JobRunsView.xaml.cs                      |   5 +-
 3 files changed, 256 insertions(+), 57 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/ChartsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/ChartsView.xaml
index ecd7e01ed..ae4bf1d46 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/ChartsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/ChartsView.xaml
@@ -17,23 +17,26 @@
             <RowDefinition Height="337*"/>
         </Grid.RowDefinitions>
 
-        <StackPanel Margin="60 20 0 0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
-            <StackPanel>
-                <TextBlock FontSize="10">Start Date:</TextBlock>
-                <DatePicker DisplayDateStart="{Binding MinDate}" DisplayDateEnd="{Binding MaxDate}" SelectedDate="{Binding StartDate}" materialDesign:HintAssist.Hint="Pick start date" Width="200" VerticalAlignment="Bottom" FontSize="16"></DatePicker>
-            </StackPanel>
+        
+            <StackPanel Margin="60 20 0 0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal" DockPanel.Dock="Left">
+                <StackPanel>
+                    <TextBlock FontSize="10">Start Date:</TextBlock>
+                    <DatePicker DisplayDateStart="{Binding MinDate}" DisplayDateEnd="{Binding MaxDate}" SelectedDate="{Binding StartDate}" materialDesign:HintAssist.Hint="Pick start date" Width="200" VerticalAlignment="Bottom" FontSize="16"></DatePicker>
+                </StackPanel>
 
-            <StackPanel Margin="40 0 0 0">
-                <TextBlock FontSize="10">End Date:</TextBlock>
-                <DatePicker DisplayDateStart="{Binding MinDate}" DisplayDateEnd="{Binding MaxDate}" SelectedDate="{Binding EndDate}" materialDesign:HintAssist.Hint="Pick end date" Width="200" VerticalAlignment="Bottom" FontSize="16"></DatePicker>
-            </StackPanel>
+                <StackPanel Margin="40 0 0 0">
+                    <TextBlock FontSize="10">End Date:</TextBlock>
+                    <DatePicker DisplayDateStart="{Binding MinDate}" DisplayDateEnd="{Binding MaxDate}" SelectedDate="{Binding EndDate}" materialDesign:HintAssist.Hint="Pick end date" Width="200" VerticalAlignment="Bottom" FontSize="16"></DatePicker>
+                </StackPanel>
+            <Button Width="100"  Margin="60 0 0 0" Command="{Binding LoadJobRunsCommand}" VerticalAlignment="Bottom" HorizontalAlignment="Right">LOAD</Button>
         </StackPanel>
+        
 
         <UniformGrid Columns="3" Margin="50 20 50 50" Rows="2" Grid.Row="1">
             <Border BorderBrush="{StaticResource Statistics.BorderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
                 <DockPanel>
                     <TextBlock DockPanel.Dock="Top" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Padding="10" Text="{Binding TimelineJobStatusSeries.Title}"></TextBlock>
-                    <lvc:CartesianChart Series="{Binding TimelineJobStatusSeries.SeriesCollection}" LegendLocation="Bottom" SeriesColors="{Binding TimelineJobStatusSeries.SeriesColors}">
+                    <lvc:CartesianChart Series="{Binding TimelineJobStatusSeries.SeriesCollection}" LegendLocation="Bottom">
                         <lvc:CartesianChart.DataTooltip>
                             <lvc:DefaultTooltip BulletSize="20" Background="{StaticResource TransparentBackgroundBrush450}" Foreground="{StaticResource Dialog.Foreground}"/>
                         </lvc:CartesianChart.DataTooltip>
@@ -59,7 +62,7 @@
                 <DockPanel>
                     <TextBlock DockPanel.Dock="Top" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Padding="10" Text="{Binding PieJobFailedReasons.Title}"></TextBlock>
                     <UniformGrid Columns="2">
-                        <lvc:PieChart DataHover="PieChart_DataHover" Series="{Binding PieJobFailedReasons.SeriesCollection}" LegendLocation="None" SeriesColors="{Binding PieJobFailedReasons.SeriesColors}" Background="Transparent">
+                        <lvc:PieChart DataHover="PieChart_DataHover" Series="{Binding PieJobFailedReasons.SeriesCollection}" LegendLocation="None"  Background="Transparent">
                             <lvc:PieChart.Resources>
                                 <Style TargetType="lvc:PieSeries">
                                     <Setter Property="Stroke" Value="#99F9F9F9"></Setter>
@@ -79,7 +82,7 @@
             <Border BorderBrush="{StaticResource Statistics.BorderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
                 <DockPanel>
                     <TextBlock DockPanel.Dock="Top" FontSize="16" FontWeight="Bold" HorizontalAlignment="Center" Padding="10" Text="{Binding PrintPerWeekSeries.Title}"></TextBlock>
-                    <lvc:CartesianChart Series="{Binding PrintPerWeekSeries.SeriesCollection}" LegendLocation="Bottom" SeriesColors="{Binding PrintPerWeekSeries.SeriesColors}" >
+                    <lvc:CartesianChart Series="{Binding PrintPerWeekSeries.SeriesCollection}" LegendLocation="Bottom" >
                         <lvc:CartesianChart.Resources>
                             <Style TargetType="lvc:ColumnSeries">
                                 <Setter Property="Foreground" Value="{StaticResource DarkGrayBrush200}"></Setter>
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 71e44465a..4790402d5 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
@@ -8,9 +8,13 @@
              xmlns:localConverters="clr-namespace:Tango.MachineStudio.Statistics.Converters"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
+             xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
+             xmlns:tooltips="clr-namespace:Tango.MachineStudio.Statistics.Tooltips"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.MachineStudio.Statistics.Views"
+             xmlns:model="clr-namespace:Tango.MachineStudio.Statistics.Models"
+             xmlns:wellknowntypes="clr-namespace:Google.Protobuf.WellKnownTypes;assembly=Google.Protobuf"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="1800" Foreground="{StaticResource JobFieldForeground}">
     <UserControl.Resources>
@@ -24,6 +28,8 @@
         <localConverters:CollectionConverter x:Key="CollectionConverter"/>
         <localConverters:StringToFirstLetterConverter x:Key="StringToFirstLetterConverter"/>
         <localConverters:MidTankLevelToElementHeightConverter x:Key="MidTankLevelToElementHeightConverter"/>
+        <localConverters:JobLengthConverter x:Key="JobLengthConverter"/>
+        <localConverters:NanoLiterToLiterFormatConverter x:Key="NanoLiterToLiterFormatConverter"/>
 
         <ResourceDictionary x:Key="SelectAllTextBoxResource">
             <Style TargetType="TextBox">
@@ -36,6 +42,16 @@
             <Setter Property="TextWrapping" Value="Wrap"/>
         </Style>
 
+        <Style TargetType="lvc:PieSeries">
+            <Setter Property="Stroke" Value="#99F9F9F9"></Setter>
+            <Setter Property="StrokeThickness" Value="2"/>
+            <Setter Property="Foreground"  Value="#FF1C1C1F" />
+        </Style>
+        <Style TargetType="lvc:PieChart">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="LegendLocation" Value="None"/>
+        </Style>
+
         <DataTemplate x:Key="PopUpDataTemplate">
             <CheckBox VerticalAlignment="Center" FontSize="11" DockPanel.Dock="Left" IsChecked="{Binding IsSelected}">
                 <CheckBox.Content>
@@ -68,34 +84,6 @@
             </CheckBox>
         </DataTemplate>
 
-        <DataTemplate x:Key="LiquidQuantitiesTemplate">
-            <DockPanel  ToolTip="{Binding Quantity}" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="10">
-                <Grid DockPanel.Dock="Top" Height="40" Margin="8 10 0 0" Width="16">
-                    <Border x:Name="LiquidTypeBorder"  BorderThickness="1" BorderBrush="{StaticResource borderBrush}"  CornerRadius="2">
-                        <Canvas x:Name="LiquidCanvas" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0" ClipToBounds="True" ToolTip="{Binding Quantity}" ToolTipService.Placement="Left" ToolTipService.VerticalOffset="10">
-                            <Border  Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualHeight }" Width="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualWidth }">
-                                <Border.Background>
-                                    <SolidColorBrush Color="{Binding LiquidType,Converter={StaticResource LiquidTypeToColorConverter}}" />
-                                </Border.Background>
-                                <Border.Style>
-                                    <Style>
-                                        <Setter Property="Canvas.Top" >
-                                            <Setter.Value>
-                                                <MultiBinding Converter="{StaticResource MidTankLevelToElementHeightConverter}">
-                                                    <Binding RelativeSource="{RelativeSource Self}" Path="ActualHeight" />
-                                                    <Binding Path="Quantity" />
-                                                </MultiBinding>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </Border.Style>
-                            </Border>
-                        </Canvas>
-                    </Border>
-                </Grid>
-                <TextBlock DockPanel.Dock="Bottom" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0" Text="{Binding LiquidType,Converter={StaticResource StringToFirstLetterConverter}}" Foreground="Gray"/>
-            </DockPanel>
-        </DataTemplate>
 
         <Style x:Key="{x:Type ToolTip}" TargetType="{x:Type ToolTip}" BasedOn="{StaticResource MaterialDesignToolTip}">
             <Setter Property="Background"  Value="{StaticResource Logging.Background}" />
@@ -320,12 +308,12 @@
                                                         </TextBlock>
                                                     </DockPanel>
                                                 </Border>
-                                                <Popup AllowsTransparency="True"  StaysOpen="False" IsOpen="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton},Path=IsChecked }" >
-                                                    <Border Padding="3" CornerRadius="0 0 3 3" MinWidth="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton},Path=Width}" Margin="5" Background="#F6F6F6" BorderBrush="{StaticResource AutoCompleteTextBox.Popup.BorderBrush}" >
+                                                <Popup AllowsTransparency="True"  StaysOpen="False" IsOpen="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton},Path=IsChecked }">
+                                                    <Border Padding="3" CornerRadius="0 0 3 3" MinWidth="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton},Path=Width}" Margin="5" BorderBrush="{StaticResource AutoCompleteTextBox.Popup.BorderBrush}" >
                                                         <Border.Effect>
                                                             <DropShadowEffect Opacity="0.2" />
                                                         </Border.Effect>
-                                                        <ScrollViewer MaxHeight="600" Background="{DynamicResource ComboBox.Floating.Background}">
+                                                        <ScrollViewer MaxHeight="600" Background="#F6F6F6">
                                                             <ItemsControl ItemsSource="{Binding SelectedThreads}"  Foreground="{StaticResource MainWindow.Foreground}" ItemTemplate="{StaticResource PopupThreadDataTemplate}"/>
 
                                                         </ScrollViewer>
@@ -436,18 +424,49 @@
                 <DataGridTextColumn Header="Thread" Binding="{Binding Rml.Name}" Width="80" ElementStyle="{StaticResource WrapText}"/>
                 <DataGridTextColumn Header="Length" Binding="{Binding JobRun.JobLength, StringFormat={}{0:0.00}}" Width="60" />
                 <DataGridTextColumn Header="Source" Binding="{Binding JobRun.Source, Converter={StaticResource EnumToDescriptionConverter}}" Width="60" />
-                <DataGridTextColumn Header="Upload &#10;Duration" Binding="{Binding UploadDuration, Converter={StaticResource DateTimeToStringFormatConverter}, FallbackValue='N/A',TargetNullValue='N/A'}" Width="90"/>
-                <DataGridTextColumn Header="Heating &#10;Duration" Binding="{Binding HeatingDuration, Converter={StaticResource DateTimeToStringFormatConverter}, FallbackValue='N/A',TargetNullValue='N/A'}" Width="90" />
+                <DataGridTextColumn Header="Upload &#10;Duration" Binding="{Binding UploadDuration, Converter={StaticResource DateTimeToStringFormatConverter}, FallbackValue='N/A',TargetNullValue='N/A'}" Width="80"/>
+                <DataGridTextColumn Header="Heating &#10;Duration" Binding="{Binding HeatingDuration, Converter={StaticResource DateTimeToStringFormatConverter}, FallbackValue='N/A',TargetNullValue='N/A'}" Width="80" />
                 <DataGridTextColumn Header="Start Time" Binding="{Binding JobRun.ActualStartDate, Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="95" />
                 <DataGridTextColumn Header="IsGradient" Binding="{Binding JobRun.IsGradient}" Width="70" />
                 <DataGridTextColumn Header="GR" Binding="{Binding JobRun.GradientResolutionCm}" Width="30" />
                 <DataGridTextColumn Header="Status" Binding="{Binding JobRun.JobRunStatus, Converter={StaticResource EnumToDescriptionConverter}}" Width="70"/>
-                <DataGridTextColumn Header="End Time" Binding="{Binding JobRun.EndDate, Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="90" />
-                <DataGridTextColumn Header="End &#10;Position" Binding="{Binding JobRun.EndPosition, StringFormat={}{0:0.00}}" Width="90" />
-                <DataGridTemplateColumn Header="Liquid Quantities" Width="1*" >
+                <DataGridTextColumn Header="End Time" Binding="{Binding JobRun.EndDate, Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="95" />
+                <DataGridTextColumn Header="End &#10;Position" Binding="{Binding JobRun.EndPosition, StringFormat={}{0:0.00}}" Width="70" />
+                <DataGridTemplateColumn Header="Liquid Quantities" Width="1*">
+                    <DataGridTemplateColumn.CellStyle>
+                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                            <Setter Property="VerticalAlignment" Value="Center"/>
+                            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                            <Setter Property="Margin" Value="0 0 10 0"/>
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                                        <ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                            <Style.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="Background" Value="Transparent"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource AccentColorBrush}" />
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGridTemplateColumn.CellStyle>
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <ItemsControl ItemsSource="{Binding JobRun.LiquidQuantities,Mode=OneWay}" Margin="0 0 0 0" Height="80" ItemTemplate="{StaticResource LiquidQuantitiesTemplate}">
+                            <Grid  HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="1*"/>
+                                    <RowDefinition Height="20"/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*" MaxWidth="200"/>
+                                </Grid.ColumnDefinitions>
+                                <ItemsControl ItemsSource="{Binding JobRun.LiquidQuantities,Mode=OneWay}" Margin="0 0 0 0" Height="70">
                                 <ItemsControl.ItemContainerStyle>
                                     <Style TargetType="ContentPresenter">
                                         <Setter Property="Visibility" Value="Visible"></Setter>
@@ -460,10 +479,53 @@
                                 </ItemsControl.ItemContainerStyle>
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
-                                        <UniformGrid Rows="1" IsItemsHost="True"></UniformGrid>
+                                        <StackPanel Orientation="Horizontal" IsItemsHost="True"></StackPanel>
                                     </ItemsPanelTemplate>
                                 </ItemsControl.ItemsPanel>
-                            </ItemsControl>
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <DockPanel  ToolTip="{Binding Quantity}" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="10">
+                                                <Grid DockPanel.Dock="Top" Height="40" Margin="0 5 8 0" Width="16">
+                                                    <Border x:Name="LiquidTypeBorder"  BorderThickness="1" BorderBrush="{StaticResource borderBrush}"  CornerRadius="2">
+                                                        <Canvas x:Name="LiquidCanvas" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0" ClipToBounds="True" ToolTip="{Binding Quantity}" ToolTipService.Placement="Left" ToolTipService.VerticalOffset="10">
+                                                            <Border  Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualHeight }" Width="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualWidth }">
+                                                                <Border.Background>
+                                                                    <SolidColorBrush Color="{Binding LiquidType,Converter={StaticResource LiquidTypeToColorConverter}}" />
+                                                                </Border.Background>
+                                                                <Border.Style>
+                                                                    <Style>
+                                                                        <Setter Property="Canvas.Top" >
+                                                                            <Setter.Value>
+                                                                                <MultiBinding Converter="{StaticResource MidTankLevelToElementHeightConverter}">
+                                                                                    <Binding RelativeSource="{RelativeSource Self}" Path="ActualHeight" />
+                                                                                    <Binding Path="Quantity" />
+                                                                                </MultiBinding>
+                                                                            </Setter.Value>
+                                                                        </Setter>
+                                                                    </Style>
+                                                                </Border.Style>
+                                                            </Border>
+                                                        </Canvas>
+                                                    </Border>
+                                                </Grid>
+                                                <TextBlock DockPanel.Dock="Bottom" FontSize="9" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 0 10 0" Text="{Binding LiquidType,Converter={StaticResource StringToFirstLetterConverter}}" Foreground="Gray"/>
+                                            </DockPanel>
+
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                                <Border Grid.Row="1" Grid.Column="0" Background="Transparent" HorizontalAlignment="Stretch" Height="8" BorderThickness="1" BorderBrush="{StaticResource borderBrush}">
+                                    <Rectangle Margin="0 0 -1 0" Fill="{StaticResource AccentColorBrush}" HorizontalAlignment="Left" VerticalAlignment="Stretch" ToolTip="{Binding JobRun.EndPosition}">
+                                        <Rectangle.Width>
+                                            <MultiBinding Converter="{StaticResource JobLengthConverter}">
+                                                <Binding Path="JobRun.JobLength" />
+                                                <Binding Path="JobRun.EndPosition"/>
+                                                <Binding Path="ActualWidth" RelativeSource="{RelativeSource AncestorType=Border}"/>
+                                            </MultiBinding>
+                                        </Rectangle.Width>
+                                    </Rectangle>
+                                </Border>
+                            </Grid>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
@@ -475,11 +537,142 @@
                 <TextBlock Margin="10" Text="{Binding SelectedJobName}"></TextBlock>
             </StackPanel>
         </Border>
-        <Border Grid.Row="2"  Margin="20, 10, 0, 20" BorderBrush="{StaticResource borderBrush}" Background="{StaticResource TransparentBackgroundBrush}" BorderThickness="1">
-            <StackPanel Background="{StaticResource TransparentBackgroundBrush}" >
-                <TextBlock>TOTALS:</TextBlock>
-                <TextBlock>Cyan:</TextBlock>
-            </StackPanel>
+        <Border Grid.Row="2"  Margin="20, 0, 0, 20" Height="200" BorderBrush="{StaticResource borderBrush}" Background="{StaticResource TransparentBackgroundBrush}" BorderThickness="1">
+            <Grid  >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="2"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="2"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Border Grid.Column="0" BorderBrush="{StaticResource borderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
+                    <StackPanel Orientation="Vertical">
+                        <ItemsControl ItemsSource="{Binding StatisticsValueCollection.StatisticsCollection}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{Binding Name}"/>
+                                        <TextBlock Text=": "/>
+                                        <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/>
+                                        <TextBlock Text="{Binding Unit}"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                        <TextBlock Margin="0 10 0 0">Total Thread Consumption per thread:</TextBlock>
+                        <ItemsControl ItemsSource="{Binding StatisticsValueCollection.ThreadConsumptionPerThreadCollection}">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <UniformGrid Rows="3" />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.Resources>
+                                <DataTemplate DataType="{x:Type model:StatisticsValue}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{Binding Name}"/>
+                                        <TextBlock Text=": "/>
+                                        <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/>
+                                        <TextBlock Text="{Binding Unit}"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                                <DataTemplate DataType="{x:Type model:MoreValue}">
+                                    <Border BorderThickness="0">
+                                        <TextBlock Text="{Binding Text}" Tag="{Binding Path=DataContext.StatisticsValueCollection.ThreadConsumptionPerThread, RelativeSource={RelativeSource Mode=FindAncestor,  AncestorType={x:Type ItemsControl}}}"   HorizontalAlignment="Left"   VerticalAlignment="Center" >
+                                            <TextBlock.ToolTip >
+                                                <ToolTip DataContext="{Binding RelativeSource={RelativeSource Self},Path=PlacementTarget.Tag}" Placement="Right" Background="{StaticResource Logging.Background}">
+                                                    <Border CornerRadius="5">
+                                                        <ItemsControl  ItemsSource="{Binding }">
+                                                            <ItemsControl.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <StackPanel Orientation="Horizontal" Margin="2">
+                                                                        <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                                        <TextBlock Text=": "/>
+                                                                        <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/>
+                                                                        <TextBlock Text="{Binding Unit}"/>
+                                                                    </StackPanel>
+                                                                </DataTemplate>
+                                                            </ItemsControl.ItemTemplate>
+                                                        </ItemsControl>
+                                                    </Border>
+                                                </ToolTip>
+                                            </TextBlock.ToolTip>
+                                        </TextBlock>
+                                    </Border>
+                                </DataTemplate>
+                            </ItemsControl.Resources>
+                        </ItemsControl>
+                    </StackPanel>
+                </Border>
+                <Border Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Stretch" Width="2" Background="{StaticResource borderBrush}" Margin="0 4" Visibility="Visible"></Border>
+                <Border Grid.Column="2" BorderBrush="{StaticResource borderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
+                    <DockPanel>
+                        <UniformGrid Columns="3">
+                            <DockPanel>
+                                <TextBlock DockPanel.Dock="Top" FontSize="12" FontWeight="Bold" HorizontalAlignment="Center" Padding="2" Text="PPC/MS"></TextBlock>
+                                <lvc:PieChart  Series="{Binding StatisticsValueCollection.PieJobSource.SeriesCollection}" >
+                                    <lvc:PieChart.DataTooltip>
+                                        <tooltips:PieChartTooltipControl Visibility="Visible" />
+                                    </lvc:PieChart.DataTooltip>
+                                </lvc:PieChart>
+                            </DockPanel>
+                            <DockPanel>
+                                <TextBlock DockPanel.Dock="Top" FontSize="12" FontWeight="Bold" HorizontalAlignment="Center" Padding="2" Text="Failed/Aborted/Completed"></TextBlock>
+                                <lvc:PieChart  Series="{Binding StatisticsValueCollection.PieJobRunStatus.SeriesCollection}">
+                                    <lvc:PieChart.DataTooltip>
+                                        <tooltips:PieChartTooltipControl Visibility="Visible" />
+                                    </lvc:PieChart.DataTooltip>
+                                </lvc:PieChart>
+                            </DockPanel>
+                            <DockPanel>
+                                <TextBlock DockPanel.Dock="Top" FontSize="12" FontWeight="Bold" HorizontalAlignment="Center" Padding="2" Text="Gradient/Solid"></TextBlock>
+                                <lvc:PieChart  Series="{Binding StatisticsValueCollection.PieGradientSolid.SeriesCollection}"  >
+                                    <lvc:PieChart.DataTooltip>
+                                        <tooltips:PieChartTooltipControl Visibility="Visible" />
+                                    </lvc:PieChart.DataTooltip>
+                                </lvc:PieChart>
+                            </DockPanel>
+                        </UniformGrid>
+                    </DockPanel>
+                </Border>
+
+                <Border Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Stretch" Width="2" Background="{StaticResource borderBrush}" Margin="0 6" CornerRadius="1"/>
+
+                <Border Grid.Column="4" BorderBrush="{StaticResource borderBrush}" Padding="5" BorderThickness="1" CornerRadius="5" Margin="10">
+                    <DockPanel>
+                        <ItemsControl DockPanel.Dock="Top" ItemsSource="{Binding StatisticsValueCollection.LiquidQuantities}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                    <UniformGrid Columns="3"/>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                    <StackPanel Orientation="Horizontal" Margin="4">
+                                        <Ellipse Width="30" Height="30">
+                                            <Ellipse.Fill>
+                                                <SolidColorBrush Color="{Binding LiquidType,Converter={StaticResource LiquidTypeToColorConverter}}" />
+                                            </Ellipse.Fill>
+                                        </Ellipse>
+                                        <StackPanel Orientation="Vertical" Margin="4">
+                                            <TextBlock Text="{Binding LiquidType,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
+                                            <TextBlock >
+                                             <Run Text="{Binding Quantity, Converter={StaticResource NanoLiterToLiterFormatConverter}}"></Run>
+                                            <Run Text=" liters"></Run>
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                        <TextBlock DockPanel.Dock="Bottom" Margin="4 10 0 0 ">
+                            <Run Text="Total liquid quantities for all: "/>
+                            <Run Text="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource NanoLiterToLiterFormatConverter}}"></Run>
+                            <Run Text=" liters"></Run>
+                        </TextBlock>
+                    </DockPanel>
+                </Border>
+            </Grid>
         </Border>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml.cs
index c460e2a9b..2b3ed79ca 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml.cs
@@ -1,4 +1,6 @@
-using System;
+using LiveCharts;
+using LiveCharts.Wpf;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -79,5 +81,6 @@ namespace Tango.MachineStudio.Statistics.Views
                 }
             }
         }
+        
     }
 }
-- 
cgit v1.3.1