From 72452bf58b975c39cbc6691620988e652c62ba73 Mon Sep 17 00:00:00 2001 From: Ravi Kumar Date: Wed, 27 Jan 2021 16:04:58 +0530 Subject: [PATCH 1/5] Adding maxheight on columngrid --- Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml b/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml index e8f1beccd2..fa76a6ee01 100644 --- a/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml +++ b/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml @@ -40,7 +40,7 @@ - + From e78a6024a72506486d52cf0306dfbab7886a1172 Mon Sep 17 00:00:00 2001 From: Ravi Kumar Date: Thu, 28 Jan 2021 11:08:10 +0530 Subject: [PATCH 2/5] fixing ui and other datasource issue --- Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml | 2 +- .../Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs | 1 + Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml.cs | 3 ++- Ginger/GingerCoreNET/DataSource/ActDSTableElement.cs | 2 +- Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs | 4 ++++ Ginger/GingerCoreNET/DataSource/LiteDB.cs | 4 ++++ 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml index 253b497e99..c5881cd22f 100644 --- 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" > diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs b/Ginger/Ginger/Actions/ActionEditPages/ActDataSourcePage.xaml.cs index b704d6e11d..91284e4122 100644 --- 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.cs b/Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml.cs index c8c44cdcdd..68849fa9d1 100644 --- 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 mWhereConditionList = new ObservableList(); - 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 index 3e54368312..51f665eee3 100644 --- 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 index 4940cbf1d4..b869013d7c 100644 --- a/Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs +++ b/Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs @@ -192,6 +192,10 @@ public string CreateQueryWithWhereList(List mColumnList, Ob } } + if (mDataTable == null) + { + return dsConditionList; + } List tableColsValue = new List(); var columns = mDataTable.Columns; diff --git a/Ginger/GingerCoreNET/DataSource/LiteDB.cs b/Ginger/GingerCoreNET/DataSource/LiteDB.cs index bf8e3ba47e..4e2e307aba 100644 --- 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(); From 5b9e73bba464c504f1fee20baf3e62563f0e23fe Mon Sep 17 00:00:00 2001 From: Ravi Kumar Date: Fri, 29 Jan 2021 10:49:32 +0530 Subject: [PATCH 3/5] implementing missing cond. and query fixes --- .../GingerCore/DataSource/AccessDataSource.cs | 6 +++- .../DataSource/ExportToExcelConfig.cs | 28 +++++++++++++++---- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Ginger/GingerCore/DataSource/AccessDataSource.cs b/Ginger/GingerCore/DataSource/AccessDataSource.cs index 73371bbbfa..31e1454aaa 100644 --- a/Ginger/GingerCore/DataSource/AccessDataSource.cs +++ b/Ginger/GingerCore/DataSource/AccessDataSource.cs @@ -385,7 +385,11 @@ public override void AddRow( List mColumnNames, DataSourceTable mDSTable mColumnNames = mDSTableDetails.DSC.GetColumnList(mDSTableDetails.Name); foreach (string sColName in mColumnNames) { - if (sColName != "GINGER_ID" && sColName != "GINGER_LAST_UPDATED_BY" && sColName != "GINGER_LAST_UPDATE_DATETIME") + if (sColName == "GINGER_USED") + { + dr[sColName] = "false"; + } + else if (sColName != "GINGER_ID" && sColName != "GINGER_LAST_UPDATED_BY" && sColName != "GINGER_LAST_UPDATE_DATETIME") { dr[sColName] = ""; } diff --git a/Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs b/Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs index b869013d7c..4061df6c71 100644 --- a/Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs +++ b/Ginger/GingerCoreNET/DataSource/ExportToExcelConfig.cs @@ -153,23 +153,39 @@ public string CreateQueryWithWhereList(List 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) From a3824cf1ea4b975927cdc5dd9a9686dbab41338b Mon Sep 17 00:00:00 2001 From: Ravi Kumar Date: Fri, 29 Jan 2021 12:44:46 +0530 Subject: [PATCH 4/5] reverting changes for AddROW for accessds --- Ginger/GingerCore/DataSource/AccessDataSource.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Ginger/GingerCore/DataSource/AccessDataSource.cs b/Ginger/GingerCore/DataSource/AccessDataSource.cs index 31e1454aaa..73371bbbfa 100644 --- a/Ginger/GingerCore/DataSource/AccessDataSource.cs +++ b/Ginger/GingerCore/DataSource/AccessDataSource.cs @@ -385,11 +385,7 @@ public override void AddRow( List mColumnNames, DataSourceTable mDSTable mColumnNames = mDSTableDetails.DSC.GetColumnList(mDSTableDetails.Name); foreach (string sColName in mColumnNames) { - if (sColName == "GINGER_USED") - { - dr[sColName] = "false"; - } - else if (sColName != "GINGER_ID" && sColName != "GINGER_LAST_UPDATED_BY" && sColName != "GINGER_LAST_UPDATE_DATETIME") + if (sColName != "GINGER_ID" && sColName != "GINGER_LAST_UPDATED_BY" && sColName != "GINGER_LAST_UPDATE_DATETIME") { dr[sColName] = ""; } From a5d6bc8ab4f8f67b7bf18e2198ae36b38c0a63ab Mon Sep 17 00:00:00 2001 From: Ravi Kumar Date: Fri, 29 Jan 2021 13:15:14 +0530 Subject: [PATCH 5/5] adding check for litedb VE --- Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs b/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs index 352d1b60f5..e02baf643e 100644 --- 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