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

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

@@ -311,46 +311,21 @@ namespace AyaNova.Biz
dtAfter = System.DateTime.Today.AddDays(-1); dtAfter = System.DateTime.Today.AddDays(-1);
dtAfter = dtAfter.AddSeconds(-1); dtAfter = dtAfter.AddSeconds(-1);
dtBefore = System.DateTime.Today;//.AddDays(-1); dtBefore = System.DateTime.Today;//.AddDays(-1);
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.Today: case FilterSpecialToken.Today:
//Between yesterday at midnight and tommorow at midnight //Between yesterday at midnight and tommorow at midnight
dtAfter = System.DateTime.Today.AddSeconds(-1); dtAfter = System.DateTime.Today.AddSeconds(-1);
dtBefore = System.DateTime.Today.AddDays(1); dtBefore = System.DateTime.Today.AddDays(1);
//dtBefore=dtBefore.AddSeconds(1); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(">'");
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.Tomorrow: case FilterSpecialToken.Tomorrow:
//Between Tonight at midnight and day after tommorow at midnight //Between Tonight at midnight and day after tommorow at midnight
dtAfter = System.DateTime.Today.AddDays(1); dtAfter = System.DateTime.Today.AddDays(1);
dtAfter = dtAfter.AddSeconds(-1); dtAfter = dtAfter.AddSeconds(-1);
dtBefore = System.DateTime.Today.AddDays(2); dtBefore = System.DateTime.Today.AddDays(2);
//dtBefore=dtBefore.AddSeconds(1); BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
sb.Append(">'");
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 402 //Case 402
@@ -370,15 +345,7 @@ namespace AyaNova.Biz
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;
@@ -407,15 +374,7 @@ namespace AyaNova.Biz
dtBefore = dtBefore.AddDays(1); dtBefore = dtBefore.AddDays(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.NextWeek: case FilterSpecialToken.NextWeek:
//Between Next Sunday at midnight and Next Next sunday at midnight //Between Next Sunday at midnight and Next Next sunday at midnight
@@ -438,15 +397,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.LastMonth: case FilterSpecialToken.LastMonth:
//start with the first day of this month //start with the first day of this month
@@ -462,15 +413,7 @@ namespace AyaNova.Biz
// 'yyyy-mm-ddTHH:MM:SS' // 'yyyy-mm-ddTHH:MM:SS'
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.ThisMonth: case FilterSpecialToken.ThisMonth:
//start with the first day of this month //start with the first day of this month