Skip to content

Commit bacfb46

Browse files
mcintyre321mcintyre321
committed
2 parents 5ae4675 + b197fb7 commit bacfb46

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1769
-1989
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter"]
2+
path = Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter
3+
url = https://github.com/mcintyre321/jquery-datatables-column-filter.git

‎.nuget/NuGet.exe‎

988 KB
Binary file not shown.

‎Mvc.JQuery.Datatables.Example/App_GlobalResources/UserViewResource.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Mvc.JQuery.Datatables.Example/Controllers/FakeDatabase.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public class User
5757

5858
public PositionTypes? Position { get; set; }
5959

60+
6061
public DateTime? Hired { get; set; }
6162

6263
public Numbers Number { get; set; }

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Linq;
66
using System.Web;
77
using System.Web.Mvc;
8+
using Mvc.JQuery.Datatables.Models;
89
using Resources;
910

1011
namespace Mvc.JQuery.Datatables.Example.Controllers
@@ -63,10 +64,10 @@ public class UserView
6364
[DataTables(SortDirection = SortDirection.Ascending, Order = 0)]
6465
public int Id { get; set; }
6566

66-
[DataTables(DisplayName = "E-Mail", Searchable = false)]
67+
[DataTables(DisplayName = "E-Mail", Searchable = true)]
6768
public string Email { get; set; }
6869

69-
[DataTables( Sortable = false)]
70+
[DataTables( Sortable = false, Width = "70px")]
7071
public bool IsAdmin { get; set; }
7172

7273
[DataTables(Visible = false)]
@@ -77,6 +78,8 @@ public class UserView
7778
public decimal Salary { get; set; }
7879

7980
public string Position { get; set; }
81+
82+
[DataTablesFilter(DataTablesFilterType.DateTimeRange)]
8083
public DateTime? Hired { get; set; }
8184

8285
public Numbers Number { get; set; }

