nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add key filtering

This commit is contained in:
Martin Rojas Miguel Angel 2018-02-21 11:21:10 +01:00 committed by Holger Hagen
parent 274fa67a53
commit da53c87a68
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/src/app/shared/filter/filter.component.spec.ts
View File

@ -49,12 +49,13 @@ describe('FilterComponent', () => {
});
it('should be able to clear all fields after pressing clear button', () => {
component.filter = new FilterModel('a','a','a','a');
component.filter = new FilterModel('a','a','a','a','a');
debugElement.querySelector('[title="Clear"]').click();
expect(component.filter.name).toBe('');
expect(component.filter.description).toBe('');
expect(component.filter.owner).toBe('');
expect(component.filter.type).toBe('');
expect(component.filter.key).toBe('');
});
it('should be able to select a type and return it based on a number', () => {

4
admin/src/app/shared/filter/filter.component.ts
View File

@ -5,11 +5,13 @@ export class FilterModel {
name:string;
description:string;
owner:string;
constructor(type:string = '', name:string = '', description:string = '', owner:string = ''){
key: string;
constructor(type:string = '', name:string = '', description:string = '', owner:string = '', key:string = ''){
this.type = type;
this.name = name;
this.description= description;
this.owner = owner;
this.key = key;
}
}

6
admin/src/app/workbasket/list/workbasket-list.component.spec.ts
View File

@ -116,10 +116,10 @@ describe('WorkbasketListComponent', () => {
});
it('should have performRequest after performFilter is triggered', fakeAsync( () => {
let type='PERSONAL', name = 'someName', description = 'someDescription', owner = 'someOwner'
let filter = new FilterModel(type, name, description, owner);
let type='PERSONAL', name = 'someName', description = 'someDescription', owner = 'someOwner', key = 'someKey';
let filter = new FilterModel(type, name, description, owner, key );
component.performFilter(filter);
expect(workbasketService.getWorkBasketsSummary).toHaveBeenCalledWith('key', 'asc', undefined, name, description, undefined, owner, type );
expect(workbasketService.getWorkBasketsSummary).toHaveBeenCalledWith('key', 'asc', undefined, name, description, undefined, owner, type, undefined, key );
}));

2
admin/src/app/workbasket/list/workbasket-list.component.ts
View File

@ -92,7 +92,7 @@ export class WorkbasketListComponent implements OnInit {
this.workbaskets = undefined;
this.workbasketServiceSubscription.add(this.workbasketService.getWorkBasketsSummary(this.sortBy, this.sortDirection, undefined,
this.filterBy.name, this.filterBy.description, undefined, this.filterBy.owner,
this.filterBy.type).subscribe(resultList => {
this.filterBy.type, undefined, this.filterBy.key).subscribe(resultList => {
this.workbaskets = resultList;
this.requestInProgress = false;
}));

9
admin/src/assets/_site.scss
View File

@ -115,9 +115,8 @@
overflow-x: hidden;
}
.margin-right
{
margin-right: 5px;
.margin-right {
margin-right: 2px;
}
.no-border-bottom {
@ -191,6 +190,10 @@ li > div.row > dl {
color: crimson;
}
.dropdown-menu-users >li {
margin-bottom: 5px;
}
.btn-users-list {
border: 0px solid transparent;
/* this was 1px earlier */