Skip to content

fix(excel-style-filtering): allow negative decimal values for numeric columns - 19.2.x #15929

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
wants to merge 1 commit into
base: 19.2.x
Choose a base branch
from
Open

fix(excel-style-filtering): allow negative decimal values for numeric columns - 19.2.x #15929

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
4 changes: 2 additions & 2 deletions ...angular/src/lib/grids/filtering/excel-style/excel-style-default-expression.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
[placeholder]="inputValuePlaceholder"
[disabled]="expressionUI.expression.condition && expressionUI.expression.condition.isUnary"
autocomplete="off"
[value]="expressionUI.expression.searchVal"
(input)="onValuesInput($event)"
[(ngModel)]="expressionUI.expression.searchVal"
(blur)="updateSearchValueOnBlur($event)"
/>
</igx-input-group>

Expand Down
5 changes: 3 additions & 2 deletions ...i-angular/src/lib/grids/filtering/excel-style/excel-style-default-expression.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
ChangeDetectorRef,
ViewChild
} from '@angular/core';
import { FormsModule } from '@angular/forms';
import { IgxButtonGroupComponent } from '../../../buttonGroup/buttonGroup.component';
import { GridColumnDataType, DataUtil } from '../../../data-operations/data-util';
import { IFilteringOperation } from '../../../data-operations/filtering-condition';
Expand Down Expand Up @@ -41,7 +42,7 @@ export interface ILogicOperatorChangedArgs extends IBaseEventArgs {
@Component({
selector: 'igx-excel-style-default-expression',
templateUrl: './excel-style-default-expression.component.html',
imports: [IgxSelectComponent, IgxPrefixDirective, IgxIconComponent, IgxSelectItemComponent, IgxInputGroupComponent, IgxInputDirective, IgxButtonDirective, IgxButtonGroupComponent, IgxOverlayOutletDirective, IgxIconButtonDirective]
imports: [FormsModule, IgxSelectComponent, IgxPrefixDirective, IgxIconComponent, IgxSelectItemComponent, IgxInputGroupComponent, IgxInputDirective, IgxButtonDirective, IgxButtonGroupComponent, IgxOverlayOutletDirective, IgxIconButtonDirective]
})
export class IgxExcelStyleDefaultExpressionComponent implements AfterViewInit {
@Input()
Expand Down Expand Up @@ -163,7 +164,7 @@ export class IgxExcelStyleDefaultExpressionComponent implements AfterViewInit {
return this.grid.resourceStrings[`igx_grid_filter_${name}`] || name;
}

public onValuesInput(eventArgs) {
public updateSearchValueOnBlur(eventArgs) {
this.expressionUI.expression.searchVal = DataUtil.parseValue(this.column.dataType, eventArgs.target.value);
}

Expand Down
52 changes: 52 additions & 0 deletions projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3813,12 +3813,15 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {

// set first expression's value
GridFunctions.setInputValueESF(fix, 0, 0);
tick(100);

// select second expression's operator
GridFunctions.setOperatorESF(fix, 1, 1);
tick(100);

// set second expression's value
GridFunctions.setInputValueESF(fix, 1, 20);
tick(100);

GridFunctions.clickApplyExcelStyleCustomFiltering(fix);

Expand Down Expand Up @@ -6299,6 +6302,55 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
expect(input.value).toBe('');
});
}));

it('should correctly filter negative decimal values in Excel Style filtering', fakeAsync(() => {
GridFunctions.clickExcelFilterIcon(fix, 'Downloads');
tick();
fix.detectChanges();

GridFunctions.clickExcelFilterCascadeButton(fix);
tick();
fix.detectChanges();

GridFunctions.clickOperatorFromCascadeMenu(fix, 2);
tick();
fix.detectChanges();

GridFunctions.setInputValueESF(fix, 0, '-1');
tick(100);
fix.detectChanges();
expect(GridFunctions.getExcelFilteringInput(fix, 0).value).toBe('-1');

const applyButton = GridFunctions.getApplyExcelStyleCustomFiltering(fix);
applyButton.click();
tick(100);
fix.detectChanges();

expect(grid.filteredData.length).toBe(8);

GridFunctions.clickExcelFilterIcon(fix, 'Downloads');
tick();
fix.detectChanges();

GridFunctions.clickExcelFilterCascadeButton(fix);
tick();
fix.detectChanges();

GridFunctions.clickOperatorFromCascadeMenu(fix, 2);
tick();
fix.detectChanges();

GridFunctions.setInputValueESF(fix, 0, '-0.1');
tick(100);
fix.detectChanges();
expect(GridFunctions.getExcelFilteringInput(fix, 0).value).toBe('-0.1');

applyButton.click();
tick(100);
fix.detectChanges();

expect(grid.filteredData.length).toBe(8);
}));
});

describe('Templates: ', () => {
Expand Down
Loading