Implemented liquid quantity validation on PPC and MS.

Improved PPC full control view.

1 files changed, 7 insertions, 11 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index 56ec2fa7e..21c68d3e6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -56,16 +56,8 @@ namespace Tango.PPC.UI.Printing
 #if STUBPRINT
             handler = await _machineProvider.MachineOperator.PrintStub(job);
 #else
-            try
-            {
-                handler = await _machineProvider.MachineOperator.Print(job);
-            }
-            catch (InsufficientLiquidQuantityException ex)
-            {
-                LogManager.Log(ex);
-                await _notificationProvider.ShowDialog(new InsufficientLiquidQuantityViewVM(ex));
-                throw ex;
-            }
+
+            handler = await _machineProvider.MachineOperator.Print(job);
 #endif
 
             handler.Completed += async (x, e) =>
@@ -113,9 +105,13 @@ namespace Tango.PPC.UI.Printing
             };
             handler.Failed += async (x, e) =>
             {
-                try
+                if (e is InsufficientLiquidQuantityException)
                 {
+                    return;
+                }
 
+                try
+                {
                     job.JobStatus = JobStatuses.Disrupted;
 
                     if (!context.IsDisposed)