From 8522f980648f1da4a1754822d10b84b4a9d2a522 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 26 Dec 2019 14:37:37 +0200 Subject: Action Logs View, added copy button, changes GUI alignments and styles Related Work Items: #2213 --- .../ViewModels/MainViewVM.cs | 9 +- .../Views/MainView.xaml | 181 ++++++++++++++------- .../Views/MainView.xaml.cs | 5 + 3 files changed, 139 insertions(+), 56 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules') 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..7be4dd691 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(); 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); + } + /// /// New Database Query with search parameters. Initialization ActionLogs property. /// diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml index 60ce2560c..bc7aa926b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml @@ -10,16 +10,18 @@ xmlns:vm="clr-namespace:Tango.MachineStudio.ActionLogs.ViewModels" xmlns:global="clr-namespace:Tango.MachineStudio.ActionLogs" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf" xmlns:diff="clr-namespace:Tango.BL.ValueObjects;assembly=Tango.BL" mc:Ignorable="d" d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> + - + @@ -33,12 +35,13 @@ - - + + - + + Start Date: @@ -49,50 +52,54 @@ - - - - - - - - - - () - - - - - - - - - - - - - - - - - + + + + + + + + + + () + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + + + + + @@ -124,12 +136,64 @@ + - + + + + + + + + + + + + + + + + + + + - @@ -140,23 +204,30 @@ - + + - - - Object Changes - - - + + Object Changes + + + + +