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

merge fix/post-calculation_tlm-tracker

Browse Source
This commit is contained in:
vchikalkin 2023-05-19 13:36:17 +03:00
parent 247d950145
commit 8eb9dec769
10 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
EvoCalculator.Core.Models/PostCalculation/Models/Prepared/PreparedValues.cs
View File

@ -20,7 +20,8 @@ public class PreparedValues
[Range(2, 60)] public int EditPaymentNumber { get; set; } [Range(2, 60)] public int EditPaymentNumber { get; set; }
[Required] public ChangingValue<DateTime> EditPaymentDate { get; set; } [Required] public ChangingValue<DateTime> EditPaymentDate { get; set; }
[Required] public bool ChangeTrackerTLM { get; set; } [Required] public bool ChangeTLM { get; set; }
[Required] public bool ChangeTracker { get; set; }
public int MonthOffset { get; set; } public int MonthOffset { get; set; }
[Required] public bool LastPaymentFix { get; set; } [Required] public bool LastPaymentFix { get; set; }
public bool LastDayMonth { get; set; } public bool LastDayMonth { get; set; }
@ -33,7 +34,7 @@ public class PreparedValues
public ChangingValue<int> Nmper { get; set; } public ChangingValue<int> Nmper { get; set; }
public ChangingValue<decimal> PlPrice { get; set; } public ChangingValue<decimal> PlPrice { get; set; }
public decimal PlPriceWithVAT { get; set; } public decimal PlPriceWithVAT { get; set; }
public decimal PlPriceVAT { get; set; } public decimal PlPriceVAT { get; set; }
public ChangingValue<decimal> Discount { get; set; } public ChangingValue<decimal> Discount { get; set; }

10
EvoCalculator.Core.PostCalculation/v1/Columns/Next/TLMCostColumn.cs
View File

