Job runs extended info.

5 files changed, 46 insertions, 2 deletions

diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/TextIconButton.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/TextIconButton.xaml
index eb8d823f7..20228582c 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/TextIconButton.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/TextIconButton.xaml
@@ -9,7 +9,7 @@
                 <DataTemplate>
                     <DockPanel>
                         <material:PackIcon Margin="-5 0 0 0" Width="Auto" Height="Auto" Kind="{Binding RelativeSource={RelativeSource AncestorType=local:TextIconButton},Path=Icon}" VerticalAlignment="Center" />
-                        <Label VerticalAlignment="Center" Content="{Binding}"></Label>
+                        <Label TextElement.Foreground="{Binding RelativeSource={RelativeSource AncestorType=local:TextIconButton},Path=Foreground}" VerticalAlignment="Center" Content="{Binding}"></Label>
                     </DockPanel>
                 </DataTemplate>
             </Setter.Value>
@@ -22,7 +22,24 @@
                 <DataTemplate>
                     <DockPanel>
                         <material:PackIcon Margin="-5 0 0 0" Width="Auto" Height="Auto" Kind="{Binding RelativeSource={RelativeSource AncestorType=local:TextIconButton},Path=Icon}" VerticalAlignment="Center" />
-                        <Label VerticalAlignment="Center" Content="{Binding}"></Label>
+                        <Label TextElement.Foreground="{Binding RelativeSource={RelativeSource AncestorType=local:TextIconButton},Path=Foreground}"  VerticalAlignment="Center" Content="{Binding}"></Label>
+                    </DockPanel>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="FSE_TextIconButton_Flat_Accent" TargetType="{x:Type local:TextIconButton}" BasedOn="{StaticResource FSE_FlatButton_ForegroundAccentHover}">
+        <Setter Property="BorderThickness" Value="0"></Setter>
+        <Setter Property="Padding" Value="0"></Setter>
+        <Setter Property="material:ShadowAssist.ShadowDepth" Value="Depth0"></Setter>
+        <Setter Property="Background" Value="Transparent"></Setter>
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <DockPanel>
+                        <material:PackIcon Margin="-5 0 0 0" Width="Auto" Height="Auto" Kind="{Binding RelativeSource={RelativeSource AncestorType=local:TextIconButton},Path=Icon}" VerticalAlignment="Center" />
+                        <Label TextElement.Foreground="{Binding RelativeSource={RelativeSource AncestorType=local:TextIconButton},Path=Foreground}"  VerticalAlignment="Center" Content="{Binding}"></Label>
                     </DockPanel>
                 </DataTemplate>
             </Setter.Value>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/ObjectToJsonConverter.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/ObjectToJsonConverter.cs
new file mode 100644
index 000000000..84a1721f5
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/ObjectToJsonConverter.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using Tango.Core.ExtensionMethods;
+
+namespace Tango.FSE.Common.Converters
+{
+    public class ObjectToJsonConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value?.ToJsonString();
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml
index d6bf2376e..adf193cd6 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml
@@ -58,4 +58,5 @@
     <localConverters:DisplayMemberPathToStringConverter x:Key="DisplayMemberPathToStringConverter" />
     <localConverters:LiquidTypeToColorConverter x:Key="LiquidTypeToColorConverter" />
     <localConverters:NanolitersToLitersConverter x:Key="NanolitersToLitersConverter" />
+    <localConverters:ObjectToJsonConverter x:Key="ObjectToJsonConverter" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs
index 66f9f53a3..e171228c7 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs
@@ -11,5 +11,6 @@ namespace Tango.FSE.Common.Statistics
     {
         Task<RequiredFiltersData> GetRequiredFiltersData();
         Task<StatisticsModel> GetStatistics(Filters filters);
+        Task<JobRunExtendedInfo> GetJobRunExtendedInfo(int jobRunID);
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
index 6dea217cb..60d8b8df8 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
@@ -216,6 +216,7 @@
     <Compile Include="Converters\LiquidTypeToColorConverter.cs" />
     <Compile Include="Converters\LiquidTypeToShortNameConverter.cs" />
     <Compile Include="Converters\NanolitersToLitersConverter.cs" />
+    <Compile Include="Converters\ObjectToJsonConverter.cs" />
     <Compile Include="Converters\TimeSpanHumanizeConverter.cs" />
     <Compile Include="Converters\TotalDyeTimeConverter.cs" />
     <Compile Include="Converters\TotalMetersConverter.cs" />