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:01:31 +00:00
parent e35f7b58e0
commit 1eb03acf98
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/biz/FilterSpecialTokens.cs
View File

@@ -22,7 +22,7 @@ namespace AyaNova.Biz
public const string ThisYear = "{[thisyear]}";
public const string InTheLast3Months = "{[last3months]}";
public const string InTheLast6Months = "{[last6months]}";
public const string InTheLastYear = "{[lastyear]}";
public const string InTheLastYear = "{[lastcalendaryear]}";
public const string AH = "{[ah]}";
public const string IP = "{[ip]}";
public const string QZ = "{[qz]}";

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

@@ -568,7 +568,7 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "[LASTYEAR]":
case FilterSpecialToken.LastYear:
//From zero hour january 1 a year ago
dtAfter = new DateTime(DateTime.Now.AddYears(-1).Year, 1, 1, 00, 00, 00);
//To zero hour January 1 this year
@@ -583,7 +583,7 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "[THISYEAR]":
case FilterSpecialToken.ThisYear:
//From zero hour january 1 this year
dtAfter = new DateTime(DateTime.Now.Year, 1, 1, 00, 00, 00);
//To zero hour Jan 1 next year
@@ -598,7 +598,7 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "[INTHELAST3MONTHS]":
case FilterSpecialToken.InTheLast3Months:
//From Now minus 3 months
dtAfter = DateTime.Now.AddMonths(-3);
//To Now
@@ -613,7 +613,7 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "[INTHELAST6MONTHS]":
case FilterSpecialToken.InTheLast6Months:
//From Now minus 6 months
dtAfter = DateTime.Now.AddMonths(-6);
//To Now
@@ -628,7 +628,7 @@ namespace AyaNova.Biz
sb.Append("'");
break;
case "[INTHELASTYEAR]":
case FilterSpecialToken.InTheLastYear:
//From Now minus 365 days
dtAfter = DateTime.Now.AddDays(-365);
//To Now