@ -21,7 +21,7 @@ public class TLMCostColumn : BaseColumnWithSum
, ChangingValue<TableTLMTrackerRow[]> tableTLMTracker) , ChangingValue<TableTLMTrackerRow[]> tableTLMTracker)
{ {
/* Вариант 1: меняем системы ТЛМ */ /* Вариант 1: меняем системы ТЛМ */
if (preparedValues.ChangeTrackerTLM if (preparedValues.ChangeTLM
&& tableTLMTracker.Current != null && tableTLMTracker.Current != null
&& tableTLMTracker.Next != null) && tableTLMTracker.Next != null)
{ {
@ -48,7 +48,7 @@ public class TLMCostColumn : BaseColumnWithSum
, nextPart.Select(x => x.CostTLM)); , nextPart.Select(x => x.CostTLM));
} }
/* Вариант 2: добавляем ТЛМ */ /* Вариант 2: добавляем ТЛМ */
else if (preparedValues.ChangeTrackerTLM else if (preparedValues.ChangeTLM
&& tableTLMTracker.Current == null && tableTLMTracker.Current == null
&& tableTLMTracker.Next != null) && tableTLMTracker.Next != null)
{ {
@ -61,7 +61,7 @@ public class TLMCostColumn : BaseColumnWithSum
, nextPart.Select(x => x.CostTLM)); , nextPart.Select(x => x.CostTLM));
} }
/* Вариант 3: удаляем ТЛМ */ /* Вариант 3: удаляем ТЛМ */
else if (preparedValues.ChangeTrackerTLM else if (preparedValues.ChangeTLM
&& tableTLMTracker.Current != null && tableTLMTracker.Current != null
&& tableTLMTracker.Next == null) && tableTLMTracker.Next == null)
{ {
@ -79,7 +79,7 @@ public class TLMCostColumn : BaseColumnWithSum
); );
} }
/* Вариант 4: ТЛМ есть и не меняется */ /* Вариант 4: ТЛМ есть и не меняется */
else if (preparedValues.ChangeTrackerTLM == false else if (preparedValues.ChangeTLM == false
&& tableTLMTracker.Current != null && tableTLMTracker.Current != null
&& tableTLMTracker.Next == null) && tableTLMTracker.Next == null)
{ {
@ -101,7 +101,7 @@ public class TLMCostColumn : BaseColumnWithSum
} }
} }
/* Вариант 5: ТЛМ нет и не меняется */ /* Вариант 5: ТЛМ нет и не меняется */
else if (preparedValues.ChangeTrackerTLM == false else if (preparedValues.ChangeTLM == false
&& tableTLMTracker.Current != null && tableTLMTracker.Current != null
&& tableTLMTracker.Next != null) && tableTLMTracker.Next != null)
{ {

4
EvoCalculator.Core.PostCalculation/v1/Managers/lib/Helper/TLMLength.cs
View File

@ -22,11 +22,11 @@ public class Helper
) )
{ {
if (currentTableTLMTracker == null && nextTableTLMTracker == null) return null; if (currentTableTLMTracker == null && nextTableTLMTracker == null) return null;
if (preparedValues.ChangeTrackerTLM == false && currentTableTLMTracker == null) return null; if (preparedValues.ChangeTLM == false && currentTableTLMTracker == null) return null;
DateTime startDate; DateTime startDate;
DateTime endDate; DateTime endDate;
if (preparedValues.ChangeTrackerTLM) if (preparedValues.ChangeTLM)
{ {
startDate = currentTableTLMTracker?[0]?.DateTLM ?? preparedValues.EditPaymentDate.Current; startDate = currentTableTLMTracker?[0]?.DateTLM ?? preparedValues.EditPaymentDate.Current;
endDate = nextTableTLMTracker != null endDate = nextTableTLMTracker != null

8
EvoCalculator.Core.PostCalculation/v1/NextValues.cs
View File

@ -24,7 +24,7 @@ public class NextValues
public void ComputeAcquisitionExpenses(TableInsuranceRow[]? nextTableInsurance) public void ComputeAcquisitionExpenses(TableInsuranceRow[]? nextTableInsurance)
{ {
var tracker = 0m; var tracker = 0m;
if (preparedValues.TrackerCost.Next == 0) if (preparedValues.ChangeTracker == false)
tracker = preparedValues.TrackerCost.Current; tracker = preparedValues.TrackerCost.Current;
else if (preparedValues.TypeChangeTracker == 100000000) else if (preparedValues.TypeChangeTracker == 100000000)
tracker = preparedValues.TrackerCost.Current + preparedValues.TrackerCost.Next; tracker = preparedValues.TrackerCost.Current + preparedValues.TrackerCost.Next;
@ -32,7 +32,7 @@ public class NextValues
tracker = preparedValues.TrackerCostRemove + preparedValues.TrackerCost.Next; tracker = preparedValues.TrackerCostRemove + preparedValues.TrackerCost.Next;
var tlm = 0m; var tlm = 0m;
if (preparedValues.TLMCost.Next == 0) if (preparedValues.ChangeTLM == false)
tlm = preparedValues.TLMCost.Current; tlm = preparedValues.TLMCost.Current;
else if (preparedValues.TypeChangeTLM == 100000000) else if (preparedValues.TypeChangeTLM == 100000000)
tlm = preparedValues.TLMCost.Current + preparedValues.TLMCost.Next; tlm = preparedValues.TLMCost.Current + preparedValues.TLMCost.Next;
@ -90,7 +90,7 @@ public class NextValues
var tracker = 0m; var tracker = 0m;
if (preparedValues.TrackerCost.Next == 0) if (preparedValues.ChangeTracker == false)
tracker = preparedValues.TrackerCost.Current; tracker = preparedValues.TrackerCost.Current;
else if (preparedValues.TypeChangeTracker == 100000000) else if (preparedValues.TypeChangeTracker == 100000000)
tracker = preparedValues.TrackerCost.Current + preparedValues.TrackerCost.Next; tracker = preparedValues.TrackerCost.Current + preparedValues.TrackerCost.Next;
@ -98,7 +98,7 @@ public class NextValues
tracker = preparedValues.TrackerCostRemove + preparedValues.TrackerCost.Next; tracker = preparedValues.TrackerCostRemove + preparedValues.TrackerCost.Next;
var tlm = 0m; var tlm = 0m;
if (preparedValues.TLMCost.Next == 0) if (preparedValues.ChangeTLM == false)
tlm = preparedValues.TLMCost.Current; tlm = preparedValues.TLMCost.Current;
else if (preparedValues.TypeChangeTLM == 100000000) else if (preparedValues.TypeChangeTLM == 100000000)
tlm = preparedValues.TLMCost.Current + preparedValues.TLMCost.Next; tlm = preparedValues.TLMCost.Current + preparedValues.TLMCost.Next;

2
EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByIRRAndSumTests.cs
View File

@ -30,7 +30,7 @@ public class CalculateByIRRAndSumTests
Current = new DateTime(2021, 11, 06), Current = new DateTime(2021, 11, 06),
Next = new DateTime(2021, 11, 28) Next = new DateTime(2021, 11, 28)
}, },
ChangeTrackerTLM = false, ChangeTLM = false,
MonthOffset = 0, MonthOffset = 0,
LastPaymentFix = true, LastPaymentFix = true,
FuelCardSum = 0m, FuelCardSum = 0m,

2
EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByTotalExpectedTests.cs
View File

@ -30,7 +30,7 @@ public class CalculateByTotalExpectedTests
Current = new DateTime(2021, 11, 06), Current = new DateTime(2021, 11, 06),
Next = new DateTime(2021, 11, 06) Next = new DateTime(2021, 11, 06)
}, },
ChangeTrackerTLM = false, ChangeTLM = false,
MonthOffset = 0, MonthOffset = 0,
LastPaymentFix = true, LastPaymentFix = true,
FuelCardSum = 0m, FuelCardSum = 0m,

2
EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateDefaultTests.cs
View File

@ -30,7 +30,7 @@ public class CalculateDefaultTests
Current = new DateTime(2021, 11, 06), Current = new DateTime(2021, 11, 06),
Next = new DateTime(2021, 11, 06) Next = new DateTime(2021, 11, 06)
}, },
ChangeTrackerTLM = false, ChangeTLM = false,
MonthOffset = 0, MonthOffset = 0,
LastPaymentFix = true, LastPaymentFix = true,
FuelCardSum = 0m, FuelCardSum = 0m,

