Merge pull request #1807 from Ginger-Automation/Releases/Beta

Releases/beta
Ginger-Automation · Feb 1, 2021 · 424542f · 424542f
2 parents 9c5151c + e9b635d
commit 424542f
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 11 deletions.
diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml
@@ -5,7 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:Ginger="clr-namespace:Ginger"
       xmlns:GingerCore="clr-namespace:GingerCore;assembly=GingerCore"
-      mc:Ignorable="d" d:DesignWidth="600" Height="900" 
+      mc:Ignorable="d" d:DesignWidth="600" Height="1040" 
 	Title="DataSource Expression Editor" >
 
     <Grid Background="{StaticResource $BackgroundColor_LightGray}" Margin="0,0,0,0">

diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs b/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs
@@ -489,6 +489,7 @@ private void ShowContolActionSpecificPage()
             if (ControlActionComboBox.SelectedValue.ToString() == "ExportToExcel")
             {
                 mActDSTblElem.DSTableName = mDSTable.Name;
+                mActDSTblElem.DSName = mDSTable.DSC.Name;
                 Page  pageContent = new Ginger.DataSource.DataSourceExportToExcel(mActDSTblElem);
                 ExcelSpecificFrame.Content = pageContent;
                 ExcelSpecificFrame.Visibility = Visibility.Visible;

diff --git a/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml b/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml
@@ -40,7 +40,7 @@
 
             <StackPanel  x:Name="xExcelExportCustomPanel"  Visibility="Collapsed" >
                 <Label HorizontalAlignment="Left" FontWeight="Medium" Style="{StaticResource @LabelStyle}">Select Column To Export :</Label>
-                <Ginger:ucGrid x:Name="xColumnListGrid" AutomationProperties.AutomationId="ColumnListGrid AID" ShowTitle="Collapsed" ShowAdd="Collapsed" Width="500" HorizontalAlignment="Left" ShowClearAll="Collapsed" ShowUpDown="Collapsed" ShowRefresh="Collapsed" ShowEdit="Collapsed"  ShowDelete="Collapsed" />
+                <Ginger:ucGrid x:Name="xColumnListGrid" MaxHeight="250" AutomationProperties.AutomationId="ColumnListGrid AID" ShowTitle="Collapsed" ShowAdd="Collapsed" Width="500" HorizontalAlignment="Left" ShowClearAll="Collapsed" ShowUpDown="Collapsed" ShowRefresh="Collapsed" ShowEdit="Collapsed"  ShowDelete="Collapsed" />
 
                 <CheckBox x:Name="xExportWhereChkBox" Content="Filter Record Based On Where Clause :" Click="xExportWhereChkBox_Click" Margin="0,20,0,5" FontWeight="Medium"/>
 

diff --git a/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml.cs b/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml.cs
@@ -51,7 +51,7 @@ public partial class DataSourceExportToExcel : Page
 
         public ObservableList<ActDSConditon> mWhereConditionList = new ObservableList<ActDSConditon>();
 
-        private DataTable mDataTable = null;
+        private DataTable mDataTable = new DataTable();
         private ActDSTableElement mActDSTableElement = null;
 
         private DataSourceTable mDataSourceTable = null;
@@ -132,6 +132,7 @@ public DataSourceExportToExcel(ActDSTableElement actDSTableElement)
             }
 
             SetConditionGridView();
+            UpdateQueryValue();
         }
 
         private void SetFilePath()

