From 88ac356fd2d30e016bb884697e7b67f8ede51d2b Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 20 Mar 2019 13:13:52 +0200
Subject: Fixed issue with PPC "add job" button hiding the "delete job" button.
 Removed message box on error in color lab module.

---
 .../Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs | 4 +++-
 Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/PPC')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index cc9202b30..aef6dd549 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -607,7 +607,9 @@ namespace Tango.PPC.Jobs.ViewModels
 
         private async void ExportJob()
         {
-            var selected_job = SelectedJobs.First();
+            var selected_job = SelectedJobs.FirstOrDefault();
+            if (selected_job == null) return;
+
             ClearSelection();
 
             var result = await NavigationManager.
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
index 47a3df569..475437cf3 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
@@ -59,6 +59,7 @@
                     <StackPanel.Style>
                         <Style TargetType="StackPanel">
                             <Setter Property="Opacity" Value="0"></Setter>
+                            <Setter Property="IsHitTestVisible" Value="False"></Setter>
                             <Setter Property="RenderTransform">
                                 <Setter.Value>
                                     <TranslateTransform X="100" />
@@ -66,6 +67,7 @@
                             </Setter>
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding IsMultiSelecting}" Value="True">
+                                    <Setter Property="IsHitTestVisible" Value="True"></Setter>
                                     <DataTrigger.EnterActions>
                                         <BeginStoryboard>
                                             <Storyboard>
@@ -119,6 +121,7 @@
                     <touch:TouchIconButton.Style>
                         <Style TargetType="touch:TouchIconButton" BasedOn="{StaticResource TangoRoundTouchIconButton}">
                             <Setter Property="Opacity" Value="1"></Setter>
+                            <Setter Property="IsHitTestVisible" Value="True"></Setter>
                             <Setter Property="RenderTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -126,6 +129,7 @@
                             </Setter>
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding IsMultiSelecting}" Value="True">
+                                    <Setter Property="IsHitTestVisible" Value="False"></Setter>
                                     <DataTrigger.EnterActions>
                                         <BeginStoryboard>
                                             <Storyboard>
-- 
cgit v1.3.1