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-11 01:23:17 +00:00
parent d1faf35a66
commit 62ddd43501
2 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -514,17 +514,17 @@ namespace AyaNova.Biz
case FilterSpecialToken.InTheLast6Months:
//From Now minus 6 months
dtAfter = RelativeNow.AddMonths(-6);
dtAfter = DateTime.UtcNow.AddMonths(-6);
//To Now
dtBefore = RelativeNow;
dtBefore = DateTime.UtcNow;
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.InTheLastYear:
//From Now minus 365 days
dtAfter = RelativeNow.AddDays(-365);
dtAfter = DateTime.UtcNow.AddDays(-365);
//To Now
dtBefore = RelativeNow;
dtBefore = DateTime.UtcNow;
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
@@ -622,23 +622,23 @@ namespace AyaNova.Biz
break;
case FilterSpecialToken.Past90Days:
//From Now minus 90 days
dtAfter = RelativeNow.AddDays(-90);
dtAfter = DateTime.UtcNow.AddDays(-90);
//To Now
dtBefore = RelativeNow;
dtBefore = DateTime.UtcNow;
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Past30Days:
//From Now minus 30 days
dtAfter = RelativeNow.AddDays(-30);
dtAfter = DateTime.UtcNow.AddDays(-30);
//To Now
dtBefore = RelativeNow;
dtBefore = DateTime.UtcNow;
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Past24Hours:
//From Now minus 24 hours
dtAfter = RelativeNow.AddHours(-24);
dtAfter = DateTime.UtcNow.AddHours(-24);
//To Now
dtBefore = RelativeNow;
dtBefore = DateTime.UtcNow;
BuildBetweenTwoDatesFragment(sColumn, sb, dtAfter, dtBefore);
break;
case FilterSpecialToken.Q1ThisYear:

126
test/raven-integration/DataFilter/DataFilterFilteringLists.cs
View File

