Browse Source

Add interest and dividend to account detail dialog

pull/5347/head
Thomas Kaul 2 weeks ago
parent
commit
8ded289b2f
  1. 25
      apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
  2. 24
      apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

25
apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@ -55,11 +55,15 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
public balancePrecision = 2;
public currency: string;
public dataSource: MatTableDataSource<Activity>;
public dividendInBaseCurrency: number;
public dividendInBaseCurrencyPrecision = 2;
public equity: number;
public equityPrecision = 2;
public hasPermissionToDeleteAccountBalance: boolean;
public historicalDataItems: HistoricalDataItem[];
public holdings: PortfolioPosition[];
public interestInBaseCurrency: number;
public interestInBaseCurrencyPrecision = 2;
public isLoadingActivities: boolean;
public isLoadingChart: boolean;
public name: string;
@ -184,6 +188,8 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
({
balance,
currency,
dividendInBaseCurrency,
interestInBaseCurrency,
name,
platform,
transactionCount,
@ -200,6 +206,15 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
}
this.currency = currency;
this.dividendInBaseCurrency = dividendInBaseCurrency;
if (
this.data.deviceType === 'mobile' &&
this.dividendInBaseCurrency >=
NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
) {
this.dividendInBaseCurrencyPrecision = 0;
}
if (isNumber(balance) && isNumber(value)) {
this.equity = new Big(value).minus(balance).toNumber();
@ -214,6 +229,16 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
this.equity = null;
}
this.interestInBaseCurrency = interestInBaseCurrency;
if (
this.data.deviceType === 'mobile' &&
this.interestInBaseCurrency >=
NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
) {
this.interestInBaseCurrencyPrecision = 0;
}
this.name = name;
this.platformName = platform?.name ?? '-';
this.transactionCount = transactionCount;

24
apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@ -60,6 +60,30 @@
>Equity</gf-value
>
</div>
<div class="col-6 mb-3">
<gf-value
i18n
size="medium"
[isCurrency]="true"
[locale]="user?.settings?.locale"
[precision]="interestInBaseCurrencyPrecision"
[unit]="user?.settings?.baseCurrency"
[value]="interestInBaseCurrency"
>Interest</gf-value
>
</div>
<div class="col-6 mb-3">
<gf-value
i18n
size="medium"
[isCurrency]="true"
[locale]="user?.settings?.locale"
[precision]="dividendInBaseCurrencyPrecision"
[unit]="user?.settings?.baseCurrency"
[value]="dividendInBaseCurrency"
>Dividend</gf-value
>
</div>
<div class="col-6 mb-3">
<gf-value i18n size="medium" [value]="transactionCount"
>Activities</gf-value

Loading…
Cancel
Save