Fix issue with Date and filters

unosquare · Jul 20, 2015 · 5247dda · 5247dda
1 parent 5393ff8
commit 5247dda
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/Unosquare.Tubular/Extensions.cs b/Unosquare.Tubular/Extensions.cs
@@ -148,23 +148,6 @@ public static GridDataResponse CreateGridDataResponse(this GridDataRequest reque
             return response;
         }
 
-        // TODO: This code is for use with Dynamic LINQ, but It needs EF
-        //private static bool isDynamicLinqReady = false;
-
-        //private static void FixDynamicLinq()
-        //{
-        //    var type = typeof(DynamicQueryable).Assembly.GetType("System.Linq.Dynamic.ExpressionParser");
-
-        //    FieldInfo field = type.GetField("predefinedTypes", BindingFlags.Static | BindingFlags.NonPublic);
-
-        //    Type[] predefinedTypes = (Type[])field.GetValue(null);
-
-        //    Array.Resize(ref predefinedTypes, predefinedTypes.Length + 1);
-        //    predefinedTypes[predefinedTypes.Length - 1] = typeof(EntityFunctions); // Your type
-
-        //    field.SetValue(null, predefinedTypes);
-        //}
-
         private static string GetSqlOperator(CompareOperators op)
         {
             switch (op)
@@ -217,11 +200,21 @@ private static IQueryable FilterResponse(GridDataRequest request, IQueryable sub
                     case CompareOperators.NotEquals:
                         if (String.IsNullOrWhiteSpace(column.Filter.Text)) continue;
 
-                        // TODO: This code is for use with Dynamic LINQ, but It needs EF
-                        //if (column.DataType == DataType.Date.ToString().ToLower())
-                        //    searchLambda.AppendFormat("EntityFunctions.TruncateTime({0}) == @{1} &&", column.Name, searchParamArgs.Count);
-                        //else
-                        searchLambda.AppendFormat("{0} {2} @{1} &&", column.Name, searchParamArgs.Count, GetSqlOperator(column.Filter.Operator));
+                        if (column.DataType == DataType.Date.ToString().ToLower())
+                        {
+                            if (column.Filter.Operator == CompareOperators.Equals)
+                            {
+                                searchLambda.AppendFormat("({0} >= @{1} && {0} <= @{2}) &&", column.Name, searchParamArgs.Count, searchParamArgs.Count + 1);
+                            }
+                            else
+                            {
+                                searchLambda.AppendFormat("({0} < @{1} || {0} > @{2}) &&", column.Name, searchParamArgs.Count, searchParamArgs.Count + 1);
+                            }
+                        }
+                        else
+                        {
+                            searchLambda.AppendFormat("{0} {2} @{1} &&", column.Name, searchParamArgs.Count, GetSqlOperator(column.Filter.Operator));
+                        }
 
                         if (String.Equals(column.DataType, DataType.Numeric.ToString(),
                             StringComparison.CurrentCultureIgnoreCase))
@@ -230,12 +223,19 @@ private static IQueryable FilterResponse(GridDataRequest request, IQueryable sub
                         }
                         else if (
                             String.Equals(column.DataType, DataType.DateTime.ToString(),
-                                StringComparison.CurrentCultureIgnoreCase) ||
-                            String.Equals(column.DataType, DataType.Date.ToString(), StringComparison.CurrentCultureIgnoreCase))
+                                StringComparison.CurrentCultureIgnoreCase))
                         {
                             searchParamArgs.Add(DateTime.Parse(column.Filter.Text));
                         }
-                        else if (String.Equals(column.DataType, DataType.Boolean.ToString(), StringComparison.CurrentCultureIgnoreCase))
+                        else if (
+                            String.Equals(column.DataType, DataType.Date.ToString(),
+                                StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            searchParamArgs.Add(DateTime.Parse(column.Filter.Text).Date);
+                            searchParamArgs.Add(DateTime.Parse(column.Filter.Text).Date.AddDays(1).AddMinutes(-1));
+                        }
+                        else if (String.Equals(column.DataType, DataType.Boolean.ToString(),
+                            StringComparison.CurrentCultureIgnoreCase))
                         {
                             searchParamArgs.Add(Boolean.Parse(column.Filter.Text));
                         }

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "tubular",
-    "version": "0.9.20",
+    "version": "0.9.21",
     "description": "A set of AngularJS directives and designed to rapidly build modern web applications.",
     "homepage": "http://unosquare.github.io/tubular",
     "repository": {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tubular",
   "filename": "tubular-bundle.min.js",
-  "version": "0.9.20",
+  "version": "0.9.21",
   "description": "A set of AngularJS directives and designed to rapidly build modern web applications.",
   "repository": {
     "type": "git",