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-03 20:52:38 +00:00
parent 9d460fa40f
commit 26c97523ca
2 changed files with 5 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
server/AyaNova/biz/FilterSpecialTokens.cs
View File

@@ -1,81 +1,11 @@
using System.Collections.Generic;
using System;
namespace AyaNova.Biz
{
public static class FilterSpecialToken
{
// switch (UICompareValue)
// {
// //These date ones are simple
// case "[YESTERDAY]":
// case "[TODAY]":
// case "[TOMORROW]":
// case "[LAST WEEK]":
// case "[THIS WEEK]":
// case "[NEXT WEEK]":
// case "[LAST MONTH]":
// case "[THIS MONTH]":
// case "[NEXT MONTH]":
// case "[14DAYWINDOW]":
// //case 2067
// case "[PAST]":
// case "[FUTURE]":
// case "[LASTYEAR]":
// case "[THISYEAR]":
// case "[INTHELAST3MONTHS]":
// case "[INTHELAST6MONTHS]":
// case "[INTHELASTYEAR]":
// sCompareValue = UICompareValue;
// sCompareOperator = "Custom";
// sCompareValue2 = "";
// sCompareOperator2 = "";
// break;
// case "AH":
// sCompareOperator = "LessThanOrEqualTo";sCompareValue = "Hz";
// sCompareOperator2 = "";sCompareValue2 = "";
// break;
// case "IP":
// sCompareOperator = "GreaterThanOrEqualTo";sCompareValue = "I";
// sCompareOperator2 = "LessThanOrEqualTo";sCompareValue2 = "Pz";
// break;
// case "QZ":
// sCompareOperator = "GreaterThanOrEqualTo"; sCompareValue = "Q";
// sCompareOperator2 = "";sCompareValue2 = "";
// break;
// case "03":
// sCompareOperator = "LessThanOrEqualTo"; sCompareValue = "3z";
// sCompareOperator2 = ""; sCompareValue2 = "";
// break;
// case "46":
// sCompareOperator = "GreaterThanOrEqualTo"; sCompareValue = "4";
// sCompareOperator2 = "LessThanOrEqualTo"; sCompareValue2 = "6z";
// break;
// case "79":
// sCompareOperator = "GreaterThanOrEqualTo"; sCompareValue = "7";
// sCompareOperator2 = "LessThanOrEqualTo"; sCompareValue2 = "9z";
// break;
// case "<0":
// sCompareOperator = "LessThan"; sCompareValue = "0";
// sCompareOperator2 = ""; sCompareValue2 = "";
// break;
// case "=0":
// sCompareOperator = "Equals"; sCompareValue = "0";
// sCompareOperator2 = ""; sCompareValue2 = "";
// break;
// case ">0":
// sCompareOperator = "GreaterThan"; sCompareValue = "0";
// sCompareOperator2 = ""; sCompareValue2 = "";
// break;
// }
public const string Yesterday = "{[yesterday]}";
public const string Today = "{[today]}";
public const string Tomorrow = "{[tomorrow]}";
@@ -127,34 +57,5 @@ namespace AyaNova.Biz
public static List<string> operators = null;
public static List<string> Operators
{
get
{
if (operators == null)
{
operators = new List<string>();
operators.Add(Equality);
operators.Add(GreaterThan);
operators.Add(GreaterThanOrEqualTo);
operators.Add(LessThan);
operators.Add(LessThanOrEqualTo);
operators.Add(NotEqual);
operators.Add(NotLike);
operators.Add(StartsWith);
operators.Add(EndsWith);
operators.Add(Contains);
operators.Add(NotContains);
}
return operators;
}
}
}
}

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

@@ -54,7 +54,7 @@ namespace AyaNova.Biz
//handle null values separately
if (sValue == "")
{
//strings in grids are rarely null, almost always just an empty string
@@ -294,10 +294,10 @@ namespace AyaNova.Biz
break;
case "System.DateTime":
case "date":
{
if (sValue.StartsWith("["))
if (sValue.StartsWith("{[") && sValue.EndsWith("]}"))
{
#region Build criteria for date RANGE specified
//Used as the basis point