@@ -726,8 +726,8 @@ namespace raven_integration
//included widget
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.AddDays(-1).ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).AddDays(-1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(-1);
w.endDate = DateTime.UtcNow.AddHours(1).AddDays(-1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -735,8 +735,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -826,8 +826,8 @@ namespace raven_integration
//included widget
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -835,8 +835,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.AddDays(-1).ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).AddDays(-1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(-1);
w.endDate = DateTime.UtcNow.AddHours(1).AddDays(-1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -926,8 +926,8 @@ namespace raven_integration
//included widget
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.AddDays(1).ToUniversalTime();
w.endDate = DateTime.Now.AddDays(1).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(1);
w.endDate = DateTime.UtcNow.AddDays(1).AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -935,8 +935,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -1027,8 +1027,8 @@ namespace raven_integration
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
//My theory is any date - 7 days is last week if you go sunday to sunday
w.startDate = DateTime.Now.AddDays(-7).ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).AddDays(-7).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(-7);
w.endDate = DateTime.UtcNow.AddHours(1).AddDays(-7);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -1036,8 +1036,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -1126,8 +1126,8 @@ namespace raven_integration
//included widget
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -1136,8 +1136,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
//My theory is any date - 7 days is last week if you go sunday to sunday
w.startDate = DateTime.Now.AddDays(-7).ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).AddDays(-7).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(-7);
w.endDate = DateTime.UtcNow.AddHours(1).AddDays(-7);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -1228,8 +1228,8 @@ namespace raven_integration
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
//My theory is any date + 7 days is next week if you go sunday to sunday
w.startDate = DateTime.Now.AddDays(7).ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).AddDays(7).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(7);
w.endDate = DateTime.UtcNow.AddHours(1).AddDays(7);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -1238,8 +1238,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -1638,8 +1638,8 @@ namespace raven_integration
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -1648,8 +1648,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
//9 days ago will be outside the 14 day window
w.startDate = DateTime.Now.AddDays(-9).ToUniversalTime();
w.endDate = DateTime.Now.AddDays(-9).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(-9);
w.endDate = DateTime.UtcNow.AddDays(-9).AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -1742,8 +1742,8 @@ namespace raven_integration
w.name = Util.Uniquify(WidgetNameStart);
//Test if for the past, definitely going to be in the past when the list is fetched after saving, but will it work with the server on another machine??
//Best to pad in 5 minutes to be on the safe side, these days no two computers on earth should be out by more than 5 minutes to UTC from each other
w.startDate = DateTime.Now.AddMinutes(-5).ToUniversalTime();
w.endDate = DateTime.Now.AddMinutes(-5).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddMinutes(-5);
w.endDate = DateTime.UtcNow.AddMinutes(-5).AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -1752,8 +1752,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
//8 days ago will be outside the 14 day window
w.startDate = DateTime.Now.AddMonths(1).ToUniversalTime();
w.endDate = DateTime.Now.AddMonths(1).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddMonths(1);
w.endDate = DateTime.UtcNow.AddMonths(1).AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -1843,8 +1843,8 @@ namespace raven_integration
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.AddMinutes(5).ToUniversalTime();
w.endDate = DateTime.Now.AddMinutes(5).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddMinutes(5);
w.endDate = DateTime.UtcNow.AddMinutes(5).AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -1853,8 +1853,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -1945,8 +1945,8 @@ namespace raven_integration
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.AddYears(-1).AddMinutes(-5).ToUniversalTime();
w.endDate = DateTime.Now.AddYears(-1).AddMinutes(-5).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddYears(-1).AddMinutes(-5);
w.endDate = DateTime.UtcNow.AddYears(-1).AddMinutes(-5).AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -1955,8 +1955,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
@@ -2050,8 +2050,8 @@ namespace raven_integration
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.ToUniversalTime();
w.endDate = DateTime.Now.AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow;
w.endDate = DateTime.UtcNow.AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -2060,8 +2060,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.AddYears(-1).AddMinutes(-5).ToUniversalTime();
w.endDate = DateTime.Now.AddYears(-1).AddMinutes(-5).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddYears(-1).AddMinutes(-5);
w.endDate = DateTime.UtcNow.AddYears(-1).AddMinutes(-5).AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -2255,8 +2255,8 @@ namespace raven_integration
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.AddMonths(-6).AddMinutes(5).ToUniversalTime();
w.endDate = DateTime.Now.AddMonths(-6).AddMinutes(5).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddMonths(-6).AddMinutes(5);
w.endDate = DateTime.UtcNow.AddMonths(-6).AddMinutes(5).AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -2265,8 +2265,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.AddMonths(-6).AddMinutes(-5).ToUniversalTime();
w.endDate = DateTime.Now.AddMonths(-6).AddMinutes(-5).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddMonths(-6).AddMinutes(-5);
w.endDate = DateTime.UtcNow.AddMonths(-6).AddMinutes(-5).AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -2356,8 +2356,8 @@ namespace raven_integration
dynamic w = new JObject();
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.AddDays(-365).AddMinutes(5).ToUniversalTime();
w.endDate = DateTime.Now.AddDays(-365).AddMinutes(5).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(-365).AddMinutes(5);
w.endDate = DateTime.UtcNow.AddDays(-365).AddMinutes(5).AddHours(1);
ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -2366,8 +2366,8 @@ namespace raven_integration
//Excluded widget
w.name = Util.Uniquify(WidgetNameStart);
//####
w.startDate = DateTime.Now.AddDays(-365).AddMinutes(-5).ToUniversalTime();
w.endDate = DateTime.Now.AddDays(-365).AddMinutes(-5).AddHours(1).ToUniversalTime();
w.startDate = DateTime.UtcNow.AddDays(-365).AddMinutes(-5);
w.endDate = DateTime.UtcNow.AddDays(-365).AddMinutes(-5).AddHours(1);
a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
Util.ValidateDataReturnResponseOk(a);
@@ -2465,23 +2465,23 @@ namespace raven_integration
{
case 1:
//We want 5 minutes into the start of q4 last year
InclusiveStartDate = new DateTime(DateTime.Now.AddYears(-1).Year, 10, 1, 00, 5, 00).ToUniversalTime();
ExclusiveStartDate = DateTime.Now.ToUniversalTime();
InclusiveStartDate = new DateTime(DateTime.UtcNow.AddYears(-1).Year, 10, 1, 00, 5, 00).ToUniversalTime();
ExclusiveStartDate = DateTime.UtcNow.ToUniversalTime();
break;
case 2:
//We want 5 minutes into the start of q1 this year
InclusiveStartDate = new DateTime(DateTime.Now.Year, 1, 1, 00, 5, 00).ToUniversalTime();
ExclusiveStartDate = DateTime.Now.ToUniversalTime();
ExclusiveStartDate = DateTime.UtcNow.ToUniversalTime();
break;
case 3:
//We want 5 minutes into the start of q2 this year
InclusiveStartDate = new DateTime(DateTime.Now.Year, 4, 1, 00, 5, 00).ToUniversalTime();
ExclusiveStartDate = DateTime.Now.ToUniversalTime();
ExclusiveStartDate = DateTime.UtcNow.ToUniversalTime();
break;
default:
//We want 5 minutes into the start of q3 this year
InclusiveStartDate = new DateTime(DateTime.Now.Year, 7, 1, 00, 5, 00).ToUniversalTime();
ExclusiveStartDate = DateTime.Now.ToUniversalTime();
ExclusiveStartDate = DateTime.UtcNow.ToUniversalTime();
break;
}
//##################################################################################
@@ -3751,8 +3751,8 @@ namespace raven_integration
//##################################################################################
var FilterToken = TokenPast90Days;
InclusiveStartDate = DateTime.Now.AddDays(-90).AddMinutes(5).ToUniversalTime();
ExclusiveStartDate = DateTime.Now.AddDays(-90).AddMinutes(-5).ToUniversalTime();
InclusiveStartDate = DateTime.UtcNow.AddDays(-90).AddMinutes(5).ToUniversalTime();
ExclusiveStartDate = DateTime.UtcNow.AddDays(-90).AddMinutes(-5).ToUniversalTime();
//##################################################################################
@@ -3864,8 +3864,8 @@ namespace raven_integration
//##################################################################################
var FilterToken = TokenPast30Days;
InclusiveStartDate = DateTime.Now.AddDays(-30).AddMinutes(5).ToUniversalTime();
ExclusiveStartDate = DateTime.Now.AddDays(-30).AddMinutes(-5).ToUniversalTime();
InclusiveStartDate = DateTime.UtcNow.AddDays(-30).AddMinutes(5).ToUniversalTime();
ExclusiveStartDate = DateTime.UtcNow.AddDays(-30).AddMinutes(-5).ToUniversalTime();
//##################################################################################
@@ -3978,8 +3978,8 @@ namespace raven_integration
//##################################################################################
var FilterToken = TokenPast24Hours;
InclusiveStartDate = DateTime.Now.AddHours(-24).AddMinutes(5).ToUniversalTime();
ExclusiveStartDate = DateTime.Now.AddHours(-24).AddMinutes(-5).ToUniversalTime();
InclusiveStartDate = DateTime.UtcNow.AddHours(-24).AddMinutes(5).ToUniversalTime();
ExclusiveStartDate = DateTime.UtcNow.AddHours(-24).AddMinutes(-5).ToUniversalTime();
//##################################################################################