admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-12-03 21:44:56 +00:00
parent f5c39395df
commit 40074393e4
1 changed files with 22 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
View File

@@ -791,110 +791,47 @@ namespace AyaNova.Biz
dtAfter = DateTime.Now.AddHours(-24); dtAfter = DateTime.Now.AddHours(-24);
//To Now //To Now
dtBefore = DateTime.Now; dtBefore = DateTime.Now;
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.Q1ThisYear: 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); dtBefore = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.Q2ThisYear: case FilterSpecialToken.Q2ThisYear:
dtAfter = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00); dtAfter = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00);
dtBefore = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00); dtBefore = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.Q3ThisYear: case FilterSpecialToken.Q3ThisYear:
dtAfter = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00); dtAfter = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00);
dtBefore = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00); dtBefore = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.Q4ThisYear: case FilterSpecialToken.Q4ThisYear:
dtAfter = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00); dtAfter = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00);
dtBefore = new DateTime(DateTime.Now.AddYears(1).Year, 1, 1, 00, 00, 00); dtBefore = new DateTime(DateTime.Now.AddYears(1).Year, 1, 1, 00, 00, 00);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.Q1LastYear: case FilterSpecialToken.Q1LastYear:
dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 1, 1, 00, 00, 00); 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); dtBefore = new DateTime(DateTime.Now.AddYears(-1).Year, 4, 1, 00, 00, 00);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.Q2LastYear: case FilterSpecialToken.Q2LastYear:
dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 4, 1, 00, 00, 00); 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); dtBefore = new DateTime(DateTime.Now.AddYears(-1).Year, 7, 1, 00, 00, 00);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.Q3LastYear: case FilterSpecialToken.Q3LastYear:
dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 7, 1, 00, 00, 00); 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); dtBefore = new DateTime(DateTime.Now.AddYears(-1).Year, 10, 1, 00, 00, 00);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.Q4LastYear: case FilterSpecialToken.Q4LastYear:
dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 10, 1, 00, 00, 00); dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 10, 1, 00, 00, 00);
dtBefore = new DateTime(DateTime.Now..Year, 1, 1, 00, 00, 00); dtBefore = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; 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) // public static string SqlDateFormatHighLow(bool bhigh)
// { // {
// //new test version // //new test version