From f5c39395dffa16aa454300e3a902e5ad77aab9ac Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 Dec 2018 21:32:49 +0000 Subject: [PATCH] --- .../AyaNova/biz/FilterSqlCriteriaBuilder.cs | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs index efb54d1d..30894006 100644 --- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs +++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs @@ -848,6 +848,54 @@ namespace AyaNova.Biz sb.Append(PostgresDateFormat(dtBefore)); sb.Append("'"); break; + case FilterSpecialToken.Q1LastYear: + dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 1, 1, 00, 00, 00); + dtBefore = new DateTime(DateTime.Now.AddYears(-1).Year, 4, 1, 00, 00, 00); + sb.Append(">'"); + sb.Append(PostgresDateFormat(dtAfter)); + sb.Append("') AND ("); + sb.Append(sColumn); + sb.Append(" "); + sb.Append("<'"); + sb.Append(PostgresDateFormat(dtBefore)); + sb.Append("'"); + break; + case FilterSpecialToken.Q2LastYear: + dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 4, 1, 00, 00, 00); + dtBefore = new DateTime(DateTime.Now.AddYears(-1).Year, 7, 1, 00, 00, 00); + sb.Append(">'"); + sb.Append(PostgresDateFormat(dtAfter)); + sb.Append("') AND ("); + sb.Append(sColumn); + sb.Append(" "); + sb.Append("<'"); + sb.Append(PostgresDateFormat(dtBefore)); + sb.Append("'"); + break; + case FilterSpecialToken.Q3LastYear: + dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 7, 1, 00, 00, 00); + dtBefore = new DateTime(DateTime.Now.AddYears(-1).Year, 10, 1, 00, 00, 00); + sb.Append(">'"); + sb.Append(PostgresDateFormat(dtAfter)); + sb.Append("') AND ("); + sb.Append(sColumn); + sb.Append(" "); + sb.Append("<'"); + sb.Append(PostgresDateFormat(dtBefore)); + sb.Append("'"); + break; + case FilterSpecialToken.Q4LastYear: + dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 10, 1, 00, 00, 00); + dtBefore = new DateTime(DateTime.Now..Year, 1, 1, 00, 00, 00); + sb.Append(">'"); + sb.Append(PostgresDateFormat(dtAfter)); + sb.Append("') AND ("); + sb.Append(sColumn); + sb.Append(" "); + sb.Append("<'"); + sb.Append(PostgresDateFormat(dtBefore)); + sb.Append("'"); + break; //----- }