This commit is contained in:
2018-12-03 21:30:32 +00:00
parent 6cad3b495d
commit 515f9337a2

View File

@@ -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 (");