1 files changed, 14 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
index 9a0d0f8ab..f3d16e899 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
@@ -8,6 +8,7 @@ using Tango.Integration.Operation;
 using Tango.PPC.Common;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Jobs.AppBarItems;
+using Tango.PPC.Jobs.NotificationItems;
 using Tango.PPC.Jobs.Views;
 
 namespace Tango.PPC.Jobs.ViewModels
@@ -45,6 +46,18 @@ namespace Tango.PPC.Jobs.ViewModels
             Job = jobHandler.Job;
             jobHandler.StatusChanged += JobHandler_StatusChanged;
             jobHandler.Stopped += JobHandler_Stopped;
+            jobHandler.Completed += JobHandler_Completed;
+        }
+
+        private void JobHandler_Completed(object sender, EventArgs e)
+        {
+            InvokeUI(() =>
+            {
+                NotificationProvider.PushNotification<JobCompletedNotificationItem>().Pressed += (_, __) =>
+                {
+                    NavigationManager.NavigateTo<JobsModule>(nameof(JobView));
+                };
+            });
         }
 
         public override void OnNavigatedFrom()
@@ -53,7 +66,7 @@ namespace Tango.PPC.Jobs.ViewModels
 
             if (MachineProvider.MachineOperator.IsPrinting)
             {
-                NotificationProvider.PushAppBarItem<JobProgressAppBarItem>().Preesed += (_, __) =>
+                NotificationProvider.PushAppBarItem<JobProgressAppBarItem>().Pressed += (_, __) =>
                 {
                     NotificationProvider.CurrentAppBarItem.Close();
                     NavigationManager.NavigateTo<JobsModule>(nameof(JobProgressView));