From fc338662f508ab950b8866ee4b8ddee7712e81e1 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 5 Jul 2020 15:55:11 +0300
Subject: Added tooltips to all liquid quantities.

Related Work Items: #2937
---
 .../Tango.MachineStudio.Statistics/Views/JobRunsView.xaml   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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

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 b3e93a52c..e6c46ba10 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
@@ -32,6 +32,7 @@
         <localConverters:JobLengthConverter x:Key="JobLengthConverter"/>
         <localConverters:NanoLiterToLiterFormatConverter x:Key="NanoLiterToLiterFormatConverter"/>
         <localConverters:LiquidQuantityToFormatStringConverter x:Key="LiquidQuantityToFormatStringConverter"/>
+        <localConverters:TooltipLiquidQuantityFormatConverter x:Key="TooltipLiquidQuantityFormatConverter"/>
 
         <ResourceDictionary x:Key="SelectAllTextBoxResource">
             <Style TargetType="TextBox">
@@ -518,7 +519,7 @@
                                 </ItemsControl.ItemsPanel>
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate>
-                                            <DockPanel  ToolTip="{Binding Quantity}" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="10">
+                                            <DockPanel  ToolTip="{Binding Quantity,  Converter={StaticResource TooltipLiquidQuantityFormatConverter}, ConverterParameter='#,#\\'}" 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">
@@ -539,7 +540,7 @@
                                                                     </Style>
                                                                 </Border.Style>
                                                             </Border>
-                                                            <Border Background="Transparent" ToolTip="{Binding Quantity}" Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualHeight }" Width="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualWidth }"></Border>
+                                                            <Border Background="Transparent" ToolTip="{Binding Quantity, Converter={StaticResource TooltipLiquidQuantityFormatConverter}, ConverterParameter='#,#\\'}" Height="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualHeight }" Width="{Binding RelativeSource={RelativeSource AncestorType=Canvas}, Path=ActualWidth }"></Border>
                                                         </Canvas>
                                                     </Border>
                                                 </Grid>
@@ -589,7 +590,7 @@
                                     <StackPanel Orientation="Horizontal" Margin="0 3">
                                         <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
                                         <TextBlock Text=": "/>
-                                        <TextBlock Text="{Binding Value, StringFormat={}{0:#,0.##}}"/>
+                                        <TextBlock Text="{Binding Value, StringFormat={}{0:N2}}"/>
                                         <TextBlock Text="{Binding Unit}"/>
                                     </StackPanel>
                                 </DataTemplate>
@@ -634,7 +635,7 @@
                                                                     <StackPanel Orientation="Horizontal" Margin="2">
                                                                         <TextBlock Margin="5 0 0 0" Text="{Binding Name}" FontWeight="SemiBold"/>
                                                                         <TextBlock Text=": "/>
-                                                                        <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/>
+                                                                        <TextBlock Text="{Binding Value, StringFormat={}{0:N0}}"/>
                                                                         <TextBlock Text="{Binding Unit}"/>
                                                                     </StackPanel>
                                                                 </DataTemplate>
@@ -694,7 +695,7 @@
                         </ItemsControl.ItemsPanel>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                    <Border Background="Transparent" ToolTip="{Binding Quantity, Converter={StaticResource NanoLiterToLiterFormatConverter}}">
+                                    <Border Background="Transparent" ToolTip="{Binding Quantity, Converter={StaticResource TooltipLiquidQuantityFormatConverter}, ConverterParameter='#,#\\'}">
                                         <StackPanel Orientation="Horizontal" Margin="4">
                                         <Ellipse Width="30" Height="30">
                                             <Ellipse.Fill>
@@ -713,7 +714,7 @@
                                 </DataTemplate>
                         </ItemsControl.ItemTemplate>
                         </ItemsControl>
-                        <Border Background="Transparent" ToolTip="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource LiquidQuantityToFormatStringConverter}}">
+                        <Border Background="Transparent" ToolTip="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource TooltipLiquidQuantityFormatConverter}, ConverterParameter='#,#\\'}">
                         <TextBlock DockPanel.Dock="Bottom" Margin="4 10 0 0 ">
                             <Run Text="Total liquid quantities for all: " FontWeight="SemiBold"/>
                             <Run Text="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource NanoLiterToLiterFormatConverter}, ConverterParameter='0.00'}"></Run>
-- 
cgit v1.3.1