From 40074393e4bbf6560dc546af6e0b1844f5e21879 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 Dec 2018 21:44:56 +0000 Subject: [PATCH] --- .../AyaNova/biz/FilterSqlCriteriaBuilder.cs | 95 +++++-------------- 1 file changed, 22 insertions(+), 73 deletions(-) diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs index 30894006..30b09cc3 100644 --- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs +++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs @@ -791,110 +791,47 @@ namespace AyaNova.Biz dtAfter = DateTime.Now.AddHours(-24); //To Now dtBefore = DateTime.Now; - sb.Append(">'"); - sb.Append(PostgresDateFormat(dtAfter)); - sb.Append("') AND ("); - sb.Append(sColumn); - sb.Append(" "); - sb.Append("<'"); - sb.Append(PostgresDateFormat(dtBefore)); - sb.Append("'"); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); 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); - sb.Append(">'"); - sb.Append(PostgresDateFormat(dtAfter)); - sb.Append("') AND ("); - sb.Append(sColumn); - sb.Append(" "); - sb.Append("<'"); - sb.Append(PostgresDateFormat(dtBefore)); - sb.Append("'"); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); break; 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 ("); - sb.Append(sColumn); - sb.Append(" "); - sb.Append("<'"); - sb.Append(PostgresDateFormat(dtBefore)); - sb.Append("'"); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); break; 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 ("); - sb.Append(sColumn); - sb.Append(" "); - sb.Append("<'"); - sb.Append(PostgresDateFormat(dtBefore)); - sb.Append("'"); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); break; 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 ("); - sb.Append(sColumn); - sb.Append(" "); - sb.Append("<'"); - sb.Append(PostgresDateFormat(dtBefore)); - sb.Append("'"); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); 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("'"); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); 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("'"); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); 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("'"); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); 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("'"); + dtBefore = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00); + BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore); break; //----- @@ -1084,6 +1021,18 @@ namespace AyaNova.Biz } + private static void BuildBetweenTwoDatesFragment(string sColumn, StringBuilder sb, DateTime dtAfter, DateTime dtBefore) + { + sb.Append(">'"); + sb.Append(PostgresDateFormat(dtAfter)); + sb.Append("') AND ("); + sb.Append(sColumn); + sb.Append(" "); + sb.Append("<'"); + sb.Append(PostgresDateFormat(dtBefore)); + sb.Append("'"); + } + // public static string SqlDateFormatHighLow(bool bhigh) // { // //new test version