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:45:19 +00:00
parent dd8b7dbe21
commit 3ec1eb7ee2
1 changed files with 16 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,46 +311,21 @@ namespace AyaNova.Biz
dtAfter = System.DateTime.Today.AddDays(-1);
dtAfter = dtAfter.AddSeconds(-1);
dtBefore = System.DateTime.Today;//.AddDays(-1);
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.Today:
//Between yesterday at midnight and tommorow at midnight
dtAfter = System.DateTime.Today.AddSeconds(-1);
dtBefore = System.DateTime.Today.AddDays(1);
//dtBefore=dtBefore.AddSeconds(1);
sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Tomorrow:
//Between Tonight at midnight and day after tommorow at midnight
dtAfter = System.DateTime.Today.AddDays(1);
dtAfter = dtAfter.AddSeconds(-1);
dtBefore = System.DateTime.Today.AddDays(2);
//dtBefore=dtBefore.AddSeconds(1);
sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
//Case 402
@@ -370,15 +345,7 @@ namespace AyaNova.Biz
dtAfter = dtAfter.AddSeconds(-1);
sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
@@ -407,15 +374,7 @@ namespace AyaNova.Biz
dtBefore = dtBefore.AddDays(1);
}
sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.NextWeek:
//Between Next Sunday at midnight and Next Next sunday at midnight
@@ -438,15 +397,7 @@ namespace AyaNova.Biz
//case 1155
dtAfter = dtAfter.AddSeconds(-1);
sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.LastMonth:
//start with the first day of this month
@@ -462,15 +413,7 @@ namespace AyaNova.Biz
// 'yyyy-mm-ddTHH:MM:SS'
sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
//sb.Append(" ");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.ThisMonth:
//start with the first day of this month
@@ -497,7 +440,7 @@ namespace AyaNova.Biz
//case 1155
dtAfter = dtAfter.AddSeconds(-1);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.FourteenDayWindow:
//start with today zero hour
@@ -551,7 +494,7 @@ namespace AyaNova.Biz
dtAfter = DateTime.Now.AddMonths(-3);
//To Now
dtBefore = DateTime.Now;
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.InTheLast6Months:
@@ -619,7 +562,7 @@ namespace AyaNova.Biz
}
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.YearToDate:
//From zero hour january 1 this year
@@ -662,7 +605,7 @@ namespace AyaNova.Biz
dtBefore = DateTime.Now;
break;
}
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Past90Days:
//From Now minus 90 days
@@ -676,14 +619,14 @@ namespace AyaNova.Biz
dtAfter = DateTime.Now.AddDays(-30);
//To Now
dtBefore = DateTime.Now;
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Past24Hours:
//From Now minus 24 hours
dtAfter = DateTime.Now.AddHours(-24);
//To Now
dtBefore = DateTime.Now;
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Q1ThisYear:
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
@@ -693,12 +636,12 @@ namespace AyaNova.Biz
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);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
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);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Q4ThisYear:
dtAfter = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00);
@@ -708,7 +651,7 @@ namespace AyaNova.Biz
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);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Q2LastYear:
dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 4, 1, 00, 00, 00);