From 43766f572b1a82ba055409934000327abcec0b52 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 Dec 2018 23:51:14 +0000 Subject: [PATCH] --- .../AyaNova/biz/FilterSqlCriteriaBuilder.cs | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs index 836f9304..0adf4719 100644 --- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs +++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs @@ -649,29 +649,12 @@ namespace AyaNova.Biz //so a simple parse should be sufficient //https://docs.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings#Roundtrip System.DateTime dtData = DateTime.Parse(sValue); - - //RAVEN NOTE: there is some old code kept commented out for now as I'm not certain I need the high low stuff anymore - // sValue = dtData.ToString(SqlDateFormatHighLow(false)); - // string sHighEnd = dtData.ToString(SqlDateFormatHighLow(true)); - // string sLowEnd = dtData.ToString(SqlDateFormatHighLow(false)); - - // string sGreaterThanValue = dtData.AddSeconds(1).ToString(SqlDateFormatHighLow(false)); - // string sLessThanValue = dtData.AddSeconds(-1).ToString(SqlDateFormatHighLow(true)); - - sValue = PostgresDateFormat(ZeroMilliseconds(dtData)); + string sHighEnd = PostgresDateFormat(MaxMilliseconds(dtData)); string sLowEnd = PostgresDateFormat(ZeroMilliseconds(dtData)); - - string sGreaterThanValue = PostgresDateFormat(ZeroMilliseconds(dtData.AddSeconds(1))); - string sLessThanValue = PostgresDateFormat(MaxMilliseconds(dtData.AddSeconds(-1))); - + switch (sOperator) - { - //case FilterComparisonOperator.Equality: - // sb.Append("='"); - // sb.Append(sValue); - // sb.Append("'"); - // break; + { case FilterComparisonOperator.Equality: sb.Append(">='"); @@ -682,14 +665,14 @@ namespace AyaNova.Biz sb.Append("<='"); sb.Append(sHighEnd); sb.Append("'"); - break; case FilterComparisonOperator.GreaterThan: sb.Append(">'"); - sb.Append(sGreaterThanValue); + sb.Append(sLowEnd); sb.Append("'"); break; + case FilterComparisonOperator.GreaterThanOrEqualTo: sb.Append(">='"); sb.Append(sLowEnd); @@ -697,7 +680,7 @@ namespace AyaNova.Biz break; case FilterComparisonOperator.LessThan: sb.Append("<'"); - sb.Append(sLessThanValue); + sb.Append(sHighEnd); sb.Append("'"); break; case FilterComparisonOperator.LessThanOrEqualTo: @@ -706,11 +689,7 @@ namespace AyaNova.Biz sb.Append("'"); break; - //case FilterComparisonOperator.NotEqual: - // sb.Append("<>'"); - // sb.Append(sValue); - // sb.Append("'"); - // break; + case FilterComparisonOperator.NotEqual: sb.Append("<'"); sb.Append(sLowEnd);