Skip to content

Updating the filtering logic and the Custom Widget #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HarvestingClouds wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updating the filtering logic and the Custom Widget #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 40 additions & 6 deletions GridMvc.Site/Scripts/gridmvc.customwidgets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*
* For more documentation see: http://gridmvc.codeplex.com/documentation
*/
//Updated by Aman Sharma (http://HarvestingClouds.com)

/***
* CustomersFilterWidget - Provides filter user interface for customer name column in this project
Expand Down Expand Up @@ -58,8 +59,10 @@ function CustomersFilterWidget() {
this.renderWidget = function () {
var html = '<p><i>This is custom filter widget demo.</i></p>\
<p>Select customer to filter:</p>\
<select style="width:250px;" class="grid-filter-type customerslist form-control">\
</select>';
<div id="cutomerlistDivID" style="width:250px;height:250px;overflow-y:auto;" class="grid-filter-type customerslist form-control"></div><br />\
<div class="grid-filter-buttons">\
<button type="button" class="btn btn-primary grid-apply" >' + this.lang.applyFilterButtonText + '</button>\
</div>';
this.container.append(html);
};
/***
Expand All @@ -77,7 +80,7 @@ function CustomersFilterWidget() {
this.fillCustomers = function (items) {
var customerList = this.container.find(".customerslist");
for (var i = 0; i < items.length; i++) {
customerList.append('<option ' + (items[i] == this.value.filterValue ? 'selected="selected"' : '') + ' value="' + items[i] + '">' + items[i] + '</option>');
customerList.append('<input type = "checkbox"' + (this.value.filterValue.indexOf(items[i]) > -1 ? 'checked="checked"' : '') + ' value="' + items[i] + '">' + items[i] + '</input><br />');
}
};
/***
Expand All @@ -86,13 +89,44 @@ function CustomersFilterWidget() {
this.registerEvents = function () {
//get list with customers
var customerList = this.container.find(".customerslist");
//get apply button from:
var applyBtn = this.container.find(".grid-apply");
//save current context:
var $context = this;
//register onclick event handler
customerList.change(function () {
applyBtn.click(function () {
//get selected filter type:
//var type = $context.container.find(".grid-filter-type").val();
var type = 1;
//get filter value:
//var value = $context.container.find(".grid-filter-input").val();
var value = "";

$('.customerslist input:checked').each(function (index, element) {
if (index == 0) {
value += element.value;
}
else {
value += "|" + element.value;
}
});


//invoke callback with selected filter values:
var values = [{ filterValue: $(this).val(), filterType: 1 /* Equals */ }];
$context.cb(values);
var filterValues = [{ filterType: type, filterValue: value }];
$context.cb(filterValues);
});
//register onclick event handler
//customerList.change(function () {
////invoke callback with selected filter values:
//var values = [{ filterValue: $(this).val(), filterType: 1 /* Equals */ }];
//$context.cb(values);
//});

//register onEnter event for filter text box:
this.container.find(".grid-filter-input").keyup(function (event) {
if (event.keyCode == 13) { applyBtn.click(); }
if (event.keyCode == 27) { GridMvc.closeOpenedPopups(); }
});
};

Expand Down
19 changes: 17 additions & 2 deletions GridMvc/Filtering/DefaultColumnFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,24 @@ private Expression<Func<T, bool>> GetFilterExpression(PropertyInfo pi, ColumnFil
? Expression.Property(_expression.Body, pi.PropertyType.GetProperty("Value"))
: _expression.Body;

Expression binaryExpression = filterType.GetFilterExpression(firstExpr, value.FilterValue, value.FilterType);
if (binaryExpression == null) return null;
Expression binaryExpression;
if (value.FilterValue.Contains("|"))
{
var filterValues = value.FilterValue.Split('|');
binaryExpression = filterType.GetFilterExpression(firstExpr, filterValues[0], value.FilterType);

for (int i = 1; i < filterValues.Count(); i++)
{
Expression tempExpr = filterType.GetFilterExpression(firstExpr, filterValues[i], value.FilterType);
binaryExpression = Expression.Or(tempExpr, binaryExpression);
}
}
else
{
binaryExpression = filterType.GetFilterExpression(firstExpr, value.FilterValue, value.FilterType);
}

if (binaryExpression == null) return null;
if (targetType == typeof (string))
{
//check for strings, they may be NULL
Expand Down
4 changes: 2 additions & 2 deletions GridMvc/GridMvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
Expand Down