Merge branch 'master' into Feature/AccessibilityEnhancement

Ginger-Automation · Aug 8, 2024 · ecd7c18 · ecd7c18
2 parents b5f8ed8 + 364ad79
commit ecd7c18
Show file tree

Hide file tree

Showing 32 changed files with 1,329 additions and 332 deletions.
diff --git a/Ginger/.editorconfig b/Ginger/.editorconfig
@@ -75,6 +75,7 @@ csharp_style_prefer_extended_property_pattern = true:suggestion
 csharp_style_var_for_built_in_types = true:none
 csharp_style_var_when_type_is_apparent = true:none
 csharp_style_var_elsewhere = true:none
+csharp_indent_braces = false
 
 [*.vb]
 #### Naming styles ####

diff --git a/Ginger/Ginger/Actions/ActionEditPage.xaml b/Ginger/Ginger/Actions/ActionEditPage.xaml
@@ -304,12 +304,15 @@
                                                 <CheckBox x:Name="xFailIgnoreCheckBox" Content="Ignore on Fail" Visibility="Collapsed" ToolTip="If the action fails change status to Ignore Fail" Margin="10,0,0,0" Style="{StaticResource $CeckBoxStyle}"/>
                                             </StackPanel>
 
-                                            <StackPanel x:Name="xScreenshotsConfigsPnl" DockPanel.Dock="Top" Orientation="Horizontal" Margin="0,10,0,0">
-                                                <CheckBox x:Name="xTakeScreenShotCheckBox" DockPanel.Dock="Top" Content="Take Screenshot(s)" FontWeight="Bold" ToolTip="Add tested application screenshot to the report after the action executed" Style="{StaticResource $CeckBoxStyle}" VerticalAlignment="Center" Checked="XTakeScreenShotCheckBox_CheckChanged" Unchecked="XTakeScreenShotCheckBox_CheckChanged" />
-                                                <StackPanel x:Name="xScreenshotsCaptureTypeConfigsPnl" Orientation="Horizontal" DockPanel.Dock="Top" Margin="20,0,0,0"  Visibility="Visible">
-                                                    <Label Content="Capture Type:" Style="{StaticResource $LabelStyle}" VerticalAlignment="Center"/>
-                                                    <ComboBox x:Name="xWindowsToCaptureCombo" Margin="0,0,0,0" Style="{StaticResource $FlatInputComboBoxStyle}" Width="200" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                                            <StackPanel x:Name="xScreenshotsConfigsPnl" Orientation="Vertical" DockPanel.Dock="Top" Margin="0,10,0,0">
+                                                <StackPanel Orientation="Horizontal">
+                                                    <CheckBox x:Name="xTakeScreenShotCheckBox" DockPanel.Dock="Top" Content="Take Screenshots" FontWeight="Bold" ToolTip="Add tested application screenshot to the report after the action executed" Style="{StaticResource $CeckBoxStyle}" VerticalAlignment="Center" Checked="XTakeScreenShotCheckBox_CheckChanged" Unchecked="XTakeScreenShotCheckBox_CheckChanged" />
+                                                    <StackPanel x:Name="xScreenshotsCaptureTypeConfigsPnl" Orientation="Horizontal" DockPanel.Dock="Top" Margin="20,0,0,0"  Visibility="Visible">
+                                                        <Label Content="Capture Type:" Style="{StaticResource $LabelStyle}" VerticalAlignment="Center"/>
+                                                        <ComboBox x:Name="xWindowsToCaptureCombo" Margin="0,0,0,0" Style="{StaticResource $FlatInputComboBoxStyle}" Width="200" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                                                    </StackPanel>
                                                 </StackPanel>
+                                                <CheckBox x:Name="xAutoScreenShotOnFailureCheckBox"  Margin="0,10,0,0" DockPanel.Dock="Top" Content="Auto Capture Screenshots on Failure" FontWeight="Bold" ToolTip="Enable this option to automatically capture screenshots when a failure occurs during the execution" Style="{StaticResource $CeckBoxStyle}" VerticalAlignment="Center"/>
                                             </StackPanel>
 
                                             <DockPanel x:Name="xActionLogPnl" Margin="0,10,0,0" >

