Browse Source
Task/refactor liabilities to liabilitiesInBaseCurrency in portfolio summary interface (#5725)
* Refactor liabilities to liabilitiesInBaseCurrency
pull/5602/merge
Lagmator22
6 days ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
7 additions and
4 deletions
-
apps/api/src/app/portfolio/portfolio.service.ts
-
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
-
libs/common/src/lib/interfaces/portfolio-summary.interface.ts
|
|
@ -2106,7 +2106,7 @@ export class PortfolioService { |
|
|
|
.plus(fees) |
|
|
|
.toNumber(), |
|
|
|
interest: interest.toNumber(), |
|
|
|
liabilities: liabilities.toNumber(), |
|
|
|
liabilitiesInBaseCurrency: liabilities.toNumber(), |
|
|
|
totalInvestment: totalInvestment.toNumber(), |
|
|
|
totalValueInBaseCurrency: netWorth |
|
|
|
}; |
|
|
|
|
|
@ -242,7 +242,10 @@ |
|
|
|
<div class="flex-nowrap px-3 py-1 row"> |
|
|
|
<div class="flex-grow-1 text-truncate" i18n>Liabilities</div> |
|
|
|
<div class="d-flex justify-content-end"> |
|
|
|
@if (summary?.liabilities || summary?.liabilities === 0) { |
|
|
|
@if ( |
|
|
|
summary?.liabilitiesInBaseCurrency || |
|
|
|
summary?.liabilitiesInBaseCurrency === 0 |
|
|
|
) { |
|
|
|
<span class="mr-1">-</span> |
|
|
|
} |
|
|
|
<gf-value |
|
|
@ -250,7 +253,7 @@ |
|
|
|
[isCurrency]="true" |
|
|
|
[locale]="locale" |
|
|
|
[unit]="baseCurrency" |
|
|
|
[value]="isLoading ? undefined : summary?.liabilities" |
|
|
|
[value]="isLoading ? undefined : summary?.liabilitiesInBaseCurrency" |
|
|
|
/> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
@ -21,7 +21,7 @@ export interface PortfolioSummary extends PortfolioPerformance { |
|
|
|
grossPerformance: number; |
|
|
|
grossPerformanceWithCurrencyEffect: number; |
|
|
|
interest: number; |
|
|
|
liabilities: number; |
|
|
|
liabilitiesInBaseCurrency: number; |
|
|
|
totalBuy: number; |
|
|
|
totalSell: number; |
|
|
|
totalValueInBaseCurrency?: number; |
|
|
|