ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4342 from MaximilianKrambach/quickfilters

Browse Source 
agenda and motion list filters
This commit is contained in:
Emanuel Schütze 2019-02-14 15:53:39 +01:00 committed by GitHub
commit 9459e9d6e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts
View File

@ -107,6 +107,7 @@ export class AgendaListComponent extends ListViewBaseComponent<ViewItem> impleme
this.config
.get<boolean>('agenda_enable_numbering')
.subscribe(autoNumbering => (this.isNumberingAllowed = autoNumbering));
this.setFulltextFilter();
}
/**
@ -286,4 +287,24 @@ export class AgendaListComponent extends ListViewBaseComponent<ViewItem> impleme
return result;
}
}
/**
* Overwrites the dataSource's string filter with a case-insensitive search
* in the item number and title
*/
private setFulltextFilter(): void {
this.dataSource.filterPredicate = (data, filter) => {
if (!data) {
return false;
}
filter = filter ? filter.toLowerCase() : '';
return (
data.itemNumber.toLowerCase().includes(filter) ||
data
.getListTitle()
.toLowerCase()
.includes(filter)
);
};
}
}

44
client/src/app/site/motions/components/motion-list/motion-list.component.ts
View File

@ -135,6 +135,7 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion> imple
this.dataSource.data = sortedData;
this.checkSelection();
});
this.setFulltextFilter();
}
/**
@ -285,4 +286,47 @@ export class MotionListComponent extends ListViewBaseComponent<ViewMotion> imple
this.configService.instant<string>('motions_recommendation_text_mode') as ChangeRecoMode
);
}
/**
* Overwrites the dataSource's string filter with a case-insensitive search
* in the identifier, title, state, recommendations, submitters and motion blocks
*/
private setFulltextFilter(): void {
this.dataSource.filterPredicate = (data, filter) => {
if (!data) {
return false;
}
filter = filter ? filter.toLowerCase() : '';
if (
data.recommendation &&
this.translate
.instant(data.recommendation.recommendation_label)
.toLowerCase()
.includes(filter)
) {
return true;
}
if (
this.translate
.instant(data.state.name)
.toLowerCase()
.includes(filter)
) {
return true;
}
if (data.submitters.length && data.submitters.find(user => user.full_name.toLowerCase().includes(filter))) {
return true;
}
if (data.motion_block && data.motion_block.title.toLowerCase().includes(filter)) {
return true;
}
if (data.title.toLowerCase().includes(filter)) {
return true;
}
if (data.identifier && data.identifier.toLowerCase().includes(filter)) {
return true;
}
return false;
};
}
}