Eureka PPC. GoToJob, Notifications, LengthWothSpool.

2 files changed, 215 insertions, 110 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
index 097245990..fe42576b4 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
@@ -61,8 +61,8 @@
                                                 <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}">
                                                     <touch:TouchButton Margin="0 0 0 0" Padding="10 15" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}" >
                                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                            <Image VerticalAlignment="Center" Source="{Binding Image}" Width="32" Height="32"></Image>
-                                                            <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Text="{Binding Name}" Foreground="{StaticResource TangoLightForegroundBrush}"></TextBlock>
+                                                            <Image VerticalAlignment="Center" Source="{Binding Image}" Width="20" Height="20"></Image>
+                                                            <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Text="{Binding Name}" Foreground="{StaticResource TangoLightForegroundBrush}" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Light"></TextBlock>
                                                         </StackPanel>
                                                     </touch:TouchButton>
                                                 </Border>
@@ -75,8 +75,8 @@
                                     <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1">
                                         <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="10 15" Foreground="{StaticResource TangoDarkForegroundBrush}" Command="{Binding UpdateCommand}">
                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                <Image Source="/Images/Menu/update.png" VerticalAlignment="Center" Width="32" Height="32"></Image>
-                                                <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Foreground="{StaticResource TangoLightForegroundBrush}">Update</TextBlock>
+                                                <Image Source="/Images/Menu/update.png" VerticalAlignment="Center" Width="20" Height="20"></Image>
+                                                <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Foreground="{StaticResource TangoLightForegroundBrush}" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Light">Update</TextBlock>
                                             </StackPanel>
                                         </touch:TouchButton>
                                     </Border>
@@ -192,8 +192,8 @@
                                     </Border.Style>
                                     <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="10 0 0 25" Foreground="{StaticResource TangoDarkForegroundBrush}" Command="{Binding PowerCommand}" Background="{StaticResource TangoMenuPanelDarkBrush}">
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                            <Image Source="/Images/menu/power.png" VerticalAlignment="Center" Width="32" Height="32"></Image>
-                                            <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Foreground="{StaticResource TangoLightForegroundBrush}">Power</TextBlock>
+                                            <Image Source="/Images/menu/power.png" VerticalAlignment="Center" Width="20" Height="20"></Image>
+                                            <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Foreground="{StaticResource TangoLightForegroundBrush}" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Light">Power</TextBlock>
                                         </StackPanel>
                                     </touch:TouchButton>
                                 </Border>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index f681a5112..bbb6127e5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -14,6 +14,7 @@
     <UserControl.Resources>
 
         <locaConverters:LengthToWeightConverter x:Key="LengthToWeightConverter" />
+        <locaConverters:LengthWithSpoolsConverter x:Key="LengthWithSpoolsConverter"/>
 
         <Style x:Key="LinkRoundButtonStyle" TargetType="{x:Type touch:TouchButton}">
             <Setter Property="Background" Value="{StaticResource TangoMidAccentBrush}"></Setter>
@@ -90,7 +91,7 @@
                 </Grid.RowDefinitions>
                 <Grid Margin=" 0 0 0 20">
                     <DockPanel>
-                        <touch:TouchButton  DockPanel.Dock="Right" VerticalAlignment="Top" Style="{StaticResource TangoLinkButton}"  Foreground="{StaticResource TangoPrimaryAccentBrush}">
+                        <touch:TouchButton Command="{Binding GoToJobCommand}" DockPanel.Dock="Right" VerticalAlignment="Top" Style="{StaticResource TangoLinkButton}"  Foreground="{StaticResource TangoPrimaryAccentBrush}">
                             <StackPanel Orientation="Vertical">
                                 <TextBlock Margin="5 0 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Bottom">Go To Job</TextBlock>
                                 <Rectangle Height="3" Fill="{StaticResource TangoPrimaryAccentBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0"></Rectangle>
@@ -229,103 +230,118 @@
                                 </touch:TouchRingProgress.Style>
                             </touch:TouchRingProgress>
 
