From f9a00396bfe25cfb3fe670cb49a5cc4a82cbece6 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 17 Nov 2020 13:50:26 +0300 Subject: [PATCH] fix result values --- .../stores/CalculationStore/Effects/action.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/client/stores/CalculationStore/Effects/action.ts b/src/client/stores/CalculationStore/Effects/action.ts index e5d3508..d3b4056 100644 --- a/src/client/stores/CalculationStore/Effects/action.ts +++ b/src/client/stores/CalculationStore/Effects/action.ts @@ -344,7 +344,7 @@ const actions: TAction = { //set values CalculationStore.setValue( 'resultTotalGraphwithNDS', - sumWithVatColumn?.values.shift().reduce((a, b) => a + b), + sumWithVatColumn?.values[0] || 0, ); CalculationStore.setValue( 'resultPlPrice', @@ -352,27 +352,27 @@ const actions: TAction = { ); CalculationStore.setValue( 'resultPriceUpPr', - res?.postValues?.priceUP_PR || '', + res?.postValues?.priceUP_PR * 100 || 0, ); CalculationStore.setValue( 'resultIRRGraphPerc', - res?.columns?.cashflowColumn?.irr || '', + res?.columns?.cashflowColumn?.irr * 100 || 0, ); CalculationStore.setValue( 'resultIRRNominalPerc', - res?.columns?.cashflowMsfoColumn?.nominal || '', + res?.columns?.cashflowMsfoColumn?.nominal * 100 || 0, ); CalculationStore.setValue( 'resultInsKasko', - preparedData?.preparedValues?.insuranceKasko || '', + preparedData?.preparedValues?.insuranceKasko || 0, ); CalculationStore.setValue( 'resultInsOsago', - preparedData?.preparedValues?.insuranceOsago || '', + preparedData?.preparedValues?.insuranceOsago || 0, ); CalculationStore.setValue( 'resultInsOsago', - preparedData?.preparedValues?.insuranceOsago || '', + preparedData?.preparedValues?.insuranceOsago || 0, ); CalculationStore.setValue( 'resultDopProdSum', @@ -384,13 +384,13 @@ const actions: TAction = { ); CalculationStore.setValue( 'resultFirstPayment', - preparedData?.preparedValues?.firstPaymentSum || - 0 * (1 + valuesConstants.VAT), + (preparedData?.preparedValues?.firstPaymentSum || 0) * + (1 + valuesConstants.VAT), ); CalculationStore.setValue( 'resultLastPayment', - preparedData?.preparedValues?.lastPaymentSum || - 0 * (1 + valuesConstants.VAT), + (preparedData?.preparedValues?.lastPaymentSum || 0) * + (1 + valuesConstants.VAT), ); CalculationStore.setValue(