From e36c18a593577041262ce94cc9105f17e6d187e6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 Dec 2018 23:47:30 +0000 Subject: [PATCH] --- .../AyaNova/biz/FilterSqlCriteriaBuilder.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs index a65db26c..836f9304 100644 --- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs +++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs @@ -240,18 +240,18 @@ namespace AyaNova.Biz { case FilterComparisonOperator.Equality: sb.Append("= "); - if (sValue == "True") - sb.Append("1"); + if (sValue.ToLowerInvariant() == "true") + sb.Append("true"); else - sb.Append("0"); + sb.Append("false"); break; case FilterComparisonOperator.NotEqual: sb.Append("<> "); - if (sValue == "True") - sb.Append("1"); + if (sValue.ToLowerInvariant() == "true") + sb.Append("true"); else - sb.Append("0"); + sb.Append("false"); break; default: @@ -263,10 +263,13 @@ namespace AyaNova.Biz case "date": { + //Note: it is assumed all dates come into here from the CLIENT in UTC iso8601 format + //suitable for the database to handle as all database dates are in UTC + //Local display and parsing will be considered a CLIENT issue at all times if (sValue.StartsWith("{[") && sValue.EndsWith("]}")) { - #region Build criteria for date RANGE specified + #region Build criteria for date RANGE TOKEN specified //Used as the basis point System.DateTime dtAfter; System.DateTime dtBefore; @@ -526,8 +529,6 @@ namespace AyaNova.Biz dtBefore = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00); break; - - } BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); break;