aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2023-03-30 19:41:54 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2023-03-30 19:41:54 +0300
commit3dcf3242705a7522617d4b5f7ca4d9b918e48ca5 (patch)
tree29e6083fbe1f9778e14e9641bffcb7d4765e8b39 /Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels
parentc61d12100372054de07f6201c27c7755c7be35e8 (diff)
downloadTango-3dcf3242705a7522617d4b5f7ca4d9b918e48ca5.tar.gz
Tango-3dcf3242705a7522617d4b5f7ca4d9b918e48ca5.zip
Eureka PPC. GoToJob, Notifications, LengthWothSpool.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs4
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs6
2 files changed, 7 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
index f22d43b19..77b883150 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
@@ -187,8 +187,8 @@ namespace Tango.PPC.UI.ViewModels
private void GoToJob()
{
- // NavigationManager.NavigateWithObject<JobsV2Module, JobEurekaView, JobNavigationObject>(new JobNavigationObject() { Job = _handler.Job });
- // NavigationManager.ClearHistoryExcept<JobsView>();
+ NavigationManager.NavigateWithObject<JobsV2Module, JobEurekaView, JobNavigationObject>(new JobNavigationObject() { Job = _handler.Job });
+ NavigationManager.ClearHistoryExcept<JobsView>();
}
#region Public Methods
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index 14b9b76e3..7caabf6a1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -566,7 +566,11 @@ namespace Tango.PPC.UI.ViewModels
{
_updateNotificationItem = null;
};
- NotificationProvider.PushNotification(_updateNotificationItem);
+
+ if (!BuildProvider.IsEureka)
+ {
+ NotificationProvider.PushNotification(_updateNotificationItem);
+ }
});
}
}