Merge branch 'master' of https://github.com/mcintyre321/mvc.jquery.datatables

Author: mcintyre321

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

@@ -3,9 +3,11 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
+using System.Reflection;
 using System.Web;
 using System.Web.Mvc;
 using Mvc.JQuery.Datatables.Models;
+using Newtonsoft.Json.Linq;
 using Resources;
 
 namespace Mvc.JQuery.Datatables.Example.Controllers
@@ -80,10 +82,23 @@ public class UserView
         public string Position { get; set; }
 
         [DataTablesFilter(DataTablesFilterType.DateTimeRange)]
+        [DefaultToStartOfYear]
         public DateTime?  Hired { get; set; }
 
         public Numbers Number { get; set; }
 
+        [DataTablesExclude]
+        public string ThisColumnIsExcluded { get { return "asdf"; } }
+
 
     }
+
+    public class DefaultToStartOfYearAttribute : DataTablesAttributeBase
+    {
+        public override void ApplyTo(ColDef colDef, PropertyInfo pi)
+        {
+            colDef.SearchCols = colDef.SearchCols ?? new JObject();
+            colDef.SearchCols["sSearch"] = new DateTime(DateTime.Now.Year, 1, 1).ToString("g") + "~" + DateTimeOffset.Now.Date.AddDays(1).ToString("g");
+        }
+    }
 }

Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter

@@ -63,7 +63,12 @@
             {
                 options["oTableTools"] = new JRaw("{ 'sSwfPath': '//cdn.datatables.net/tabletools/2.2.1/swf/copy_csv_xls_pdf.swf' }");
             }
-            options["fnServerData"] = new JRaw(" function(sSource, aoData, fnCallback) { $.ajax({ 'dataType': 'json', 'type': 'POST', 'url': sSource, 'data': aoData, 'success': fnCallback })}");
+            options["fnServerData"] = new JRaw(
+                "function(sSource, aoData, fnCallback) { " + 
+                "    var ajaxOptions = { 'dataType': 'json', 'type': 'POST', 'url': sSource, 'data': aoData, 'success': fnCallback }; " +
+                (Model.AjaxErrorHandler == null ? "" : ("ajaxOptions['error'] = " + Model.AjaxErrorHandler) + "; ") +
+                "    $.ajax(ajaxOptions);" +
+                "}");
             options["aoColumnDefs"] = new JRaw(Model.ColumnDefsString);
             options["aoSearchCols"] = Model.SearchCols;
             if (Model.JsOptions.Any())
@@ -92,7 +97,7 @@
         
         @if (Model.GlobalJsVariableName != null)
         {
-            @Html.Raw("window['@Model.GlobalJsVariableName'] = dt;")
+            @Html.Raw("window['" + Model.GlobalJsVariableName + "'] = dt;")
         }
     })();
 </script>

Mvc.JQuery.Datatables.Templates/Views/Shared/DataTable.cshtml

@@ -32,6 +32,12 @@ public DataTableConfigVm(string id, string ajaxUrl, IEnumerable<ColDef> columns)
             this.ShowPageSizes = true;
             this.TableTools = true;
             ColumnFilterVm = new ColumnFilterSettingsVm(this);
+            AjaxErrorHandler = 
+                "function(jqXHR, textStatus, errorThrown)" + 
+                "{ " + 
+                    "window.alert('error loading data: ' + textStatus + ' - ' + errorThrown); " + 
+                    "console.log(arguments);" + 
+                "}";
         }
 
         public bool ShowSearch { get; set; }
@@ -105,11 +111,12 @@ public string ColumnSortingString
         public string DrawCallback { get; set; }
         public LengthMenuVm LengthMenu { get; set; }
         public int? PageLength { get; set; }
-        public string GlobalJsVariableName { get; private set; }
+        public string GlobalJsVariableName { get; set; }
 
         private bool _columnFilter;
 
         public bool FixedLayout { get; set; }
+        public string AjaxErrorHandler { get; set; }
 
         public class _FilterOn<TTarget>
         {

Mvc.JQuery.Datatables/DataTableConfigVm.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Mvc.JQuery.Datatables
+{
+    /// <summary>
+    /// Prevent a public property from being included as a column in a DataTable row model
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class DataTablesExcludeAttribute : Attribute
+    {
+        
+    }
+}

Mvc.JQuery.Datatables/DataTablesExcludeAttribute.cs

@@ -78,6 +78,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DataTablesExcludeAttribute.cs" />
     <Compile Include="DataTablesFiltering.cs" />
     <Compile Include="DataTablesFilterAttribute.cs" />
     <Compile Include="LengthMenuVm.cs" />

Mvc.JQuery.Datatables/Mvc.JQuery.Datatables.csproj

@@ -15,6 +15,7 @@ internal static DataTablesPropertyInfo[] Properties(Type type)
             return propertiesCache.GetOrAdd(type, t =>
             {
                 var infos = from pi in t.GetProperties()
+                            where pi.GetCustomAttribute<DataTablesExcludeAttribute>() == null
                             let attributes = (pi.GetCustomAttributes()).OfType<DataTablesAttributeBase>().ToArray()
                             orderby attributes.OfType<DataTablesAttribute>().Select(a => a.Order as int?).SingleOrDefault() ?? int.MaxValue
                             select new DataTablesPropertyInfo(pi, attributes);

Mvc.JQuery.Datatables/Reflection/DataTablesTypeInfo.cs

@@ -6,22 +6,22 @@ turn IQueryables into datagrids
 > Install-Package Mvc.JQuery.Datatables.Templates *
 
 
-[Demo site](http://mvcjquerydatatables.apphb.com/)
+[Demo site](http://aspdatatables.azurewebsites.net/)
 ![Example](http://snag.gy/FQFdn.jpg)
 
  - turn any IQueryable into a live datagrid. Tested with:
    - Linq To Objects
    - Entity Framework
    - Lucene.Net.Linq
  - wraps the very comprehensive jquery datatables plugin. Supported features: 
-   - Filtering (text, date range (with datepicker), number ranges, choose from dropdown, multiple values using checkboxes)
+   - Filtering (text, date or datetime range (with datepicker), number ranges, choose from dropdown, multiple values using checkboxes)
    - Sorting (configurable per column)
    - Paging (choose page size options, or fix them)
    - Customer column rendering 
    - Custom positioning of filters (e.g. you could move them above the table)
    - Localization
    - TableTools support (PDF/Excel export)
-   - Attribute based configuration (optional)
+   - Attribute based configuration (optional)   
  - Can be run from dll 
 
 *skip this if using EmbeddedResourceVirtualPathProvider