-                            <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" Maximum="100" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                <touch:TouchBusyIndicator.Style>
-                                    <Style TargetType="touch:TouchBusyIndicator">
-                                        <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                                        <Setter Property="Value" Value="0"></Setter>
-                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
-                                                <Setter Property="Visibility" Value="Visible"></Setter>
+                                    <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" Maximum="100" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <touch:TouchBusyIndicator.Style>
+                                            <Style TargetType="touch:TouchBusyIndicator">
+                                                <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
                                                 <Setter Property="Value" Value="0"></Setter>
-                                                <Setter Property="IsIndeterminate" Value="True"></Setter>
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
                                                 <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
-                                                <Setter Property="Value" Value="99.9999999"></Setter>
-                                                <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
-                                                <Setter Property="Value" Value="99.9999999"></Setter>
-                                                <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </touch:TouchBusyIndicator.Style>
-                            </touch:TouchBusyIndicator>
-
-                            <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                                        <Setter Property="Visibility" Value="Visible"></Setter>
+                                                        <Setter Property="Value" Value="0"></Setter>
+                                                        <Setter Property="IsIndeterminate" Value="True"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
+                                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
+                                                        <Setter Property="Value" Value="99.9999999"></Setter>
+                                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                        <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
+                                                        <Setter Property="Value" Value="99.9999999"></Setter>
+                                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                        <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </touch:TouchBusyIndicator.Style>
+                                    </touch:TouchBusyIndicator>
 
-                                <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                        <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
-                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
-                                    </StackPanel>
+                                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
 
-                                    <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
-                                            <Run Text="{Binding RunningJobStatus.ProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"/>
-                                            <Run FontSize="16">m</Run>
-                                    </TextBlock>
-                                </StackPanel>
+                                        <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Orientation="Horizontal" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}">
+                                                    <TextBlock.Text>
+                                                        <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                                            <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                        </MultiBinding>
+                                                    </TextBlock.Text>
+                                                </TextBlock>
+                                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}"  Text="/"></TextBlock>
+                                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}">
+                                                    <TextBlock.Text>
+                                                        <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" Mode="OneWay"/>
+                                                            <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                        </MultiBinding>
+                                                    </TextBlock.Text>
+                                                </TextBlock>
+                                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}"  Text="m"></TextBlock>
+                                            </StackPanel>
+                                        </StackPanel>
 
-                                <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                        <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
-                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock>
-                                    </StackPanel>
-                                </StackPanel>
+                                        <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock>
+                                            </StackPanel>
+                                        </StackPanel>
 
-                                <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
+                                        <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
 
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 15 0 0">
-                                    <Image Source="../Images/JobProgressView/clock.png" Stretch="None" />
-                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time Left</TextBlock>
-                                </StackPanel>
+                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 15 0 0">
+                                            <Image Source="../Images/JobProgressView/clock.png" Stretch="None" />
+                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time Left</TextBlock>
+                                        </StackPanel>
 
-                                <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                         <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                         <Run FontSize="16" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
-                                </TextBlock>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </Grid>
+
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                    <touch:TouchButton Content="Abort" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="true" BorderThickness="1" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False">
+                                        <touch:TouchButton.Style >
+                                            <Style TargetType="touch:TouchButton" >
+                                                <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                                <Setter Property="Background" Value="Transparent"/>
+                                                <Style.Triggers>
+                                                    <Trigger Property="IsEnabled" Value="False">
+                                                        <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
+                                                        <Setter Property="BorderBrush" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                                    </Trigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </touch:TouchButton.Style>
+                                    </touch:TouchButton>
+                                    <touch:TouchButton Content="Stop" Margin="20 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding StopCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False">
+                                        <touch:TouchButton.Style >
+                                            <Style TargetType="touch:TouchButton" >
+                                                <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter>
+                                                <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"/>
+                                                <Style.Triggers>
+                                                    <Trigger Property="IsEnabled" Value="False">
+                                                        <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
+                                                        <Setter Property="Background" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                                    </Trigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </touch:TouchButton.Style>
+                                    </touch:TouchButton>
+                                </StackPanel>
                             </StackPanel>
                         </Grid>
