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 22:44:11 +00:00
parent 40074393e4
commit dd8b7dbe21
1 changed files with 15 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,15 +482,7 @@ namespace AyaNova.Biz
//case 1155 //case 1155
dtAfter = dtAfter.AddSeconds(-1); dtAfter = dtAfter.AddSeconds(-1);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.NextMonth: case FilterSpecialToken.NextMonth:
@@ -505,15 +497,7 @@ namespace AyaNova.Biz
//case 1155 //case 1155
dtAfter = dtAfter.AddSeconds(-1); dtAfter = dtAfter.AddSeconds(-1);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
case FilterSpecialToken.FourteenDayWindow: case FilterSpecialToken.FourteenDayWindow:
//start with today zero hour //start with today zero hour
@@ -526,15 +510,7 @@ namespace AyaNova.Biz
//case 1155 //case 1155
dtAfter = dtAfter.AddSeconds(-1); dtAfter = dtAfter.AddSeconds(-1);
sb.Append(">'"); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break; break;
@@ -544,28 +520,14 @@ namespace AyaNova.Biz
//Forever up to Now //Forever up to Now
dtAfter = new DateTime(1753, 1, 2, 00, 00, 00); dtAfter = new DateTime(1753, 1, 2, 00, 00, 00);
dtBefore = System.DateTime.Now; dtBefore = System.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.Future: case FilterSpecialToken.Future:
//From Now to forever (999 years from now) //From Now to forever (999 years from now)
dtAfter = System.DateTime.Now; dtAfter = System.DateTime.Now;
dtBefore = System.DateTime.Now.AddYears(999); dtBefore = System.DateTime.Now.AddYears(999);
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.LastYear: case FilterSpecialToken.LastYear:
@@ -573,14 +535,7 @@ namespace AyaNova.Biz
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);
//To zero hour January 1 this year //To zero hour January 1 this year
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;
case FilterSpecialToken.ThisYear: case FilterSpecialToken.ThisYear:
@@ -588,14 +543,7 @@ namespace AyaNova.Biz
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00); dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
//To zero hour Jan 1 next year //To zero hour Jan 1 next year
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.InTheLast3Months: case FilterSpecialToken.InTheLast3Months:
@@ -603,14 +551,7 @@ namespace AyaNova.Biz
dtAfter = DateTime.Now.AddMonths(-3); dtAfter = DateTime.Now.AddMonths(-3);
//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.InTheLast6Months: case FilterSpecialToken.InTheLast6Months:
@@ -618,14 +559,7 @@ namespace AyaNova.Biz
dtAfter = DateTime.Now.AddMonths(-6); dtAfter = DateTime.Now.AddMonths(-6);
//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.InTheLastYear: case FilterSpecialToken.InTheLastYear:
@@ -633,14 +567,7 @@ namespace AyaNova.Biz
dtAfter = DateTime.Now.AddDays(-365); dtAfter = DateTime.Now.AddDays(-365);
//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;
//======================= //=======================
@@ -692,28 +619,14 @@ namespace AyaNova.Biz
} }
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.YearToDate: case FilterSpecialToken.YearToDate:
//From zero hour january 1 this year //From zero hour january 1 this year
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00); dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
//To now //To now
dtBefore = System.DateTime.Now; dtBefore = System.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.QuarterToDate: case FilterSpecialToken.QuarterToDate:
switch (DateTime.Now.Month) switch (DateTime.Now.Month)
@@ -749,42 +662,21 @@ namespace AyaNova.Biz
dtBefore = DateTime.Now; dtBefore = DateTime.Now;
break; break;
} }
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.Past90Days: case FilterSpecialToken.Past90Days:
//From Now minus 90 days //From Now minus 90 days
dtAfter = DateTime.Now.AddDays(-90); dtAfter = DateTime.Now.AddDays(-90);
//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.Past30Days: case FilterSpecialToken.Past30Days:
//From Now minus 30 days //From Now minus 30 days
dtAfter = DateTime.Now.AddDays(-30); dtAfter = DateTime.Now.AddDays(-30);
//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.Past24Hours: case FilterSpecialToken.Past24Hours:
//From Now minus 24 hours //From Now minus 24 hours