From 515f9337a290e89899d9f3fde495adf169e2acc9 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 Dec 2018 21:30:32 +0000 Subject: [PATCH] --- .../AyaNova/biz/FilterSqlCriteriaBuilder.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs index 23ce81e2..efb54d1d 100644 --- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs +++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs @@ -801,7 +801,7 @@ namespace AyaNova.Biz sb.Append("'"); break; case FilterSpecialToken.Q1ThisYear: - dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00); + dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00); dtBefore = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00); sb.Append(">'"); sb.Append(PostgresDateFormat(dtAfter)); @@ -812,9 +812,9 @@ namespace AyaNova.Biz sb.Append(PostgresDateFormat(dtBefore)); sb.Append("'"); break; - case FilterSpecialToken.Q2ThisYear: - dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00); - dtBefore = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00); + case FilterSpecialToken.Q2ThisYear: + dtAfter = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00); + dtBefore = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00); sb.Append(">'"); sb.Append(PostgresDateFormat(dtAfter)); sb.Append("') AND ("); @@ -824,9 +824,9 @@ namespace AyaNova.Biz sb.Append(PostgresDateFormat(dtBefore)); sb.Append("'"); break; - case FilterSpecialToken.Q1ThisYear: - dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00); - dtBefore = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00); + case FilterSpecialToken.Q3ThisYear: + dtAfter = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00); + dtBefore = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00); sb.Append(">'"); sb.Append(PostgresDateFormat(dtAfter)); sb.Append("') AND ("); @@ -836,9 +836,9 @@ namespace AyaNova.Biz sb.Append(PostgresDateFormat(dtBefore)); sb.Append("'"); break; - case FilterSpecialToken.Q1ThisYear: - dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00); - dtBefore = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00); + case FilterSpecialToken.Q4ThisYear: + dtAfter = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00); + dtBefore = new DateTime(DateTime.Now.AddYears(1).Year, 1, 1, 00, 00, 00); sb.Append(">'"); sb.Append(PostgresDateFormat(dtAfter)); sb.Append("') AND (");