1 files changed, 12 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
index 53fe73bd5..5b49aedf1 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
@@ -15,15 +15,24 @@ namespace Tango.PPC.Jobs.ViewModels
         public override void OnApplicationStarted()
         {
             MachineProvider.MachineOperator.PrintingCompleted += MachineOperator_PrintingCompleted;
+            MachineProvider.MachineOperator.PrintingFailed += MachineOperator_PrintingFailed;
         }
 
-        private void MachineOperator_PrintingCompleted(object sender, Integration.Operation.PrintingEventArgs e)
+        private void MachineOperator_PrintingFailed(object sender, Integration.Operation.PrintingFailedEventArgs e)
         {
-            NotificationProvider.PushNotification(new MessageNotificationItem("Job completed successfully.", MessageNotificationItem.MessageNotificationItemTypes.Success, () => 
+            NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("Job failed. ({0})", e.Exception.Message), MessageNotificationItem.MessageNotificationItemTypes.Error, () =>
             {
-
                 NavigationManager.NavigateWithObject<JobsModule, JobView, Job>(e.Job);
+                NavigationManager.ClearHistoryExcept<JobsView>();
+            }));
+        }
 
+        private void MachineOperator_PrintingCompleted(object sender, Integration.Operation.PrintingEventArgs e)
+        {
+            NotificationProvider.PushNotification(new MessageNotificationItem("Job completed successfully.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
+            {
+                NavigationManager.NavigateWithObject<JobsModule, JobView, Job>(e.Job);
+                NavigationManager.ClearHistoryExcept<JobsView>();
             }));
         }
     }