4
EvoCalculator.Core.Tests/PostCalculation/v1/Managers/EarlyRedemption.cs
View File

@ -30,7 +30,7 @@ public class EarlyRedemptionTests
Current = new DateTime(2022, 03, 06), Current = new DateTime(2022, 03, 06),
Next = new DateTime(2022, 03, 06) Next = new DateTime(2022, 03, 06)
}, },
ChangeTrackerTLM = false, ChangeTLM = false,
MonthOffset = 0, MonthOffset = 0,
LastPaymentFix = true, LastPaymentFix = true,
FuelCardSum = 0m, FuelCardSum = 0m,
@ -310,7 +310,7 @@ public class EarlyRedemptionTests
Current = new DateTime(2022, 03, 06), Current = new DateTime(2022, 03, 06),
Next = new DateTime(2022, 03, 06) Next = new DateTime(2022, 03, 06)
}, },
ChangeTrackerTLM = false, ChangeTLM = false,
MonthOffset = 0, MonthOffset = 0,
LastPaymentFix = true, LastPaymentFix = true,
FuelCardSum = 0m, FuelCardSum = 0m,

2
EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithChangingTheTermTests.cs
View File

@ -30,7 +30,7 @@ public class PERWithChangingTheTermTests
Current = new DateTime(2021, 11, 06), Current = new DateTime(2021, 11, 06),
Next = new DateTime(2021, 11, 06) Next = new DateTime(2021, 11, 06)
}, },
ChangeTrackerTLM = false, ChangeTLM = false,
MonthOffset = 0, MonthOffset = 0,
LastPaymentFix = true, LastPaymentFix = true,
FuelCardSum = 0m, FuelCardSum = 0m,

2
EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithoutChangingTheTermTests.cs
View File

@ -30,7 +30,7 @@ public class PERWithoutChangingTheTermTests
Current = new DateTime(2021, 11, 06), Current = new DateTime(2021, 11, 06),
Next = new DateTime(2021, 11, 06) Next = new DateTime(2021, 11, 06)
}, },
ChangeTrackerTLM = false, ChangeTLM = false,
MonthOffset = 0, MonthOffset = 0,
LastPaymentFix = true, LastPaymentFix = true,
FuelCardSum = 0m, FuelCardSum = 0m,