From d110be14e1f31ae1c6fb050164f73b2a12fa62eb Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 5 Dec 2023 13:10:29 +0300 Subject: [PATCH] PostCalculation: fix costInsurance Current.SumColumn & Next.SumIRRColumn --- .../v1/Columns/Current/SumColumn.cs | 2 +- .../v2/Columns/Next/SumIRRColumn.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EvoCalculator.Core.PostCalculation/v1/Columns/Current/SumColumn.cs b/EvoCalculator.Core.PostCalculation/v1/Columns/Current/SumColumn.cs index 308eddf..a3e3545 100644 --- a/EvoCalculator.Core.PostCalculation/v1/Columns/Current/SumColumn.cs +++ b/EvoCalculator.Core.PostCalculation/v1/Columns/Current/SumColumn.cs @@ -33,7 +33,7 @@ public class SumColumn : BaseColumnWithXIRR Values = Array.Concat( - new[] { -preparedValues.BaseCost - preparedValues.FuelCardSum + costInsurances.Sum() } + new[] { -preparedValues.BaseCost - preparedValues.FuelCardSum + Math.Abs(costInsurances.Sum()) } , new[] { currentTablePayments[0].SumPayment + preparedValues.SubsidySum } , currentTablePayments.Skip(1).Select(x => x.SumPayment) , costInsurances diff --git a/EvoCalculator.Core.PostCalculation/v2/Columns/Next/SumIRRColumn.cs b/EvoCalculator.Core.PostCalculation/v2/Columns/Next/SumIRRColumn.cs index 24c957f..a95297f 100644 --- a/EvoCalculator.Core.PostCalculation/v2/Columns/Next/SumIRRColumn.cs +++ b/EvoCalculator.Core.PostCalculation/v2/Columns/Next/SumIRRColumn.cs @@ -52,7 +52,7 @@ namespace EvoCalculator.Core.PostCalculation.v2.Columns.Next } Values = Array.Concat( - new[] { -_nextValues.BaseCost - _preparedValues.FuelCardSum + costInsurances.Sum() }, + new[] { -_nextValues.BaseCost - _preparedValues.FuelCardSum + Math.Abs(costInsurances.Sum()) }, _sumColumn.Values.Skip(1), costInsurances );