Browse Source

ISSUE #3836

* eliminate router from lib component
* added onclicked event into activities page
* added functionality into html
pull/3856/head
Dmytro Werner 11 months ago
parent
commit
fb92511bcb
  1. 10
      apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
  2. 1
      apps/client/src/app/pages/portfolio/activities/activities-page.html
  3. 5
      libs/ui/src/lib/activities-table/activities-table.component.ts

10
apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@ -255,6 +255,16 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
}); });
} }
public onClickActivity(aActivity: Activity) {
this.router.navigate([], {
queryParams: {
dataSource: aActivity.SymbolProfile.dataSource,
symbol: aActivity.SymbolProfile.symbol,
holdingDetailDialog: true
}
});
}
public openUpdateActivityDialog(activity: Activity) { public openUpdateActivityDialog(activity: Activity) {
const dialogRef = this.dialog.open(CreateOrUpdateActivityDialog, { const dialogRef = this.dialog.open(CreateOrUpdateActivityDialog, {
data: { data: {

1
apps/client/src/app/pages/portfolio/activities/activities-page.html

@ -30,6 +30,7 @@
(importDividends)="onImportDividends()" (importDividends)="onImportDividends()"
(pageChanged)="onChangePage($event)" (pageChanged)="onChangePage($event)"
(sortChanged)="onSortChanged($event)" (sortChanged)="onSortChanged($event)"
(activityClicked)="onClickActivity($event)"
/> />
</div> </div>
</div> </div>

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

@ -105,6 +105,7 @@ export class GfActivitiesTableComponent
@Output() pageChanged = new EventEmitter<PageEvent>(); @Output() pageChanged = new EventEmitter<PageEvent>();
@Output() selectedActivities = new EventEmitter<Activity[]>(); @Output() selectedActivities = new EventEmitter<Activity[]>();
@Output() sortChanged = new EventEmitter<Sort>(); @Output() sortChanged = new EventEmitter<Sort>();
@Output() activityClicked = new EventEmitter<AssetProfileIdentifier>();
@ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
@ -269,9 +270,7 @@ export class GfActivitiesTableComponent
} }
public onOpenPositionDialog({ dataSource, symbol }: AssetProfileIdentifier) { public onOpenPositionDialog({ dataSource, symbol }: AssetProfileIdentifier) {
this.router.navigate([], { this.activityClicked.emit({ dataSource, symbol });
queryParams: { dataSource, symbol, holdingDetailDialog: true }
});
} }
public onUpdateActivity(aActivity: OrderWithAccount) { public onUpdateActivity(aActivity: OrderWithAccount) {

Loading…
Cancel
Save