Date fixes

mcintyre321 · mcintyre321 · commit a406ea07c7f5 · 2016-04-30T08:48:16.000+01:00
diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
@@ -163,12 +163,20 @@
             </site>
             <site name="Mvc.JQuery.Datatables.Example" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="C:\Users\Harry\Dropbox\stuff\Mvc.JQuery.DataTables2\Mvc.JQuery.DataTables.Example" />
+                    <virtualDirectory path="/" physicalPath="C:\Users\Harry\Dropbox\stuff\Mvc.JQuery.DataTables\Mvc.JQuery.DataTables.Example" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:53281:localhost" />
                 </bindings>
             </site>
+            <site name="Mvc.JQuery.DataTables.Example(1)" id="3">
+                <application path="/" applicationPool="Clr4IntegratedAppPool">
+                    <virtualDirectory path="/" physicalPath="C:\Users\Harry\Dropbox\stuff\Mvc.JQuery.DataTables\Mvc.JQuery.DataTables.Example" />
+                </application>
+                <bindings>
+                    <binding protocol="http" bindingInformation="*:53282:localhost" />
+                </bindings>
+            </site>
             <siteDefaults>
                 <logFile logFormat="W3C" directory="%IIS_USER_HOME%\Logs" />
                 <traceFailedRequestsLogging directory="%IIS_USER_HOME%\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" />
