Skip to content

Fix DateTime to DateTimeOffset conversion #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlekseyMartynov merged 1 commit into from
Apr 26, 2021
+24 −1
Merged

Fix DateTime to DateTimeOffset conversion #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion net/DevExtreme.AspNet.Data.Tests/FilterExpressionCompilerTypeConversionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System;
using Newtonsoft.Json;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
Expand Down Expand Up @@ -223,6 +225,24 @@ public void StringFuncOnTimeSpan() {
AssertEvaluation(obj, new[] { "NullableTime", "contains", "23" });
}

[Theory]
[InlineData(DateParseHandling.None)]
[InlineData(DateParseHandling.DateTime)]
[InlineData(DateParseHandling.DateTimeOffset)]
public void Issue477(DateParseHandling dateParseHandling) {
var date = new DateTimeOffset(2021, 1, 1, 0, 0, 0, TimeSpan.Zero);
var filterJSON = JsonConvert.SerializeObject(new object[] { "this", date });
var deserializedFilter = JsonConvert.DeserializeObject<IList>(filterJSON, new JsonSerializerSettings {
DateParseHandling = dateParseHandling
});

var loadOptions = new SampleLoadOptions {
Filter = deserializedFilter
};

var loadResult = DataSourceLoader.Load(new[] { date }, loadOptions);
Assert.Single(loadResult.data);
}
}

}
3 changes: 3 additions & 0 deletions net/DevExtreme.AspNet.Data/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ public static object ConvertClientValue(object value, Type type) {
if(type == typeof(DateTime) && value is String)
return DateTime.Parse((string)value, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind);

if(type == typeof(DateTimeOffset) && value is DateTime date)
return new DateTimeOffset(date);

var converter = TypeDescriptor.GetConverter(type);
if(converter != null && converter.CanConvertFrom(value.GetType()))
return converter.ConvertFrom(null, CultureInfo.InvariantCulture, value);
Expand Down