diff --git a/Ginger/Ginger/Actions/ActionEditPage.xaml.cs b/Ginger/Ginger/Actions/ActionEditPage.xaml.cs
@@ -559,11 +559,14 @@ private void InitExecutionReportTabView()
                 if (mActParentActivity != null && mActParentActivity.GetType() == typeof(ErrorHandler))
                 {
                     xScreenshotsConfigsPnl.Visibility = Visibility.Collapsed;
-                    xScreenShotsPnl.Visibility = Visibility.Collapsed;
+                    xScreenShotsPnl.Visibility = Visibility.Collapsed;                  
                 }
                 else
                 {
                     BindingHandler.ObjFieldBinding(xTakeScreenShotCheckBox, CheckBox.IsCheckedProperty, mAction, nameof(Act.TakeScreenShot));
+
+                    BindingHandler.ObjFieldBinding(xAutoScreenShotOnFailureCheckBox, CheckBox.IsCheckedProperty, mAction, nameof(Act.AutoScreenShotOnFailure));
+
                     xWindowsToCaptureCombo.BindControl(mAction, nameof(Act.WindowsToCapture));
                     //remove full page for other platforms excepts web
                     if (mAction.Platform != GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib.ePlatformType.Web)

diff --git a/Ginger/Ginger/Ginger.csproj b/Ginger/Ginger/Ginger.csproj
@@ -704,6 +704,7 @@
     <PackageReference Include="FontAwesome6.Fonts" Version="2.5.1" />
     <PackageReference Include="FontAwesome6.Svg" Version="2.5.1" />
     <PackageReference Include="Gherkin" Version="5.1.0" />
+    <PackageReference Include="Ginger.AccountReport.Contracts" Version="2024.4.1" />
     <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.3.1" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.58" />
     <PackageReference Include="LiteDB" Version="5.0.17" />

diff --git a/Ginger/Ginger/Run/RunSetsExecutionsHistoryPage.xaml b/Ginger/Ginger/Run/RunSetsExecutionsHistoryPage.xaml
@@ -1,4 +1,4 @@
-    <Page x:Class="Ginger.Run.RunSetsExecutionsHistoryPage"
+<Page x:Class="Ginger.Run.RunSetsExecutionsHistoryPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -88,13 +88,34 @@
                 </StackPanel>
             </DataTemplate>
         </Grid.Resources>
-        <ScrollViewer ScrollViewer.VerticalScrollBarVisibility="Auto"  >
-            <Ginger:ucGrid x:Name="grdExecutionsHistory" ShowAdd="Collapsed" ShowClearAll="Collapsed" ShowDelete="Collapsed" ShowEdit="Collapsed" ShowUpDown="Collapsed" IsReadOnly="False" ShowTagsFilter="Collapsed" ShowTitle="Collapsed">
-                <Ginger:ucGrid.Title>
-                    <GingerCore:ucTextDicResource Text="[RunSets] Executions"/>
-                </Ginger:ucGrid.Title>
-            </Ginger:ucGrid>
-        </ScrollViewer>
+        <DockPanel>
+
+            <StackPanel DockPanel.Dock="Bottom" >
+                <Line Stretch="Fill" Stroke="Black" X2="1"/>
+                <StackPanel x:Name="xButtonPnl" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom" >
+
+                <Label x:Name="xRangelbl" FontSize="14"  Margin="0,0,0,0">Showing 00 to 00 of 00 entries</Label>
+                <usercontrols:ucButton x:Name="btnFirst" ButtonType="ImageButton"  ButtonFontImageSize="16" ButtonImageWidth="16" ButtonImageHeight="16" ButtonImageType="AnglesArrowLeft" Click="btnFirst_Click" Margin="5,0,0,0">
+                </usercontrols:ucButton>
+                <usercontrols:ucButton x:Name="btnPrevious" ButtonType="ImageButton"  ButtonFontImageSize="16" ButtonImageWidth="16" ButtonImageHeight="16" ButtonImageType="AngleArrowLeft" Click="btnPrevious_Click" Margin="5,0,0,0">
+                </usercontrols:ucButton>
+                <Label x:Name="xPageNumber" Content="Page 1" FontSize="14"  Margin="5,0,0,0"/>
+                <usercontrols:ucButton x:Name="btnNext" ButtonType="ImageButton"  ButtonFontImageSize="16" ButtonImageWidth="16" ButtonImageHeight="16" ButtonImageType="AngleArrowRight" Click="btnNext_Click" Margin="5,0,0,0">
+                </usercontrols:ucButton>
+                <usercontrols:ucButton x:Name="btnLast" ButtonType="ImageButton"  ButtonFontImageSize="16" ButtonImageWidth="16" ButtonImageHeight="16" ButtonImageType="AnglesArrowRight" Click="btnLast_Click" Margin="5,0,0,0">
+                </usercontrols:ucButton>
+                <ComboBox x:Name="xPageSizeComboBox" Width="10" HorizontalAlignment="Left" Style="{StaticResource $FlatInputComboBoxStyle}"  Margin="10,0,0,0" SelectedIndex="0" FontWeight="Bold" SelectionChanged="xPageSizeComboBox_SelectionChanged" />
+                <usercontrols:ImageMakerControl x:Name="xGraphQlLoading" ImageType="Processing"  HorizontalAlignment="Center" Width="20" Visibility="Hidden"  Foreground="LightBlue" Margin="5,0,0,0"/>
+                </StackPanel>
+            </StackPanel>
+            <ScrollViewer ScrollViewer.VerticalScrollBarVisibility="Auto"  >
+                <Ginger:ucGrid x:Name="xGridExecutionsHistory" ShowAdd="Collapsed" ShowClearAll="Collapsed" ShowDelete="Collapsed" ShowEdit="Collapsed" ShowUpDown="Collapsed" IsReadOnly="False" ShowTagsFilter="Collapsed" ShowTitle="Collapsed">
+                    <Ginger:ucGrid.Title>
+                        <GingerCore:ucTextDicResource Text="[RunSets] Executions"/>
+                    </Ginger:ucGrid.Title>
+                </Ginger:ucGrid>
+            </ScrollViewer>
+        </DockPanel>
         <StackPanel x:Name="Loading" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" >
             <usercontrols:ImageMakerControl x:Name="xProcessingIcon" ImageType="Processing"  HorizontalAlignment="Center" Width="40" Visibility="Visible"  Foreground="LightBlue" />
             <Label x:Name="LoadingRunset"  HorizontalAlignment="Left" Content="Loading..." FontSize="20"/>