|
@ -1599,11 +1599,6 @@ export class PortfolioService { |
|
|
console.log(performance); |
|
|
console.log(performance); |
|
|
|
|
|
|
|
|
const { |
|
|
const { |
|
|
// TODO
|
|
|
|
|
|
// grossPerformance,
|
|
|
|
|
|
// grossPerformancePercentage,
|
|
|
|
|
|
// grossPerformancePercentageWithCurrencyEffect,
|
|
|
|
|
|
// grossPerformanceWithCurrencyEffect,
|
|
|
|
|
|
netPerformance, |
|
|
netPerformance, |
|
|
netPerformancePercentage, |
|
|
netPerformancePercentage, |
|
|
netPerformancePercentageWithCurrencyEffect, |
|
|
netPerformancePercentageWithCurrencyEffect, |
|
@ -1729,11 +1724,14 @@ export class PortfolioService { |
|
|
fireWealth: new Big(currentValueInBaseCurrency) |
|
|
fireWealth: new Big(currentValueInBaseCurrency) |
|
|
.minus(emergencyFundPositionsValueInBaseCurrency) |
|
|
.minus(emergencyFundPositionsValueInBaseCurrency) |
|
|
.toNumber(), |
|
|
.toNumber(), |
|
|
// TODO
|
|
|
grossPerformance: new Big(netPerformance).plus(fees).toNumber(), |
|
|
grossPerformance: 0, |
|
|
grossPerformancePercentage: undefined, // TODO
|
|
|
grossPerformancePercentage: 0, |
|
|
grossPerformancePercentageWithCurrencyEffect: undefined, // TODO
|
|
|
grossPerformancePercentageWithCurrencyEffect: 0, |
|
|
grossPerformanceWithCurrencyEffect: new Big( |
|
|
grossPerformanceWithCurrencyEffect: 0, |
|
|
netPerformanceWithCurrencyEffect |
|
|
|
|
|
) |
|
|
|
|
|
.plus(fees) |
|
|
|
|
|
.toNumber(), |
|
|
interest: interest.toNumber(), |
|
|
interest: interest.toNumber(), |
|
|
items: valuables.toNumber(), |
|
|
items: valuables.toNumber(), |
|
|
liabilities: liabilities.toNumber(), |
|
|
liabilities: liabilities.toNumber(), |
|
|