-
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                <touch:TouchButton Content="Abort" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="true" BorderThickness="1" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False">
-                                    <touch:TouchButton.Style >
-                                        <Style TargetType="touch:TouchButton" >
-                                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                                            <Setter Property="Background" Value="Transparent"/>
-                                            <Style.Triggers>
-                                                <Trigger Property="IsEnabled" Value="False">
-                                                    <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
-                                                    <Setter Property="BorderBrush" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
-                                                </Trigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </touch:TouchButton.Style>
-                                </touch:TouchButton>
-                                <touch:TouchButton Content="Stop" Margin="20 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding StopCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False">
-                                    <touch:TouchButton.Style >
-                                        <Style TargetType="touch:TouchButton" >
-                                            <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter>
-                                            <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"/>
-                                            <Style.Triggers>
-                                                <Trigger Property="IsEnabled" Value="False">
-                                                    <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
-                                                    <Setter Property="Background" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
-                                                </Trigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </touch:TouchButton.Style>
-                                </touch:TouchButton>
-                        </StackPanel>
-                    </StackPanel>
-                    </Grid>
             </DockPanel>
                 <StackPanel x:Name="Job_Progress" Grid.Row="2" Margin="0 25 0 0" Orientation="Vertical">
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -347,8 +363,15 @@
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                             <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
                             <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock>
-                                    <TextBlock Text="{Binding RunningJobStatus.ProgressMinusSettingUp,StringFormat=0.##,FallbackValue=0}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
+                                <TextBlock x:Name="ProgressLength"  VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock>
+                                    <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
+                                        <TextBlock.Text>
+                                            <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
+                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                                <Binding Path="Job.Spools" Mode="OneWay"/>
+                                            </MultiBinding>
+                                        </TextBlock.Text>
+                                    </TextBlock>
                             </StackPanel>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -357,9 +380,10 @@
                                 <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock>
                                     <TextBlock   FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                         <TextBlock.Text>
-                                            <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.#####" TargetNullValue='-' FallbackValue='-'>
-                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp"/>
-                                                <Binding Path="Job.GramPerLength"/>
+                                            <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.#####" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
+                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                                <Binding Path="Job.GramPerLength" Mode="OneWay"/>
+                                                <Binding Path="Job.Spools" Mode="OneWay"/>
                                             </MultiBinding>
                                         </TextBlock.Text>
                                     </TextBlock>
@@ -430,33 +454,33 @@
                                     <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">86</TextBlock>
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                    <Border Width="50" Height="50" Background="Magenta" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">M</TextBlock>
+                                    <Border Width="50" Height="50" Background="LightCyan" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LC</TextBlock>
                                     <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">86</TextBlock>
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                    <Border Width="50" Height="50" Background="Yellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">Y</TextBlock>
+                                    <Border Width="50" Height="50" Background="Magenta" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">M</TextBlock>
                                     <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">86</TextBlock>
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                    <Border Width="50" Height="50" Background="Black" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">K</TextBlock>
+                                    <Border Width="50" Height="50" Background="LightPink" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LM</TextBlock>
                                     <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">86</TextBlock>
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                    <Border Width="50" Height="50" Background="White" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">-</TextBlock>
+                                    <Border Width="50" Height="50" Background="Yellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">Y</TextBlock>
                                     <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">86</TextBlock>
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                    <Border Width="50" Height="50" Background="White" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">-</TextBlock>
+                                    <Border Width="50" Height="50" Background="LightYellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LY</TextBlock>
                                     <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">86</TextBlock>
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                    <Border Width="50" Height="50" Background="White" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">-</TextBlock>
+                                    <Border Width="50" Height="50" Background="Black" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">K</TextBlock>
                                     <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">86</TextBlock>
                                 </StackPanel>
                             </UniformGrid>
@@ -470,6 +494,87 @@
 
         </Grid>
         </Grid>