diff --git a/Mvc.JQuery.Datatables.Core/Processing/TypeFilters.cs b/Mvc.JQuery.Datatables.Core/Processing/TypeFilters.cs
@@ -127,15 +127,18 @@ public static string DateTimeOffsetFilter(string query, string columnname, DataT
                 DateTimeOffset dateTime;
                 if (DateTimeOffset.TryParse(query, out dateTime))
                 {
-                    dateTime = dateTime.ToUniversalTime();
                     if (dateTime.Date == dateTime)
                     {
+                        dateTime = dateTime.ToUniversalTime();
+
                         parametersForLinqQuery.Add(dateTime);
                         parametersForLinqQuery.Add(dateTime.AddDays(1));
                         filterString = string.Format("{0} >= @{1} and {0} < @{2}", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);
                     }
                     else
                     {
+                        dateTime = dateTime.ToUniversalTime();
+
                         filterString = string.Format("{0} == @" + parametersForLinqQuery.Count, columnname);
                         parametersForLinqQuery.Add(dateTime);
                     }
@@ -174,15 +177,16 @@ public static string DateTimeFilter(string query, string columnname, DataTablesP
                 DateTime dateTime;
                 if (DateTime.TryParse(query, out dateTime))
                 {
-                    dateTime = dateTime.ToUniversalTime();
                     if (dateTime.Date == dateTime)
                     {
+                        dateTime = dateTime.ToUniversalTime();
                         parametersForLinqQuery.Add(dateTime);
                         parametersForLinqQuery.Add(dateTime.AddDays(1));
-                        filterString = string.Format("{0} >= @{1} and {0} < @{2}", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);
+                        filterString = string.Format("({0} >= @{1} and {0} < @{2})", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);
                     }
                     else
                     {
+                        dateTime = dateTime.ToUniversalTime();
                         filterString = string.Format("{0} == @" + parametersForLinqQuery.Count, columnname);
                         parametersForLinqQuery.Add(dateTime);
                     }
diff --git a/Mvc.JQuery.Datatables.Example/Controllers/FakeDatabase.cs b/Mvc.JQuery.Datatables.Example/Controllers/FakeDatabase.cs
@@ -22,7 +22,7 @@ static FakeDatabase()
                 Position = positions[i%positions.Count],
                 IsAdmin = i%11 == 0,
                 Number = (Numbers) r.Next(4),
-                Hired = i % 8 == 0 ? null as DateTime? : DateTime.UtcNow.AddDays(-1*365*3* r.NextDouble()),
+                Hired = i % 8 == 0 ? null as DateTime? : DateTime.UtcNow.AddDays(-1*365*3* r.NextDouble()).AddHours(9).AddHours(r.Next(9)),
                 Salary =
                     10000 + (DateTime.UtcNow.Minute*1000) +
                     (DateTime.UtcNow.Second*100) +
diff --git a/Mvc.JQuery.Datatables.Example/Controllers/HomeController.cs b/Mvc.JQuery.Datatables.Example/Controllers/HomeController.cs
@@ -21,9 +21,9 @@ public ActionResult JSUnitTests()
             return View();
         }
 
-        public DataTablesResult<UserView> GetUsers(DataTablesParam dataTableParam)
+        public DataTablesResult<UserTableRowViewModel> GetUsers(DataTablesParam dataTableParam)
         {
-            return DataTablesResult.Create(FakeDatabase.Users.Select(user => new UserView()
+            return DataTablesResult.Create(FakeDatabase.Users.Select(user => new UserTableRowViewModel()
             {
                 Id = user.Id,
                 Name = user.Name,
@@ -35,11 +35,11 @@ public DataTablesResult<UserView> GetUsers(DataTablesParam dataTableParam)
                 Salary = user.Salary,
                 Thumb = "https://randomuser.me/api/portraits/thumb/men/" + user.Id + ".jpg"
             }), dataTableParam,
-            uv => new 
+            rowViewModel => new 
             {
-                Name = "<b>" + uv.Name + "</b>",
-                Hired = uv.Hired == null ? "&lt;pending&gt;" : uv.Hired.Value.ToShortDateString() + " (" + FriendlyDateHelper.GetPrettyDate(uv.Hired.Value) + ") ",
-                Thumb = "<img src='" + uv.Thumb + "' />"
+                Name = "<b>" + rowViewModel.Name + "</b>",
+                Hired = rowViewModel.Hired == null ? "&lt;pending&gt;" : rowViewModel.Hired.Value.ToShortDateString() + " " + rowViewModel.Hired.Value.ToShortTimeString() + " (" + FriendlyDateHelper.GetPrettyDate(rowViewModel.Hired.Value) + ") ",
+                Thumb = "<img src='" + rowViewModel.Thumb + "' />"
             });
         }
 
@@ -56,7 +56,7 @@ public DataTablesResult<UserView> GetUsers(DataTablesParam dataTableParam)
 
    
 
-    public class UserView
+    public class UserTableRowViewModel
     {
        
         [DataTables(DisplayName = "Name", DisplayNameResourceType = typeof(UserViewResource), MRenderFunction = "encloseInEmTag")]
diff --git a/Mvc.JQuery.Datatables.Example/Mvc.JQuery.Datatables.Example.csproj b/Mvc.JQuery.Datatables.Example/Mvc.JQuery.Datatables.Example.csproj
@@ -15,7 +15,7 @@
     <AssemblyName>Mvc.JQuery.DataTables.Example</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>false</UseIISExpress>
+    <UseIISExpress>true</UseIISExpress>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -697,12 +697,11 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>False</UseIIS>
+          <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>53281</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl>http://localhost:53282/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/Mvc.JQuery.Datatables.Example/Views/Home/Index.cshtml b/Mvc.JQuery.Datatables.Example/Views/Home/Index.cshtml
@@ -10,34 +10,52 @@
 Nuget install-package Mvc.JQuery.DataTables
     
 Nuget install-package <a href="https://github.com/mcintyre321/EmbeddedResourceVirtualPathProvider">EmbeddedResourceVirtualPathProvider</a> <i>or</i> Nuget install-package Mvc.JQuery.DataTables.Templates
-
 </pre>
 <p>
-    Create a controller (see <a style="color: dodgerblue;" href="https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/Mvc.JQuery.DataTables.Example/Controllers/HomeController.cs">example</a>)
+    Create a controller (see <a style="color: dodgerblue;" href="https://github.com/mcintyre321/mvc.jquery.datatables/tree/master/Mvc.JQuery.DataTables.Example/Controllers/HomeController.cs">example</a>)
 </p>
 <pre class="highlight">
 public class SomeController : Controller 
 {
     ...
-    public DataTablesResult&lt;UserView> GetUsers(DataTablesParam dataTableParam)
+    public DataTablesResult&lt;UserTableRowViewModel> GetUsers(DataTablesParam dataTableParam)
     {
         IQueryable&lt;User> users = ... //take a queryable from your database...
-        var userViews = users.Select(u => new UserView(u)); //...transform it into a view object ...
+        var userViews = users.Select(u => new UserTableRowViewModel(u)); //...transform it into a view object ...
         return DataTablesResult.Create(userViews, dataTableParam)  //...and return a DataTablesResult
     }
+
+
 }
 </pre>
 
 <p>
-    and render the partial (see <a href="https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/Mvc.JQuery.DataTables.Example/Views/Home/Index.cshtml">example</a>)
+    and render the partial (see <a href="https://github.com/mcintyre321/mvc.jquery.datatables/tree/master/Mvc.JQuery.DataTables.Example/Views/Home/Index.cshtml">example</a>)
 
     <pre class="highlight">
-        //include these scripts
-        &lt;link type="text/css" href="@@Url.Content("~/Content/DataTables-1.8.2/media/css/demo_table.css")" rel="stylesheet"/>
-        &lt;script src="@@Url.Content("~/Scripts/DataTables-1.8.2/media/js/jquery.dataTables.js")" type="text/javascript">&lt;/script>
-
-        @@Html.Partial("DataTable", Html.DataTableVm("table-id", (HomeController h) => h.GetUsers(null)))
+        //include these scripts to use standard features
+        &lt;script type="text/javascript" src="//cdn.datatables.net/1.10.0/js/jquery.dataTables.js">&lt;/script>
+        &lt;link rel="stylesheet" href="//cdn.datatables.net/1.10.0/css/jquery.dataTables.css" />
+        
+        //These ones if you want to use the column filters
+        &lt;link rel="stylesheet" href="/Content/jquery-datatables-column-filter/media/js/jquery.dataTables.columnFilter.css" />
+        &lt;script type="text/javascript" src="/Content/jquery-datatables-column-filter/media/js/jquery.dataTables.columnFilter.js">&lt;/script>
+        //And these if you want date time pickers in the filters
+        &lt;script type="text/javascript" src="/Content/jquery-datatables-column-filter/jquery-ui-timepicker-addon.js">&lt;/script>
+        &lt;link rel="stylesheet" href="/Content/jquery-datatables-column-filter/jquery-ui-timepicker-addon.css" />
+        
+        //and these if you want to use  TableTools (export buttons)
+        &lt;script type="text/javascript" src="//cdn.datatables.net/tabletools/2.2.1/js/dataTables.tableTools.min.js">&lt;/script>
+        &lt;link rel="stylesheet" href="//cdn.datatables.net/tabletools/2.2.1/css/dataTables.tableTools.css" />
+        
+        //And these if you want to use column visibility
+        &lt;link rel="stylesheet" href="//cdn.datatables.net/colvis/1.1.1/css/dataTables.colVis.css" />
+        &lt;script type="text/javascript" src="//cdn.datatables.net/colvis/1.1.1/js/dataTables.colVis.min.js">&lt;/script>
+        
+        var dataTablesConfigVm = dataTablesConfigVmHtml.DataTableVm("table-id", (HomeController h) => h.GetUsers(null))
+        //set options on the config here, see <a href="https://github.com/mcintyre321/mvc.jquery.datatables/tree/master/Mvc.JQuery.Datatables.Example/Views/Home/_ExampleTable.cshtml">example here</a>
 
+        @@Html.Partial("DataTable", dataTablesConfigVm)
     </pre>
 </p>
 
diff --git a/Mvc.JQuery.Datatables.Example/Views/Home/_ExampleTable.cshtml b/Mvc.JQuery.Datatables.Example/Views/Home/_ExampleTable.cshtml
@@ -4,6 +4,7 @@
 @using Mvc.JQuery.DataTables.Serialization
 @using Mvc.JQuery.DataTables
 
+<script type="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/highlight.min.js" language="javascript"></script>
 
 <script type="text/javascript" src="//cdn.datatables.net/1.10.0/js/jquery.dataTables.js"></script>
 <link rel="stylesheet" href="//cdn.datatables.net/1.10.0/css/jquery.dataTables.css" />
diff --git a/Mvc.JQuery.Datatables/DataTablesResult.cs b/Mvc.JQuery.Datatables/DataTablesResult.cs
@@ -14,26 +14,15 @@ namespace Mvc.JQuery.DataTables
     public abstract class DataTablesResult : ActionResult
     {
         /// <typeparam name="TSource"></typeparam>
-        /// <typeparam name="TTransform"></typeparam>
-        /// <param name="q">A queryable for the data. The properties of this can be marked up with [DataTablesAttribute] to control sorting/searchability/visibility</param>
-        /// <param name="dataTableParam"></param>
-        /// <returns></returns>
-
-        public static DataTablesResult<TSource> Create<TSource>(IQueryable<TSource> q, DataTablesParam dataTableParam,
-            ArrayOutputType? arrayOutput = null)
-        {
-            return Create(q, dataTableParam, new ResponseOptions<TSource>() { ArrayOutputType = arrayOutput });
-        }
-
-        /// <typeparam name="TSource"></typeparam>
-        /// <typeparam name="TTransform"></typeparam>
         /// <param name="q">A queryable for the data. The properties of this can be marked up with [DataTablesAttribute] to control sorting/searchability/visibility</param>
         /// <param name="dataTableParam"></param>
         /// <param name="transform">//a transform for custom column rendering e.g. to do a custom date row => new { CreatedDate = row.CreatedDate.ToString("dd MM yy") } </param>
+        /// <param name="responseOptions"></param>
         /// <returns></returns>
-        public static DataTablesResult<TSource> Create<TSource, TTransform>(IQueryable<TSource> q, DataTablesParam dataTableParam,
-            Func<TSource, TTransform> transform, ResponseOptions<TSource> responseOptions = null)
+        public static DataTablesResult<TSource> Create<TSource>(IQueryable<TSource> q, DataTablesParam dataTableParam,
+            Func<TSource, object> transform, ResponseOptions<TSource> responseOptions = null)
         {
+            transform = transform ?? (s => s);
             var result = new DataTablesResult<TSource>(q, dataTableParam);
 
             result.Data = result.Data
@@ -81,30 +70,13 @@ private static DataTablesResponseData ApplyOutputRules<TSource>(DataTablesRespon
 
         /// <param name="transform">Should be a Func<T, TTransform></param>
         public static DataTablesResult Create(IQueryable queryable, DataTablesParam dataTableParam, object transform,
-            ArrayOutputType? arrayOutput = null)
-        {
-            var s = "Create";
-            var openCreateMethod = typeof(DataTablesResult).GetMethods().Single(x => x.Name == s && x.GetGenericArguments().Count() == 2);
-            var queryableType = queryable.GetType().GetGenericArguments()[0];
-            var transformType = transform.GetType().GetGenericArguments()[1];
-            var closedCreateMethod = openCreateMethod.MakeGenericMethod(queryableType, transformType);
-            return (DataTablesResult)closedCreateMethod.Invoke(null, new object[] { queryable, dataTableParam, transform, arrayOutput });
-        }
-
-        public static DataTablesResult Create(IQueryable queryable, DataTablesParam dataTableParam,
-            ArrayOutputType? arrayOutput = null)
+            ResponseOptions responseOptions = null)
         {
             var s = "Create";
             var openCreateMethod = typeof(DataTablesResult).GetMethods().Single(x => x.Name == s && x.GetGenericArguments().Count() == 1);
             var queryableType = queryable.GetType().GetGenericArguments()[0];
-            var closedCreateMethod = openCreateMethod.MakeGenericMethod(queryableType);
-            return (DataTablesResult)closedCreateMethod.Invoke(null, new object[] { queryable, dataTableParam, arrayOutput });
-        }
-
-        public static DataTablesResult<T> CreateResultUsingEnumerable<T>(IEnumerable<T> q, DataTablesParam dataTableParam,
-            ArrayOutputType? arrayOutput = null)
-        {
-            return Create(q.AsQueryable(), dataTableParam, arrayOutput);
+            var closedCreateMethod = openCreateMethod.MakeGenericMethod(queryableType, typeof(object));
+            return (DataTablesResult)closedCreateMethod.Invoke(null, new object[] { queryable, dataTableParam, transform, responseOptions });
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -127,15 +127,18 @@ public static string DateTimeOffsetFilter(string query, string columnname, DataT`
`127`	`127`	`DateTimeOffset dateTime;`
`128`	`128`	`if (DateTimeOffset.TryParse(query, out dateTime))`
`129`	`129`	`{`
`130`		`- dateTime = dateTime.ToUniversalTime();`
`131`	`130`	`if (dateTime.Date == dateTime)`
`132`	`131`	`{`
	`132`	`+ dateTime = dateTime.ToUniversalTime();`
	`133`	`+`
`133`	`134`	`parametersForLinqQuery.Add(dateTime);`
`134`	`135`	`parametersForLinqQuery.Add(dateTime.AddDays(1));`
`135`	`136`	`filterString = string.Format("{0} >= @{1} and {0} < @{2}", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);`
`136`	`137`	`}`
`137`	`138`	`else`
`138`	`139`	`{`
	`140`	`+ dateTime = dateTime.ToUniversalTime();`
	`141`	`+`
`139`	`142`	`filterString = string.Format("{0} == @" + parametersForLinqQuery.Count, columnname);`
`140`	`143`	`parametersForLinqQuery.Add(dateTime);`
`141`	`144`	`}`
`@@ -174,15 +177,16 @@ public static string DateTimeFilter(string query, string columnname, DataTablesP`
`174`	`177`	`DateTime dateTime;`
`175`	`178`	`if (DateTime.TryParse(query, out dateTime))`
`176`	`179`	`{`
`177`		`- dateTime = dateTime.ToUniversalTime();`
`178`	`180`	`if (dateTime.Date == dateTime)`
`179`	`181`	`{`
	`182`	`+ dateTime = dateTime.ToUniversalTime();`
`180`	`183`	`parametersForLinqQuery.Add(dateTime);`
`181`	`184`	`parametersForLinqQuery.Add(dateTime.AddDays(1));`
`182`		`- filterString = string.Format("{0} >= @{1} and {0} < @{2}", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);`
	`185`	`+ filterString = string.Format("({0} >= @{1} and {0} < @{2})", columnname, parametersForLinqQuery.Count - 2, parametersForLinqQuery.Count - 1);`
`183`	`186`	`}`
`184`	`187`	`else`
`185`	`188`	`{`
	`189`	`+ dateTime = dateTime.ToUniversalTime();`
`186`	`190`	`filterString = string.Format("{0} == @" + parametersForLinqQuery.Count, columnname);`
`187`	`191`	`parametersForLinqQuery.Add(dateTime);`
`188`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ public ActionResult JSUnitTests()`
`21`	`21`	`return View();`
`22`	`22`	`}`
`23`	`23`
`24`		`- public DataTablesResult<UserView> GetUsers(DataTablesParam dataTableParam)`
	`24`	`+ public DataTablesResult<UserTableRowViewModel> GetUsers(DataTablesParam dataTableParam)`
`25`	`25`	`{`
`26`		`- return DataTablesResult.Create(FakeDatabase.Users.Select(user => new UserView()`
	`26`	`+ return DataTablesResult.Create(FakeDatabase.Users.Select(user => new UserTableRowViewModel()`
`27`	`27`	`{`
`28`	`28`	`Id = user.Id,`
`29`	`29`	`Name = user.Name,`
`@@ -35,11 +35,11 @@ public DataTablesResult<UserView> GetUsers(DataTablesParam dataTableParam)`
`35`	`35`	`Salary = user.Salary,`
`36`	`36`	`Thumb = "https://randomuser.me/api/portraits/thumb/men/" + user.Id + ".jpg"`
`37`	`37`	`}), dataTableParam,`
`38`		`- uv => new`
	`38`	`+ rowViewModel => new`
`39`	`39`	`{`
`40`		`- Name = "<b>" + uv.Name + "</b>",`
`41`		`- Hired = uv.Hired == null ? "<pending>" : uv.Hired.Value.ToShortDateString() + " (" + FriendlyDateHelper.GetPrettyDate(uv.Hired.Value) + ") ",`
`42`		`- Thumb = "<img src='" + uv.Thumb + "' />"`
	`40`	`+ Name = "<b>" + rowViewModel.Name + "</b>",`
	`41`	`+ Hired = rowViewModel.Hired == null ? "<pending>" : rowViewModel.Hired.Value.ToShortDateString() + " " + rowViewModel.Hired.Value.ToShortTimeString() + " (" + FriendlyDateHelper.GetPrettyDate(rowViewModel.Hired.Value) + ") ",`
	`42`	`+ Thumb = "<img src='" + rowViewModel.Thumb + "' />"`
`43`	`43`	`});`
`44`	`44`	`}`
`45`	`45`
`@@ -56,7 +56,7 @@ public DataTablesResult<UserView> GetUsers(DataTablesParam dataTableParam)`
`56`	`56`
`57`	`57`
`58`	`58`
`59`		`- public class UserView`
	`59`	`+ public class UserTableRowViewModel`
`60`	`60`	`{`
`61`	`61`
`62`	`62`	`[DataTables(DisplayName = "Name", DisplayNameResourceType = typeof(UserViewResource), MRenderFunction = "encloseInEmTag")]`