merge conflict

1 files changed, 9 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
index 5f2d86b40..e9f2404e0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
@@ -89,11 +89,13 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
         
         public RelayCommand SearchCommand { get; set; }
         public RelayCommand CopyToClipBoardCommand { get; set; }
+        public RelayCommand CopyRelateObjectIDCommand { get; set; }
 
         public MainViewVM()
         {
             ActionLogs = new ObservableCollection<ActionLog>();
             SearchCommand = new RelayCommand(GetActionLogs, ()=> !IsRunning);
+            CopyRelateObjectIDCommand = new RelayCommand(CopyRelateObjectID);
             CopyToClipBoardCommand = new RelayCommand(CopyToClipBoard, () => SelectedActionLog != null && SelectedActionLog.DifferenceObject != null);
             DateTime now = DateTime.Now;
             StartSelectedDate = now.AddMonths(-1);
@@ -116,7 +118,12 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
             System.Windows.Clipboard.SetDataObject(data);
            
         }
-        
+        private void CopyRelateObjectID()
+        {
+            DataObject data = new DataObject(SelectedActionLog.RelatedObjectGuid);
+            System.Windows.Clipboard.SetDataObject(data);
+        }
+
         /// <summary>
         /// New Database Query with search parameters. Initialization ActionLogs property.
         /// </summary>
@@ -138,6 +145,7 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
                     (x => filter == null || 
                     (x.ID.ToString().ToLower().StartsWith(filter) 
                     || (x.RelatedObjectName != null && x.RelatedObjectName.ToLower().StartsWith(filter)) 
+                    || (x.RelatedObjectGuid != null && x.RelatedObjectGuid.ToLower().StartsWith(filter))
                     || (x.User != null && x.User.Contact != null && x.User.Contact.FullName.ToLower().StartsWith(filter)))))
                     .BuildAsync();
                 IsRunning = false;