evo/EvoCalculator.Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PostCalculator: корректировка DateTempColumn

Browse Source
This commit is contained in:
Chika 2022-05-12 12:53:53 +03:00
parent 08a23c78ea
commit c39290a5da
8 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EvoCalculator.Core.PostCalculation/v1/Columns/Current/DateTempColumn.cs
View File

@ -1,5 +1,6 @@
using System;
using EvoCalculator.Core.Base.Columns;
using EvoCalculator.Core.Models.PostCalculation.Models.Prepared;
namespace EvoCalculator.Core.PostCalculation.v1.Columns.Current;
@ -9,9 +10,12 @@ public class DateTempColumn : BaseColumn<DateTime>
{
}
public void ComputeValues(BaseColumn<DateTime> currentDateColumn)
public void ComputeValues(PreparedValues preparedValues, BaseColumn<DateTime> currentDateColumn)
{
Values[0] = Values[1] = currentDateColumn.GetValue(2).AddMonths(-1);
if (preparedValues.DeliveryTime == 100000001)
Values[0] = Values[1] = preparedValues.DateInput;
else
Values[0] = Values[1] = currentDateColumn.GetValue(1);
for (var i = 2; i < Values.Length; i++)
Values[i] = currentDateColumn.GetValue(i);

2
EvoCalculator.Core.PostCalculation/v1/Columns/Next/DateTempColumn.cs
View File

@ -14,7 +14,7 @@ public class DateTempColumn : BaseColumn<DateTime>
public void ComputeValues(PreparedValues preparedValues, BaseColumn<DateTime> nextDateColumn)
{
if (preparedValues.DeliveryTime == 100000001)
Values[0] = Values[1] = nextDateColumn.GetValue(2).AddMonths(-1);
Values[0] = Values[1] = preparedValues.DateInput;
else
Values[0] = Values[1] = nextDateColumn.GetValue(1);

2
EvoCalculator.Core.PostCalculation/v1/Managers/CalculateDefault.cs
View File

@ -37,7 +37,7 @@ public static partial class CalculateManager
var currentDateTempColumn =
new DateTempColumn(preparedValues.Nmper.Current + 1);
currentDateTempColumn.ComputeValues(currentDateColumn);
currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
currentSumColumn.ComputeValues(preparedValues, currentTablePayments);

2
EvoCalculator.Core.PostCalculation/v1/Managers/PERWithChangingTheTerm.cs
View File

@ -37,7 +37,7 @@ public static partial class CalculateManager
var currentDateTempColumn =
new DateTempColumn(preparedValues.Nmper.Current + 1);
currentDateTempColumn.ComputeValues(currentDateColumn);
currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
currentSumColumn.ComputeValues(preparedValues, currentTablePayments);

2
EvoCalculator.Core.PostCalculation/v1/Managers/PERWithoutChangingTheTerm.cs
View File

@ -37,7 +37,7 @@ public static partial class CalculateManager
var currentDateTempColumn =
new DateTempColumn(preparedValues.Nmper.Current + 1);
currentDateTempColumn.ComputeValues(currentDateColumn);
currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
currentSumColumn.ComputeValues(preparedValues, currentTablePayments);

2
EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs
View File

@ -40,7 +40,7 @@ public static partial class CalculateManager
var currentDateTempColumn =
new DateTempColumn(preparedValues.Nmper.Current + 1);
currentDateTempColumn.ComputeValues(currentDateColumn);
currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
currentSumColumn.ComputeValues(preparedValues, currentTablePayments);

2
EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs
View File

@ -40,7 +40,7 @@ public static partial class CalculateManager
var currentDateTempColumn =
new DateTempColumn(preparedValues.Nmper.Current + 1);
currentDateTempColumn.ComputeValues(currentDateColumn);
currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
currentSumColumn.ComputeValues(preparedValues, currentTablePayments);

2
EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs
View File

@ -40,7 +40,7 @@ public static partial class CalculateManager
var currentDateTempColumn =
new DateTempColumn(preparedValues.Nmper.Current + 1);
currentDateTempColumn.ComputeValues(currentDateColumn);
currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
currentSumColumn.ComputeValues(preparedValues, currentTablePayments);