Browse Source

Fix allocations by account for non-unique account names

pull/710/head
Thomas 3 years ago
parent
commit
4bc263b813
  1. 10
      apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
  2. 2
      apps/client/src/app/pages/portfolio/allocations/allocations-page.html

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

@ -14,7 +14,7 @@ import {
} from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { ToggleOption } from '@ghostfolio/common/types';
import { AssetClass, DataSource } from '@prisma/client';
import { Account, AssetClass, DataSource } from '@prisma/client';
import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject, Subscription } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
@ -27,7 +27,10 @@ import { takeUntil } from 'rxjs/operators';
})
export class AllocationsPageComponent implements OnDestroy, OnInit {
public accounts: {
[symbol: string]: Pick<PortfolioPosition, 'name'> & { value: number };
[id: string]: Pick<Account, 'name'> & {
id: string;
value: number;
};
};
public continents: {
[code: string]: { name: string; value: number };
@ -171,11 +174,14 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.portfolioDetails.accounts
)) {
this.accounts[id] = {
id,
name,
value: aPeriod === 'original' ? original : current
};
}
console.log(this.accounts);
for (const [symbol, position] of Object.entries(
this.portfolioDetails.holdings
)) {

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

@ -20,7 +20,7 @@
<gf-portfolio-proportion-chart
[baseCurrency]="user?.settings?.baseCurrency"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[keys]="['name']"
[keys]="['id']"
[locale]="user?.settings?.locale"
[positions]="accounts"
></gf-portfolio-proportion-chart>

Loading…
Cancel
Save