1 files changed, 25 insertions, 8 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/JobEventView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/JobEventView.xaml
index d283b08d3..69a2d56f4 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/JobEventView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/JobEventView.xaml
@@ -4,22 +4,39 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:converters="clr-namespace:Tango.PPC.Events.Converters"
              xmlns:local="clr-namespace:Tango.PPC.Events.EventsViews"
              mc:Ignorable="d" 
              d:DesignHeight="220" d:DesignWidth="750" d:DataContext="{d:DesignInstance Type=entities:MachinesEvent, IsDesignTimeCreatable=False}">
+    <UserControl.Resources>
+        <converters:MachineEventToMachineTypeConverter x:Key="MachineEventToMachineTypeConverter" />
+    </UserControl.Resources>
+
     <Grid Background="{StaticResource TangoPrimaryBackgroundBrush}">
         <DockPanel>
-            <Image Stretch="None" Margin="20" DockPanel.Dock="Right" Source="../Images/machine_small.png" RenderOptions.BitmapScalingMode="Fant" />
+            <Image Margin="20" Stretch="None" DockPanel.Dock="Right" RenderOptions.BitmapScalingMode="Fant">
+                <Image.Style>
+                    <Style TargetType="Image">
+                        <Setter Property="Source" Value="../Images/machine_small.png"></Setter>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Converter={StaticResource MachineEventToMachineTypeConverter}}" Value="TS1800">
+                                <Setter Property="Source" Value="../Images/machine_small.png"></Setter>
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding Converter={StaticResource MachineEventToMachineTypeConverter}}" Value="Eureka">
+                                <Setter Property="Source" Value="../Images/machine_small_X4.png"></Setter>
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding Converter={StaticResource MachineEventToMachineTypeConverter}}" Value="X1">
+                                <Setter Property="Source" Value="../Images/machine_small_X4.png"></Setter>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Image.Style>
+            </Image>
             <DockPanel Margin="35 20 20 20">
-                <TextBlock FontSize="{StaticResource TangoTitleFontSize}" FontWeight="SemiBold" DockPanel.Dock="Top" Text="{Binding EventType.Title,FallbackValue='Unknown Event'}"></TextBlock>
+                <TextBlock FontSize="{StaticResource TangoTitleFontSize}" FontWeight="SemiBold" DockPanel.Dock="Top" Text="{Binding EventType.Description,FallbackValue='No Description'}"></TextBlock>
 
                 <StackPanel Margin="0 30 0 0">
-                    <TextBlock TextWrapping="Wrap" FontWeight="SemiBold" Text="{Binding EventType.Description,FallbackValue='No Description'}"></TextBlock>
-                    <Rectangle Margin="0 5 0 10" StrokeThickness="2" Stroke="{StaticResource TangoDividerBrush}" />
-
-                    <TextBlock Text="{Binding Description}" TextWrapping="Wrap">
-                        
-                    </TextBlock>
+                    <TextBlock TextWrapping="Wrap" FontWeight="SemiBold" Text="{Binding Description,FallbackValue='No Description'}"></TextBlock>
                 </StackPanel>
             </DockPanel>
         </DockPanel>