Working on PPC.

2 files changed, 22 insertions, 11 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index c9e48c03f..92c9b4b94 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -506,7 +506,7 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public async override void OnNavigatedTo()
         {
-            if (_job_to_load == null) return;
+            if (_job_to_load == null || (_job_to_load != null && Job != null && _job_to_load.Guid == Job.Guid)) return;
 
             NotificationProvider.SetGlobalBusyMessage("Loading job details...");
 
@@ -552,13 +552,15 @@ namespace Tango.PPC.Jobs.ViewModels
 
             if (!_can_navigate_back)
             {
-                result = await NotificationProvider.ShowQuestion("Are you sure you want to exit this job?");
-            }
-
-            if (result)
-            {
-                Job = null;
-                SegmentsCollectionView = null;
+                if (await NotificationProvider.ShowQuestion("Are you sure you want to exit this job?"))
+                {
+                    Job = null;
+                    SegmentsCollectionView = null;
+                }
+                else
+                {
+                    result = false;
+                }
             }
 
             return result;
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>();
             }));
         }
     }