From b294fd44000766de11ce6c0e2d82d2fae81c82b9 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Wed, 13 Nov 2019 11:59:51 +0200
Subject: Restored job liquid quantity validation to start of procedure.

---
 .../ViewModels/MainViewVM.cs                       | 48 ++++++++--------------
 .../Views/InsufficientLiquidQuantityView.xaml      |  2 +-
 2 files changed, 18 insertions(+), 32 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 93baf3b9d..fd20a0b1c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1479,39 +1479,15 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 JobHandler.Failed += (x, ex) =>
                 {
-                    if (ex is InsufficientLiquidQuantityException)
-                    {
-                        InvokeUI(() =>
-                        {
-                            _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex as InsufficientLiquidQuantityException), (_) =>
-                            {
-
-                                MachineOperator.EnableJobLiquidQuantityValidation = false;
-                                StartJob();
-
-                            }, () =>
-                            {
-                                SetJobFailed();
+                    LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
+                    _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
+                    SetJobFailed();
 
-                                InvokeUI(() =>
-                                {
-                                    StopRecordingIfInProgress();
-                                });
-                            });
-                        });
-                    }
-                    else
+                    InvokeUI(() =>
                     {
-                        LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                        _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                        SetJobFailed();
-
-                        InvokeUI(() =>
-                        {
-                            _notification.ShowError("Job failed. " + ex.FlattenMessage());
-                            StopRecordingIfInProgress();
-                        });
-                    }
+                        _notification.ShowError("Job failed. " + ex.FlattenMessage());
+                        StopRecordingIfInProgress();
+                    });
                 };
 
                 JobHandler.Finalizing += (_, __) =>
@@ -1543,6 +1519,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     //Finally Canceled..
                 };
             }
+            catch (InsufficientLiquidQuantityException ex)
+            {
+                _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex), (x) =>
+                {
+
+                    MachineOperator.EnableJobLiquidQuantityValidation = false;
+                    StartJob();
+
+                }, () => { });
+            }
             catch (Exception ex)
             {
                 LogManager.Log(ex);
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
index f0e9dc29c..9bf76c026 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
@@ -6,7 +6,7 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
-             Height="450" Width="800" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}">
+             Height="450" Width="800" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}">
     <Grid Margin="10">
         <DockPanel>
             <StackPanel DockPanel.Dock="Top">
-- 
cgit v1.3.1