diff --git a/Ginger/GingerCoreNET/DataSource/ActDSTableElement.cs b/Ginger/GingerCoreNET/DataSource/ActDSTableElement.cs
@@ -181,7 +181,7 @@ public override void Execute()
 
                         if (excelFilePath.ToLower().EndsWith(".xlsx"))
                         {
-                            DataSource.ExporttoExcel(DSTableName, excelFilePath, excelSheetName,query);
+                            DataSource.ExporttoExcel(DSTableName, excelFilePath, excelSheetName,query.ToLower());
                         }
                         else
                         {

diff --git a/Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs b/Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs
@@ -153,23 +153,39 @@ public string CreateQueryWithWhereList(List<ColumnCheckListItem> mColumnList, Ob
                 {
                     if (wColVal == "GINGER_ID")
                     {
-                        wQuery = string.Concat(wQuery," ", wCond," ",wColVal," != ", wRowVal);
+                        wQuery = string.Concat(wQuery," ", wCond," ",wColVal," <> ", wRowVal);
                     }
                     else
                     {
-                        wQuery = string.Concat(wQuery, " ", wCond, " ", wColVal, " !=  \"", wRowVal, "\"");
+                        wQuery = string.Concat(wQuery, " ", wCond, " ", wColVal, " <>  \"", wRowVal, "\"");
                     }
                 }
                 else if (wOpr == "Contains")
                 {
-                    wQuery = string.Concat(wQuery, " ", wCond , " ", wColVal, " contains ", "\"", wRowVal, "\"");
+                    wQuery = string.Concat(wQuery, " ", wCond , " ", wColVal, " Like ", "\"%", wRowVal, "%\"");
+                }
+                else if (wOpr == "NotContains")
+                {
+                    wQuery = string.Concat(wQuery, " ", wCond, " ", wColVal, " Not Like ", "\"%", wRowVal, "%\"");
                 }
                 else if (wOpr == "StartsWith")
                 {
-                    wQuery = string.Concat(wQuery , " ", wCond, " ", wColVal, " like ", "\"", wRowVal, "\"");
+                    wQuery = string.Concat(wQuery , " ", wCond, " ", wColVal, " like ", "\"", wRowVal, "%\"");
+                }
+                else if (wOpr == "NotStartsWith")
+                {
+                    wQuery = string.Concat(wQuery, " ", wCond, " ", wColVal, " Not Like ", "\"", wRowVal, "%\"");
+                }
+                else if (wOpr == "EndsWith")
+                {
+                    wQuery = string.Concat(wQuery, " ", wCond, " ", wColVal, " like ", "\"%", wRowVal, "\"");
                 }
-
-
+                else if (wOpr == "NotEndsWith")
+                {
+                    wQuery = string.Concat(wQuery, " ", wCond, " ", wColVal, " not like ", "\"%", wRowVal, "\"");
+                }
+
+
                 whereQuery = string.Concat(whereQuery, wQuery);
             }
             if (whereQuery != string.Empty)
@@ -192,6 +208,10 @@ public string CreateQueryWithWhereList(List<ColumnCheckListItem> mColumnList, Ob
                 }
             }
 
+            if (mDataTable == null)
+            {
+                return dsConditionList;
+            }
 
             List<string> tableColsValue = new List<string>();
             var columns = mDataTable.Columns;

diff --git a/Ginger/GingerCoreNET/DataSource/LiteDB.cs b/Ginger/GingerCoreNET/DataSource/LiteDB.cs
@@ -292,6 +292,10 @@ public override bool ExporttoExcel(string TableName, string sExcelPath, string s
                     selectedColumn = sTableQueryValue.Substring(0, index);
 
                     var filter = whereCond.Remove(0,6).Trim();
+                    if (filter.Contains("\""))
+                    {
+                      filter =  filter.Replace("\"", "'");
+                    }
                     DataView dv = new DataView(dataTable);
                     dv.RowFilter = filter;
                     dataTable = dv.ToTable();

diff --git a/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs b/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs
@@ -993,7 +993,12 @@ public void ReplaceDataSource(string p)
                             {
                                 nextavail = true;
                             }
-                            liteDB.RunQuery(litedbquery, 0, tableName[0], Markasdone, nextavail);
+
+                            if (litedbquery != "" && Markasdone == true)
+                            {
+                                liteDB.RunQuery(litedbquery, 0, tableName[0], Markasdone, nextavail);
+                                mValueCalculated = "";
+                            }
                         }
                     }
                     else
-Original file line number
+Diff line change
@@ Expand Up / @@ -181,7 +181,7 @@ public override void Execute() @@
                             if (excelFilePath.ToLower().EndsWith(".xlsx"))
                             {
-                                DataSource.ExporttoExcel(DSTableName, excelFilePath, excelSheetName,query);
+                                DataSource.ExporttoExcel(DSTableName, excelFilePath, excelSheetName,query.ToLower());
                             }
                             else
                             {
@@ Expand Down @@