From 8522f980648f1da4a1754822d10b84b4a9d2a522 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
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
---
 .../Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels')

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<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>
-- 
cgit v1.3.1


From 7f05564656644b9af0500657a689c12805aee732 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 29 Dec 2019 12:26:26 +0200
Subject: Added selection color to grid  items , removed gray selection from
 tree view, added query by RelatedObjectGuid.

Related Work Items: #2213
---
 .../ViewModels/MainViewVM.cs                       |  1 +
 .../Views/MainView.xaml                            | 54 ++++++++++++++++++++--
 2 files changed, 51 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels')

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 7be4dd691..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
@@ -145,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;
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 bc7aa926b..80cc12a69 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
@@ -110,9 +110,10 @@
                             <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                             <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
                             <Style.Triggers>
-                            <Trigger Property="IsSelected" Value="True">
-                                <Setter Property="Background" Value="Transparent"></Setter>
-                            </Trigger>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="Background" Value="Transparent"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource AccentColorBrush}" />
+                                </Trigger>
                             </Style.Triggers>
                         </Style>
                     </DataGrid.CellStyle>
@@ -188,6 +189,7 @@
                                     <Style.Triggers>
                                         <Trigger Property="IsSelected" Value="True">
                                             <Setter Property="Background" Value="Transparent"></Setter>
+                                            <Setter Property="Foreground" Value="{StaticResource AccentColorBrush}" />
                                         </Trigger>
                                     </Style.Triggers>
                                 </Style>
@@ -226,8 +228,52 @@
                     <TreeView x:Name="treeView" ItemsSource="{Binding DifferenceObject.Children, Mode=OneWay}" Background="{StaticResource TransparentBackgroundBrush}" >
                         <TreeView.ItemContainerStyle>
                             <Style TargetType="TreeViewItem" BasedOn="{StaticResource {x:Type TreeViewItem}}">
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="{x:Type TreeViewItem}">
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition MinWidth="19" Width="Auto"/>
+                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition Width="*"/>
+                                                </Grid.ColumnDefinitions>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto"/>
+                                                    <RowDefinition/>
+                                                </Grid.RowDefinitions>
+                                                <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" 
+                                      Style="{StaticResource MaterialDesignExpandCollapseToggleStyle}"
+                                      Foreground="{TemplateBinding Foreground}"
+                                      Margin="8 0 8 0"
+                                      VerticalAlignment="Center"
+                                              />
+                                                <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Column="1" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                                                    <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                                </Border>
+                                                <ItemsPresenter x:Name="ItemsHost" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="1"/>
+                                            </Grid>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsExpanded" Value="false">
+                                                    <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed"/>
+                                                </Trigger>
+                                                <Trigger Property="HasItems" Value="false">
+                                                    <Setter Property="Visibility" TargetName="Expander" Value="Hidden"/>
+                                                </Trigger>
+                                                <MultiTrigger>
+                                                    <MultiTrigger.Conditions>
+                                                        <Condition Property="IsSelected" Value="true"/>
+                                                        <Condition Property="IsSelectionActive" Value="false"/>
+                                                    </MultiTrigger.Conditions>
+                                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}}"/>
+                                                </MultiTrigger>
+                                                <Trigger Property="IsEnabled" Value="false">
+                                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
                                 <Setter Property="IsExpanded" Value="True" />
-
                                 <Style.Triggers>
                                     <Trigger Property="IsMouseOver" Value="True">
                                         <Setter Property="Background" Value="Transparent"></Setter>
-- 
cgit v1.3.1