Browse Source

Respect filters in activities export

pull/672/head
Thomas 3 years ago
parent
commit
9fe7368fae
  1. 4
      apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts
  2. 2
      apps/client/src/app/pages/portfolio/transactions/transactions-page.html
  3. 12
      libs/ui/src/lib/activities-table/activities-table.component.ts

4
apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts

@ -147,9 +147,9 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
});
}
public onExport() {
public onExport(activityIds?: string[]) {
this.dataService
.fetchExport()
.fetchExport(activityIds)
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((data) => {
downloadAsFile(

2
apps/client/src/app/pages/portfolio/transactions/transactions-page.html

@ -14,7 +14,7 @@
(activityDeleted)="onDeleteTransaction($event)"
(activityToClone)="onCloneTransaction($event)"
(activityToUpdate)="onUpdateTransaction($event)"
(export)="onExport()"
(export)="onExport($event)"
(import)="onImport()"
></gf-activities-table>
</div>

12
libs/ui/src/lib/activities-table/activities-table.component.ts

@ -54,7 +54,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
@Output() activityDeleted = new EventEmitter<string>();
@Output() activityToClone = new EventEmitter<OrderWithAccount>();
@Output() activityToUpdate = new EventEmitter<OrderWithAccount>();
@Output() export = new EventEmitter<void>();
@Output() export = new EventEmitter<string[]>();
@Output() import = new EventEmitter<void>();
@ViewChild('autocomplete') matAutocomplete: MatAutocomplete;
@ -182,7 +182,15 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy {
}
public onExport() {
this.export.emit();
if (this.searchKeywords.length > 0) {
this.export.emit(
this.dataSource.filteredData.map((activity) => {
return activity.id;
})
);
} else {
this.export.emit();
}
}
public onImport() {

Loading…
Cancel
Save