diff --git a/DataList/DataListFiltering.cs b/DataList/DataListFiltering.cs index 3fe21e7..d15bda9 100644 --- a/DataList/DataListFiltering.cs +++ b/DataList/DataListFiltering.cs @@ -2956,6 +2956,7 @@ same as the server does but in a central location here for all tests to use. long DataFilterId = a.ObjectResponse["data"]["id"].Value(); //NOW FETCH WIDGET LIST WITH FILTER + //" where (awidget.name Like 'DateTokenPast24HoursFilterWorks%') AND (awidget.startdate >'2020-02-02T22:55:31.0474690Z' AND awidget.startdate <'2020-02-03T22:55:31.0474696Z')" a = await Util.GetAsync($"DataList/list?DataListKey=TestWidgetDataList&Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in")); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); diff --git a/util.cs b/util.cs index ac7b9f1..6f82650 100644 --- a/util.cs +++ b/util.cs @@ -17,8 +17,16 @@ namespace raven_integration //or the tests that cross dst / pst boundaries will fail //See servers spec doc core-locale-currency-numbers-time-and-dates.txt for details double TIME_ZONE_ADJUSTMENT = -8;// <---=== SET THIS TO SAME AS GENERATED DATA OFFSET AT SERVER - Double TimeZoneAdjustment = (TIME_ZONE_ADJUSTMENT) * -1; - return dtIn.AddHours(TimeZoneAdjustment).ToUniversalTime(); + + return DateTime.SpecifyKind(dtIn.AddHours(((TIME_ZONE_ADJUSTMENT) * -1)), DateTimeKind.Utc); + + //above is just this but shorter: + // Double TimeZoneAdjustment = (TIME_ZONE_ADJUSTMENT) * -1; + // dtIn = dtIn.AddHours(TimeZoneAdjustment); + // DateTime other = DateTime.SpecifyKind(dtIn, DateTimeKind.Utc); + // return other; + + } }