From 648437dec6e56e32218d88b7a85e70ac00b6e98a Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 22 Oct 2023 13:54:49 +0300 Subject: Changed Number of Spools in Converters and GUI PPC. --- Software/Visual_Studio/Tango.BL/Entities/Job.cs | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'Software/Visual_Studio/Tango.BL') diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs index 29f7e1054..328d74f0c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs @@ -99,9 +99,9 @@ namespace Tango.BL.Entities { get { - if (Spools >= 4) + if (NumberOfSpools >= 4) { - return LengthIncludingNumberOfUnits * Spools; + return LengthIncludingNumberOfUnits * NumberOfSpools; } return LengthIncludingNumberOfUnits; @@ -129,9 +129,9 @@ namespace Tango.BL.Entities { get { - if (Spools >= 4) + if (NumberOfSpools >= 4) { - return WeightIncludingNumberOfUnits * Spools; + return WeightIncludingNumberOfUnits * NumberOfSpools; } return WeightIncludingNumberOfUnits; @@ -144,9 +144,9 @@ namespace Tango.BL.Entities { get { - if (Spools >= 4) + if (NumberOfSpools >= 4) { - return NumberOfUnits * Spools; + return NumberOfUnits * NumberOfSpools; } return NumberOfUnits; } @@ -218,14 +218,7 @@ namespace Tango.BL.Entities RaisePropertyChangedAuto(); } } - - [NotMapped] - [JsonIgnore] - public int Spools - { - get { return 4; }//headunits? - } - + /// /// Gets or sets the effective segments. /// -- cgit v1.3.1