‎Mvc.JQuery.Datatables.Example/Mvc.JQuery.Datatables.Example.csproj‎

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</ProductVersion>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{476D3266-8699-4E89-A528-646C1235EEB1}</ProjectGuid>
11-
<ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
11+
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
1212
<OutputType>Library</OutputType>
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Mvc.JQuery.Datatables.Example</RootNamespace>
1515
<AssemblyName>Mvc.JQuery.Datatables.Example</AssemblyName>
16-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1717
<MvcBuildViews>false</MvcBuildViews>
1818
<UseIISExpress>false</UseIISExpress>
1919
<FileUpgradeFlags>
@@ -28,6 +28,7 @@
2828
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2929
<RestorePackages>true</RestorePackages>
3030
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
31+
<TargetFrameworkProfile />
3132
</PropertyGroup>
3233
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3334
<DebugSymbols>true</DebugSymbols>
@@ -37,6 +38,7 @@
3738
<DefineConstants>DEBUG;TRACE</DefineConstants>
3839
<ErrorReport>prompt</ErrorReport>
3940
<WarningLevel>4</WarningLevel>
41+
<Prefer32Bit>false</Prefer32Bit>
4042
</PropertyGroup>
4143
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4244
<DebugType>pdbonly</DebugType>
@@ -45,19 +47,28 @@
4547
<DefineConstants>TRACE</DefineConstants>
4648
<ErrorReport>prompt</ErrorReport>
4749
<WarningLevel>4</WarningLevel>
50+
<Prefer32Bit>false</Prefer32Bit>
4851
</PropertyGroup>
4952
<ItemGroup>
50-
<Reference Include="EmbeddedResourceVirtualPathProvider">
51-
<HintPath>..\packages\EmbeddedResourceVirtualPathProvider.1.2.5\lib\net40\EmbeddedResourceVirtualPathProvider.dll</HintPath>
53+
<Reference Include="EmbeddedResourceVirtualPathProvider, Version=1.0.5165.34913, Culture=neutral, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
55+
<HintPath>..\packages\EmbeddedResourceVirtualPathProvider.1.2.22\lib\net40\EmbeddedResourceVirtualPathProvider.dll</HintPath>
56+
</Reference>
57+
<Reference Include="EntityFramework">
58+
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
59+
</Reference>
60+
<Reference Include="EntityFramework.SqlServer">
61+
<HintPath>..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
5262
</Reference>
5363
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5464
<Private>True</Private>
5565
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5666
</Reference>
57-
<Reference Include="System.Data.Entity" />
58-
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
59-
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
60-
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
67+
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
69+
</Reference>
70+
<Reference Include="System.Data.DataSetExtensions" />
71+
<Reference Include="System.Web.Extensions" />
6172
<Reference Include="Microsoft.CSharp" />
6273
<Reference Include="System" />
6374
<Reference Include="System.Data" />
@@ -66,17 +77,38 @@
6677
<Reference Include="System.Web.Entity" />
6778
<Reference Include="System.Web.ApplicationServices" />
6879
<Reference Include="System.ComponentModel.DataAnnotations" />
69-
<Reference Include="System.Core" />
70-
<Reference Include="System.Data.DataSetExtensions" />
71-
<Reference Include="System.Xml.Linq" />
7280
<Reference Include="System.Web" />
73-
<Reference Include="System.Web.Extensions" />
7481
<Reference Include="System.Web.Abstractions" />
82+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<SpecificVersion>False</SpecificVersion>
84+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.0\lib\net45\System.Web.Helpers.dll</HintPath>
85+
</Reference>
86+
<Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<SpecificVersion>False</SpecificVersion>
88+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.1.0\lib\net45\System.Web.Mvc.dll</HintPath>
89+
</Reference>
90+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91+
<SpecificVersion>False</SpecificVersion>
92+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.1.0\lib\net45\System.Web.Razor.dll</HintPath>
93+
</Reference>
7594
<Reference Include="System.Web.Routing" />
95+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
96+
<SpecificVersion>False</SpecificVersion>
97+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.0\lib\net45\System.Web.WebPages.dll</HintPath>
98+
</Reference>
99+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
100+
<SpecificVersion>False</SpecificVersion>
101+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
102+
</Reference>
103+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
104+
<SpecificVersion>False</SpecificVersion>
105+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.1.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
106+
</Reference>
76107
<Reference Include="System.Xml" />
77108
<Reference Include="System.Configuration" />
78109
<Reference Include="System.Web.Services" />
79110
<Reference Include="System.EnterpriseServices" />
111+
<Reference Include="System.Xml.Linq" />
80112
</ItemGroup>
81113
<ItemGroup>
82114
<Content Include="App_Code\RegisterVirtualPathProvider.cs" />

‎Mvc.JQuery.Datatables.Example/Scripts/QUnitTests.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
equal($dtHead.find('input').filter(".hasDatepicker").length, 2, "2 datepicker elements are expected");
180180
equal($dtHead.find('select').length, 2, "2 select elements are expected");
181181
ok($dtHead.find('button').length, "a button element is expected");
182-
ok(getRowCount$Select().length == 1, "select element found which denotes number of records to retrieve from server")
182+
equal(getRowCount$Select().length, 1, "single select element found which denotes number of records to retrieve from server")
183183
});
184184

185185
asyncTest("data sent to and returned from server is OK", function (assert) {
@@ -216,7 +216,7 @@
216216
});
217217
assert.isNumeric(tableIds, "first column of table contains only numeric text");
218218
deepEqual(tableIds, listIds, "JSON translated to table");
219-
ok(getRowCount$Select().val() == tableIds.length, "number of rows returned corresponds to number of entries selected")
219+
equal(getRowCount$Select().val(), tableIds.length, "number of rows returned corresponds to number of entries selected")
220220
start();
221221
}
222222
});

‎Mvc.JQuery.Datatables.Example/Views/Home/_ExampleTable.cshtml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@
1010
<script type="text/javascript" src="//cdn.datatables.net/tabletools/2.2.1/js/dataTables.tableTools.min.js"></script>
1111
<link rel="stylesheet" href="//cdn.datatables.net/tabletools/2.2.1/css/dataTables.tableTools.css" />
1212

