diff --git a/apps/red-ui/src/app/common/filter/utils/filter-utils.ts b/apps/red-ui/src/app/common/filter/utils/filter-utils.ts index ed10d5300..2f6add9ad 100644 --- a/apps/red-ui/src/app/common/filter/utils/filter-utils.ts +++ b/apps/red-ui/src/app/common/filter/utils/filter-utils.ts @@ -1,6 +1,5 @@ import { FilterModel } from '../model/filter.model'; import { FileStatusWrapper } from '../../../screens/file/model/file-status.wrapper'; -import * as moment from 'moment'; import { ProjectWrapper } from '../../../state/app-state.service'; export const RedactionFilterSorter = { @@ -57,9 +56,6 @@ export const annotationFilterChecker = (f: FileStatusWrapper, filter: FilterMode return f[getter]; }; -export const fileAddedFilterChecker = (f: FileStatusWrapper, filter: FilterModel) => - moment(f.added).format('DD/MM/YYYY') === filter.key; - export const projectStatusChecker = (pw: ProjectWrapper, filter: FilterModel) => pw.hasStatus(filter.key); diff --git a/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.html b/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.html index 5f4d6913e..625425eb4 100644 --- a/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.html +++ b/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.html @@ -30,7 +30,11 @@
-
+
f.key === key); + public toggleFilter(filterType: 'needsWorkFilters' | 'statusFilters', key: string): void { + const filter = this.filters[filterType].find((f) => f.key === key); filter.checked = !filter.checked; this.filtersChanged.emit(this.filters); } diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts index f756f895d..cd5a44331 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts @@ -43,7 +43,10 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { public displayedFiles: FileStatusWrapper[] = []; - public detailsContainerFilters: { needsWorkFilters: FilterModel[] }; + public detailsContainerFilters: { + needsWorkFilters: FilterModel[]; + statusFilters: FilterModel[]; + }; @ViewChild('projectDetailsComponent', { static: false }) private _projectDetailsComponent: ProjectDetailsComponent; @@ -318,7 +321,6 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { filtersChanged(filters?: { [key: string]: FilterModel[] }): void { if (filters) { for (const key of Object.keys(filters)) { - console.log(filters[key]); for (let idx = 0; idx < this[key].length; ++idx) { this[key][idx] = filters[key][idx]; } @@ -338,7 +340,8 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { filters ); this.detailsContainerFilters = { - needsWorkFilters: this.needsWorkFilters.map((f) => ({ ...f })) + needsWorkFilters: this.needsWorkFilters.map((f) => ({ ...f })), + statusFilters: this.statusFilters.map((f) => ({ ...f })) }; this._changeDetectorRef.detectChanges(); }