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:22:21 +00:00
parent 0461ea3a9d
commit 90db726a7c
1 changed files with 89 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -645,6 +645,7 @@ namespace AyaNova.Biz
//======================= //=======================
//NEW ONES FOR RAVEN //NEW ONES FOR RAVEN
case FilterSpecialToken.LastQuarter: case FilterSpecialToken.LastQuarter:
//First determine what quarter we are in now, then get the date range for the quarter before that //First determine what quarter we are in now, then get the date range for the quarter before that
switch (DateTime.Now.Month) switch (DateTime.Now.Month)
@@ -691,10 +692,6 @@ namespace AyaNova.Biz
} }
//From zero hour january 1 this year
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
//To now
dtBefore = System.DateTime.Now;
sb.Append(">'"); sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter)); sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND ("); sb.Append("') AND (");
@@ -718,8 +715,53 @@ namespace AyaNova.Biz
sb.Append(PostgresDateFormat(dtBefore)); sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'"); sb.Append("'");
break; break;
case FilterSpecialToken.QuarterToDate:
switch (DateTime.Now.Month)
{
//FirstQuarter to date
case 1:
case 2:
case 3:
//Jan 1st to now
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
dtBefore = DateTime.Now;
break;
//Second Quarter to date
case 4:
case 5:
case 6:
//April 1st to now
dtAfter = new DateTime(DateTime.Now.Year, 4, 1, 00, 00, 00);
dtBefore = DateTime.Now;
break;
//Third quarter to date
case 7:
case 8:
case 9:
//From July 1
dtAfter = new DateTime(DateTime.Now.Year, 7, 1, 00, 00, 00);
dtBefore = DateTime.Now;
break;
default:
//Fourth quarter to date
//From Oct 1 this year
dtAfter = new DateTime(DateTime.Now.Year, 10, 1, 00, 00, 00);
dtBefore = DateTime.Now;
break;
}
sb.Append(">'");
sb.Append(PostgresDateFormat(dtAfter));
sb.Append("') AND (");
sb.Append(sColumn);
sb.Append(" ");
sb.Append("<'");
sb.Append(PostgresDateFormat(dtBefore));
sb.Append("'");
break;
} }
#endregion #endregion