Resume buttons. Buttons have been added to Machine Status View.

2 files changed, 36 insertions, 6 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
index 123151fcf..345231e57 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs
@@ -1823,7 +1823,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             if (Job != null && HasResumeModel)
             {
-                if (await NotificationProvider.ShowQuestion("Drop resume information and enable job editing?"))
+                if (await NotificationProvider.ShowQuestion("Are you sure you want to Edit the Job?" + System.Environment.NewLine + "Job progress data will reset."))
                 {
                     JobResumeManager.DropResume(Job.Guid);
                 }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index d6163506f..d348b2cc7 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -1341,7 +1341,7 @@
                             </Style>
                         </touch:TouchIconButton.Style>
                     </touch:TouchIconButton>-->
-                    <touch:TouchTextBox IsEnabled="{Binding CanEdit}" Margin="20 6 240 0"   Text="{Binding JobModel.Name,FallbackValue='Job Name'}" ToolTip="{Binding JobModel.Name}" VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold"></touch:TouchTextBox>
+                    <touch:TouchTextBox IsEnabled="{Binding CanEdit}" Margin="20 6 360 0"   Text="{Binding JobModel.Name,FallbackValue='Job Name'}" ToolTip="{Binding JobModel.Name}" VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold"></touch:TouchTextBox>
                     <!--<touch:TouchButton  Margin="0 0 0 0"  VerticalAlignment="Center" Width="50" Height="50" HorizontalAlignment="Left"  EnableDropShadow="False"  Background="Transparent" BorderThickness="0" Command="{Binding EditJobDetailsCommand}" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}" 
                                     components:TransformationHelper.TransformWhenPressed ="False">
                         <Border  Height="24" Width="24" Margin="0 0 0 0"  BorderThickness="0" Background="Transparent" HorizontalAlignment="Center">
@@ -1350,8 +1350,9 @@
                     </touch:TouchButton>-->
 
                 </DockPanel>
-                <Canvas ClipToBounds="False" HorizontalAlignment="Right" Width="200">
-                    <touch:TouchButton VerticalAlignment="Center" Height="55" Canvas.Top="10" Width="200" CornerRadius="30" BlurRadius="10" EnableDropShadow="False" Command="{Binding DyeCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}">
+                <Canvas ClipToBounds="False" HorizontalAlignment="Right" Width="370">
+                    <DockPanel HorizontalAlignment="Stretch" Margin="0 10 10 0" LastChildFill="False"  Canvas.Right="0">
+                        <touch:TouchButton DockPanel.Dock="Right" VerticalAlignment="Center" Height="55" HorizontalAlignment="Right" Width="200" CornerRadius="30" BlurRadius="10" EnableDropShadow="False" Command="{Binding DyeCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}">
                         <touch:TouchButton.Style>
                             <Style TargetType="touch:TouchButton" BasedOn="{StaticResource {x:Type touch:TouchButton}}">
                                 <Setter Property="Content" Value="DYE"></Setter>
@@ -1363,9 +1364,38 @@
                             </Style>
                         </touch:TouchButton.Style>
                     </touch:TouchButton>
-                    <touch:TouchIconButton Visibility="{Binding HasResumeModel,Converter={StaticResource BooleanToVisibilityConverter}}" Icon="DeleteSweep" VerticalAlignment="Center" BorderThickness="0 0 1 0" BorderBrush="White" Height="55" Canvas.Left="-75" Canvas.Top="10" Background="{StaticResource TangoMidAccentBrush}" Padding="15" Width="100" CornerRadius="30 0 0 30" BlurRadius="10" EnableDropShadow="False" Command="{Binding DropResumeCommand}">
+                    <!--<touch:TouchIconButton Visibility="{Binding HasResumeModel,Converter={StaticResource BooleanToVisibilityConverter}}" Icon="DeleteSweep" VerticalAlignment="Center" BorderThickness="0 0 1 0" BorderBrush="White" Height="55" Canvas.Left="-75" Canvas.Top="10" Background="{StaticResource TangoMidAccentBrush}" Padding="15" Width="100" CornerRadius="30 0 0 30" BlurRadius="10" EnableDropShadow="False" Command="{Binding DropResumeCommand}">
                         
-                    </touch:TouchIconButton>
+                    </touch:TouchIconButton>-->
+                    <touch:TouchButton  Visibility="{Binding HasResumeModel,Converter={StaticResource BooleanToVisibilityConverter}}"  Margin="0 0 0 0" VerticalAlignment="Center" Height="55" Width="164" CornerRadius="30" Command="{Binding DropResumeCommand}"  BorderThickness="0"  EnableDropShadow="False" Style="{StaticResource TangoLinkButton}"  Foreground="{StaticResource TangoPrimaryAccentBrush}" >
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock Margin="5 0 0 0"  FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Bottom" Text="Edit Job" HorizontalAlignment="Center" Width="80">
+                                <TextBlock.Style>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsEnabled}" Value="False">
+                                                <Setter Property="Foreground" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                            <Rectangle Height="3"  VerticalAlignment="Bottom"  Margin="0 2 0 0" Width="84">
+                                <Rectangle.Style>
+                                    <Style TargetType="{x:Type Rectangle}">
+                                        <Setter Property="Fill" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsEnabled}" Value="False">
+                                                <Setter Property="Fill" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Rectangle.Style>
+                            </Rectangle>
+                        </StackPanel>
+                    </touch:TouchButton>
+                    </DockPanel>
                 </Canvas>
             </Grid>
         </Border>