Handle DateTimes better

Author: mcintyre321

Mvc.JQuery.Datatables.Example/Controllers/HomeController.cs

@@ -65,7 +65,7 @@ private static List<User> Users()
                                                     Position = positions[i%positions.Count],
                                                     IsAdmin = i % 11 == 0,
                                                     Number = (Numbers) r.Next(4),
-                                                    Hired = DateTimeOffset.UtcNow.AddDays(-1 * 365 * 3 * r.NextDouble())
+                                                    Hired = DateTime.UtcNow.AddDays(-1 * 365 * 3 * r.NextDouble())
                                                 })
                 ));
         }
@@ -88,7 +88,7 @@ public class User
 
         public HomeController.PositionTypes? Position { get; set; }
 
-        public DateTimeOffset Hired { get; set; }
+        public DateTime  Hired { get; set; }
 
         public Numbers Number { get; set; }
 
@@ -105,7 +105,7 @@ public class UserView
         public string Email { get; set; }
         public bool IsAdmin { get; set; }
         public string Position { get; set; }
-        public DateTimeOffset Hired { get; set; }
+        public DateTime  Hired { get; set; }
 
         public Numbers Number { get; set; }
     }

Mvc.JQuery.Datatables/DataTablesFilter.cs

@@ -62,7 +62,9 @@ public IQueryable FilterPagingSortingSearch(DataTablesParam dtParameters, IQuery
 
         static readonly List<ReturnedFilteredQueryForType> Filters = new List<ReturnedFilteredQueryForType>()
         {
-            Guard(IsDateType, TypeFilters.DateFilter),
+            
+            Guard(IsDateTimeType, TypeFilters.DateTimeFilter),
+            Guard(IsDateTimeOffsetType, TypeFilters.DateTimeOffsetFilter),
             Guard(IsNumericType, TypeFilters.NumericFilter),
             Guard(arg => arg == typeof (string), TypeFilters.StringFilter),
         };
@@ -133,9 +135,13 @@ public static bool IsNumericType(Type type)
             return false;
 
         }
-        public static bool IsDateType(Type type)
+        public static bool IsDateTimeType(Type type)
         {
-            return type == typeof(DateTime) || type == typeof(DateTimeOffset) || type == typeof(DateTime?) || type == typeof(DateTimeOffset?);
+            return type == typeof(DateTime) || type == typeof(DateTime?) ;
+        }
+        public static bool IsDateTimeOffsetType(Type type)
+        {
+            return  type == typeof(DateTimeOffset) ||   type == typeof(DateTimeOffset?);
         }
 
     }

Mvc.JQuery.Datatables/DynamicLinq/DynamicLinq.cs

@@ -676,9 +676,12 @@ interface IRelationalSignatures : IArithmeticSignatures
             void F(string x, string y);
             void F(char x, char y);
             void F(DateTime x, DateTime y);
+            void F(DateTimeOffset x, DateTimeOffset y);
+
             void F(TimeSpan x, TimeSpan y);
             void F(char? x, char? y);
             void F(DateTime? x, DateTime? y);
+            void F(DateTimeOffset? x, DateTimeOffset? y);
             void F(TimeSpan? x, TimeSpan? y);
         }
 

Mvc.JQuery.Datatables/TypeFilters.cs

@@ -58,7 +58,7 @@ public static string NumericFilter(string query, string columnname, Type columnT
             }
         }
 
-        public static string DateFilter(string query, string columnname, Type columnType, List<object> parametersForLinqQuery)
+        public static string DateTimeOffsetFilter(string query, string columnname, Type columnType, List<object> parametersForLinqQuery)
         {
             if (query.Contains("~"))
             {
@@ -69,7 +69,25 @@ public static string DateFilter(string query, string columnname, Type columnType
 
                 parametersForLinqQuery.Add(start);
                 parametersForLinqQuery.Add(end);
-                return string.Format("{0}.Ticks >= @{1}.Ticks and {0}.Ticks <= @{2}.Ticks", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);
+                return string.Format("{0} >= @{1} and {0} <= @{2}", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);
+            }
+            else
+            {
+                return string.Format("{1}.ToLocalTime().ToString(\"g\").{0}", FilterMethod(query), columnname);
+            }
+        }
+        public static string DateTimeFilter(string query, string columnname, Type columnType, List<object> parametersForLinqQuery)
+        {
+            if (query.Contains("~"))
+            {
+                var parts = query.Split('~');
+                DateTime start, end;
+                DateTime.TryParse(parts[0] ?? "", out start);
+                if (!DateTime.TryParse(parts[1] ?? "", out end)) end = DateTime.MaxValue;
+
+                parametersForLinqQuery.Add(start);
+                parametersForLinqQuery.Add(end);
+                return string.Format("{0} >= @{1} and {0} <= @{2}", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);
             }
             else
             {