admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-12-04 22:06:55 +00:00
parent 80a2a67b74
commit 1c87fbde53
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
View File

@@ -656,7 +656,7 @@ namespace AyaNova.Biz
case FilterComparisonOperator.Equality: case FilterComparisonOperator.Equality:
sb.Append(">='"); sb.Append(">='");
sb.Append(sLowEnd); sb.Append(sLowEnd);
sb.Append("') AND ("); sb.Append("' AND ");
sb.Append(sColumn); sb.Append(sColumn);
sb.Append(" "); sb.Append(" ");
sb.Append("<='"); sb.Append("<='");
@@ -689,7 +689,7 @@ namespace AyaNova.Biz
case FilterComparisonOperator.NotEqual: case FilterComparisonOperator.NotEqual:
sb.Append("<'"); sb.Append("<'");
sb.Append(sLowEnd); sb.Append(sLowEnd);
sb.Append("') OR ("); sb.Append("' OR ");
sb.Append(sColumn); sb.Append(sColumn);
sb.Append(" "); sb.Append(" ");
sb.Append(">'"); sb.Append(">'");
@@ -785,7 +785,7 @@ namespace AyaNova.Biz
{ {
sb.Append(">'"); sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter)); sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND ("); sb.Append("' AND ");
sb.Append(sColumn); sb.Append(sColumn);
sb.Append(" "); sb.Append(" ");
sb.Append("<'"); sb.Append("<'");

5
test/raven-integration/DataFilter/DataFilterFilteringLists.cs
View File

@@ -91,12 +91,11 @@ namespace raven_integration
DataFilterNameStart.value = WidgetNameStart; DataFilterNameStart.value = WidgetNameStart;
dfilter.Add(DataFilterNameStart); dfilter.Add(DataFilterNameStart);
//inclusive test filter //## INCLUSIVE FILTER
dynamic FilterItem = new JObject(); dynamic FilterItem = new JObject();
FilterItem.fld = "startdate"; FilterItem.fld = "startdate";
FilterItem.op = OpEquality; FilterItem.op = OpEquality;
FilterItem.value = new DateTime(1968, 3, 10, 10, 0, 0).ToUniversalTime(); FilterItem.value = new DateTime(1968, 3, 12, 10, 0, 0).ToUniversalTime();
dfilter.Add(FilterItem); dfilter.Add(FilterItem);
d.filter = dfilter.ToString();//it expects it to be a json string, not actual json d.filter = dfilter.ToString();//it expects it to be a json string, not actual json