benjamin/wgenerator
1
0
Fork 0
Code Releases Activity

filter artist

Browse Source
This commit is contained in:
smuddyx
2022-04-03 13:26:17 +02:00
parent a01fb852ba
commit 346fd18e0c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/modules/songs/song-list/filter/filter.component.ts
View File

@@ -37,11 +37,11 @@ export class FilterComponent {
if (filterValues.flag) this.filterFormGroup.controls.flag.setValue(filterValues.flag); if (filterValues.flag) this.filterFormGroup.controls.flag.setValue(filterValues.flag);
}); });
this.filterFormGroup.controls.q.valueChanges.subscribe(_ => void this.filerValueChanged('q', _)); this.filterFormGroup.controls.q.valueChanges.subscribe(_ => void this.filerValueChanged('q', _ as string));
this.filterFormGroup.controls.key.valueChanges.subscribe(_ => void this.filerValueChanged('key', _)); this.filterFormGroup.controls.key.valueChanges.subscribe(_ => void this.filerValueChanged('key', _ as string));
this.filterFormGroup.controls.type.valueChanges.subscribe(_ => void this.filerValueChanged('type', _)); this.filterFormGroup.controls.type.valueChanges.subscribe(_ => void this.filerValueChanged('type', _ as string));
this.filterFormGroup.controls.legalType.valueChanges.subscribe(_ => void this.filerValueChanged('legalType', _)); this.filterFormGroup.controls.legalType.valueChanges.subscribe(_ => void this.filerValueChanged('legalType', _ as string));
this.filterFormGroup.controls.flag.valueChanges.subscribe(_ => void this.filerValueChanged('flag', _)); this.filterFormGroup.controls.flag.valueChanges.subscribe(_ => void this.filerValueChanged('flag', _ as string));
} }
public getFlags(): string[] { public getFlags(): string[] {

3
src/app/services/filter.helper.ts
View File

@@ -5,8 +5,9 @@ export function filterSong(song: Song, filterValue: string): boolean {
const textMatch = !!song.text && normalize(song.text).indexOf(normalize(filterValue)) !== -1; const textMatch = !!song.text && normalize(song.text).indexOf(normalize(filterValue)) !== -1;
const titleMatch = !!song.title && normalize(song.title).indexOf(normalize(filterValue)) !== -1; const titleMatch = !!song.title && normalize(song.title).indexOf(normalize(filterValue)) !== -1;
const artistMatch = !!song.title && normalize(song.artist).indexOf(normalize(filterValue)) !== -1;
return textMatch || titleMatch; return textMatch || titleMatch || artistMatch;
} }
function normalize(input: string): string { function normalize(input: string): string {