Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka

1 files changed, 34 insertions, 1 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 653c2368f..684b9bd8c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
@@ -316,6 +316,12 @@ namespace Tango.PPC.UI.ViewModels
 
         public RelayCommand AbortCommand { get; set; }
 
+        public RelayCommand ResumeCommand { get; set; }
+        public RelayCommand CaancelJobCommand{ get; set; }
+        public RelayCommand RestartJobCommand { get; set; }
+        public RelayCommand ClearJobCommand { get; set; }
+        
+
         public RelayCommand GoToJobCommand { get; set; }
 
         /// <summary>
@@ -342,7 +348,14 @@ namespace Tango.PPC.UI.ViewModels
 
             StopCommand = new RelayCommand(StopJob, () => CanStopped());
             AbortCommand = new RelayCommand(AbortJob, () => CanStopped());
-            GoToJobCommand = new RelayCommand(GoToJob, () => IsEnableGoToJob());
+
+            ResumeCommand = new RelayCommand(ResumeJob, () => CanStopped());
+            CaancelJobCommand = new RelayCommand(CaancelJob, () => CanStopped());
+            RestartJobCommand = new RelayCommand(RestartJob, () => CanStopped());
+            ClearJobCommand = new RelayCommand(ClearJob, () => CanStopped());
+           
+
+        GoToJobCommand = new RelayCommand(GoToJob, () => IsEnableGoToJob());
             JobStatusViewCommand = new RelayCommand(JobStatusView);
             OverviewViewCommand = new RelayCommand(OverviewView);
             ClearAllNotificationsCommand = new RelayCommand(ClearAllNotifications);
@@ -663,6 +676,26 @@ namespace Tango.PPC.UI.ViewModels
         private void AbortJob()
         {
             _handler?.Cancel();
+            //Job = null;
+        }
+
+        private void ResumeJob()
+        {
+            
+        }
+
+        private void CaancelJob()
+        {
+            Job = null;
+        }
+
+        private void RestartJob()
+        {
+           
+        }
+
+        private void ClearJob()
+        {
             Job = null;
         }