Skip to content

Convert range filter dates to universaltime #174

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
mcintyre321 merged 1 commit into from
Sep 14, 2019
+5 −1
Merged

Convert range filter dates to universaltime #174

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
6 changes: 5 additions & 1 deletion Mvc.JQuery.DataTables.Common/Processing/TypeFilters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,14 @@ public static string DateTimeOffsetFilter(string query, string columnname, DataT
DateTimeOffset start, end;
if (DateTimeOffset.TryParse(parts[0] ?? "", out start))
{
start = start.ToUniversalTime();
filterString = columnname + " >= @" + parametersForLinqQuery.Count;
parametersForLinqQuery.Add(start);
}

if (DateTimeOffset.TryParse(parts[1] ?? "", out end))
{
end = end.ToUniversalTime();
filterString = (filterString == null ? null : filterString + " and ") + columnname + " <= @" + parametersForLinqQuery.Count;
parametersForLinqQuery.Add(end);
}
Expand Down Expand Up @@ -161,12 +163,14 @@ public static string DateTimeFilter(string query, string columnname, DataTablesP
DateTime start, end;
if (DateTime.TryParse(parts[0] ?? "", out start))
{
start = start.ToUniversalTime();
filterString = columnname + " >= @" + parametersForLinqQuery.Count;
parametersForLinqQuery.Add(start);
}

if (DateTime.TryParse(parts[1] ?? "", out end))
{
end = end.ToUniversalTime();
filterString = (filterString == null ? null : filterString + " and ") + columnname + " <= @" + parametersForLinqQuery.Count;
parametersForLinqQuery.Add(end);
}
Expand Down Expand Up @@ -254,4 +258,4 @@ public static string EnumFilter(string q, string columnname, DataTablesPropertyI
return columnname + " == @" + (parametersForLinqQuery.Count - 1);
}
}
}
}