13-
<script type="text/javascript" src="/Content/jquery.dataTables.columnFilter.js"></script>
13+
<script type="text/javascript" src="/Content/jquery-datatables-column-filter/jquery-ui-timepicker-addon.js"></script>
14+
<link rel="stylesheet" href="/Content/jquery-datatables-column-filter/jquery-ui-timepicker-addon.css" />
1415

16+
<link rel="stylesheet" href="/Content/jquery-datatables-column-filter/media/js/jquery.dataTables.columnFilter.css" />
17+
<script type="text/javascript" src="/Content/jquery-datatables-column-filter/media/js/jquery.dataTables.columnFilter.js"></script>
1518

19+
<link rel="stylesheet" href="//cdn.datatables.net/colvis/1.1.1/css/dataTables.colVis.css" />
20+
<script type="text/javascript" src="//cdn.datatables.net/colvis/1.1.1/js/dataTables.colVis.min.js"></script>
1621

1722
@{
1823
var vm = Html.DataTableVm("table-id", (HomeController h) => h.GetUsers(null));
@@ -24,13 +29,18 @@
2429
}"));
2530
vm.ColumnFilter = true;
2631
vm
27-
.FilterOn("Position", new { sSelector = "#custom-filter-placeholder-position" }).Select("Engineer", "Tester", "Manager")
32+
.FilterOn("Position", new { sSelector = "#custom-filter-placeholder-position" }, new { sSearch = "Tester" }).Select("Engineer", "Tester", "Manager")
2833
.FilterOn("Id").NumberRange()
2934
.FilterOn("Salary", new { sSelector = "#custom-filter-placeholder-salary" }).NumberRange();
3035
//.FilterOn("Number").CheckBoxes(Enum.GetNames(typeof(Numbers)));
3136
vm.StateSave = true;
3237
//vm.DrawCallback = "drawCallback";
33-
38+
39+
//you can change the page length options...
40+
vm.LengthMenu = LengthMenuVm.Default();
41+
vm.LengthMenu.RemoveAll(t => t.Item2 == 5);
42+
vm.PageLength = 25; //... and set a default
43+
vm.ColVis = true;
3444
if (Request.QueryString["lang"] == "de")
3545
{
3646
//vm.Language = "{ 'sUrl': '" + Url.Content("~/Content/jquery.dataTables.lang.de-DE.txt") + "' }";

‎Mvc.JQuery.Datatables.Example/Views/Shared/_Layout.cshtml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<meta charset="utf-8" />
55
<title>@ViewBag.Title</title>
66
<script src="@Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")" type="text/javascript"></script>
7-
<link href="@Url.Content("~/Content/bootstrap.min.css")" rel="stylesheet" type="text/css"/>
8-
<link href="@Url.Content("~/Content/bootstrap-overrides.css")" rel="stylesheet" type="text/css"/>
97
<script src="@Url.Content("~/Scripts/jquery-1.11.0.min.js")" type="text/javascript"></script>
108
<script src="@Url.Content("~/Scripts/jquery-ui-1.10.3.min.js")" type="text/javascript"></script>
119
<link href="/Content/themes/Aristo/jquery-ui-1.8.7.custom.css" type="text/css" rel="stylesheet" />
@@ -60,5 +58,8 @@
6058
</div>
6159
<footer>
6260
</footer>
61+
<link href="@Url.Content("~/Content/bootstrap.min.css")" rel="stylesheet" type="text/css" />
62+
<link href="@Url.Content("~/Content/bootstrap-overrides.css")" rel="stylesheet" type="text/css" />
63+
6364
</body>
6465
</html>

‎Mvc.JQuery.Datatables.Example/Views/Web.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<configuration>
44
<configSections>
55
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6-
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7-
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
6+
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
7+
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
88
</sectionGroup>
99
</configSections>
1010

0 commit comments

Comments
 (0)