-    </Grid>
+        </Grid>
+        <Grid VerticalAlignment="Bottom" Grid.ColumnSpan="2" Margin="10 0 0 0">
+            <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0" IsExpanded="false" CornerRadius="20 20 0 0" >
+                <touch:TouchExpander.Header>
+                    <DockPanel >
+                        <touch:TouchButton Margin="0 0 20 0" Content="Clear All" DockPanel.Dock="Right" Width="120"  Height="38"  HorizontalAlignment="Right" VerticalAlignment="Center" EnableDropShadow="False"  Background="Transparent" BorderThickness="1" CornerRadius="19"  BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Foreground="{StaticResource TangoPrimaryAccentBrush}" >
+                           
+                        </touch:TouchButton>
+                        <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" VerticalAlignment="Center"  >
+                            <!--<Image Source="../Images/JobView/job-summary.png" Width="39" />-->
+                            <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" >Notifications</TextBlock>
+                            <TextBlock  Margin="20 0 0 0" VerticalAlignment="Center" FontWeight="Normal" Visibility="{Binding NotificationProvider.HasNotificationItems, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <Run Text="(" ></Run>
+                                <Run Text="7(TEST)"></Run>
+                                <Run Text=" new Events)" ></Run>
+                            </TextBlock>
+                        </StackPanel>
+                    </DockPanel>
+                </touch:TouchExpander.Header>
+                <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <ItemsControl ClipToBounds="False" ItemsSource="{Binding NotificationProvider.NotificationItems}" >
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" ClipToBounds="False"></StackPanel>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Border BorderThickness="1" Margin="-1 0 0 0" BorderBrush="{StaticResource TangoDividerBrush}" Width="935">
+                                <DockPanel HorizontalAlignment="Stretch" >
+                                    <Grid DockPanel.Dock="Right" Width="40" HorizontalAlignment="Right" VerticalAlignment="Stretch" Visibility="{Binding CanClose,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <Grid Margin="0 0 20 0" HorizontalAlignment="Right" VerticalAlignment="Center" Width="14" Height="14">
+                                            <touch:TouchIcon Icon="Close" Foreground="Black" />
+                                        </Grid>
+                                        <touch:TouchButton Opacity="0" Background="Transparent" Style="{StaticResource TangoFlatButton}" Command="{Binding CloseCommand}" CommandParameter="{Binding}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}" Padding="5" />
+                                    </Grid>
+                                    <touch:TouchIcon Margin="24 12 15 12" DockPanel.Dock="Left" Height="32">
+                                        <touch:TouchIcon.Style>
+                                            <Style TargetType="touch:TouchIcon">
+                                                <Setter Property="Icon" Value="Information"></Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding MessageType}" Value="Info">
+                                                            <Setter Property="Icon" Value="InformationOutline"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding MessageType}" Value="Success">
+                                                            <Setter Property="Icon" Value="Check"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding MessageType}" Value="Warning">
+                                                            <Setter Property="Icon" Value="AlertCircleOutline"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding MessageType}" Value="Error">
+                                                            <Setter Property="Icon" Value="AlertCircleOutline"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"/>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding MessageType}" Value="Critical">
+                                                            <Setter Property="Icon" Value="Alert"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"/>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                        </touch:TouchIcon.Style>
+                                    </touch:TouchIcon>
+
+                                    <StackPanel Margin="20 3 40 3" VerticalAlignment="Center">
+                                        <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Foreground="Black" VerticalAlignment="Center" ></TextBlock>
+
+                                        <TextBlock Margin="0 5 0 0" Foreground="{StaticResource TangoDarkForegroundBrush}" Text="{Binding ExpandedMessage}" FontSize="{StaticResource TangoSmallFontSize}" TextWrapping="Wrap" VerticalAlignment="Center" >
+
+                                        </TextBlock>
+
+                                    </StackPanel>
+                                </DockPanel>
+                                </Border>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </Grid>
+            </touch:TouchExpander>
+        </Grid>
     </Grid>
 </UserControl>