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 20:57:41 +00:00
parent 26c97523ca
commit e35f7b58e0
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,7 +306,7 @@ namespace AyaNova.Biz
switch (sValue)
{
//Case 402
case "[YESTERDAY]":
case FilterSpecialToken.Yesterday:
//Between Day before yesterday at midnight and yesterday at midnight
dtAfter = System.DateTime.Today.AddDays(-1);
dtAfter = dtAfter.AddSeconds(-1);
@@ -321,7 +321,7 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "[TODAY]":
case FilterSpecialToken.Today:
//Between yesterday at midnight and tommorow at midnight
dtAfter = System.DateTime.Today.AddSeconds(-1);
dtBefore = System.DateTime.Today.AddDays(1);
@@ -336,7 +336,7 @@ namespace AyaNova.Biz
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break;
case "[TOMORROW]":
case FilterSpecialToken.Tomorrow:
//Between Tonight at midnight and day after tommorow at midnight
dtAfter = System.DateTime.Today.AddDays(1);
dtAfter = dtAfter.AddSeconds(-1);
@@ -354,7 +354,7 @@ namespace AyaNova.Biz
break;
//Case 402
case "[LAST WEEK]":
case FilterSpecialToken.LastWeek:
//Between two Sundays ago at midnight and last sunday at midnight
dtAfter = System.DateTime.Today;
@@ -382,7 +382,7 @@ namespace AyaNova.Biz
break;
case "[THIS WEEK]":
case FilterSpecialToken.ThisWeek:
//Between Sunday at midnight and Next sunday at midnight
dtAfter = System.DateTime.Today;
//go backwards to monday
@@ -417,7 +417,7 @@ namespace AyaNova.Biz
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break;
case "[NEXT WEEK]":
case FilterSpecialToken.NextWeek:
//Between Next Sunday at midnight and Next Next sunday at midnight
dtAfter = System.DateTime.Today;
@@ -448,7 +448,7 @@ namespace AyaNova.Biz
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break;
case "[LAST MONTH]":
case FilterSpecialToken.LastMonth:
//start with the first day of this month
dtAfter = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00);
//subtract a Month
@@ -472,7 +472,7 @@ namespace AyaNova.Biz
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break;
case "[THIS MONTH]":
case FilterSpecialToken.ThisMonth:
//start with the first day of this month
dtAfter = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00);
@@ -493,7 +493,7 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "[NEXT MONTH]":
case FilterSpecialToken.NextMonth:
//start with the first day of this month
dtAfter = new DateTime(DateTime.Today.Year, DateTime.Today.Month, 1, 00, 00, 00);
//Add a Month
@@ -515,7 +515,7 @@ namespace AyaNova.Biz
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break;
case "[14DAYWINDOW]":
case FilterSpecialToken.FourteenDayWindow:
//start with today zero hour
dtAfter = new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 00, 00, 00);
dtAfter = dtAfter.AddDays(-7);
@@ -540,7 +540,7 @@ namespace AyaNova.Biz
//case 2067 ADDITIONAL DATE RANGES ************
case "[PAST]":
case FilterSpecialToken.Past:
//Forever up to Now
dtAfter = new DateTime(1753, 1, 2, 00, 00, 00);
dtBefore = System.DateTime.Now;
@@ -554,7 +554,7 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "[FUTURE]":
case FilterSpecialToken.Future:
//From Now to forever (999 years from now)
dtAfter = System.DateTime.Now;
dtBefore = System.DateTime.Now.AddYears(999);