Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

3 files changed, 53 insertions, 14 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs
index c5e13a569..feb789ffe 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs
@@ -309,5 +309,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// number of spools
+        /// </summary>
+        public Int32 NumberOfSpools 
+        {
+            get; set; 
+        }
+
     }
 }
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?
-        }
-
+        
         /// <summary>
         /// Gets or sets the effective segments.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs
index f37848b5e..83912de98 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs
@@ -83,6 +83,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Int32> VersionChanged;
 
+        public event EventHandler<Int32> NumberOfSpoolsChanged;
+
         public event EventHandler<ColorCatalog> ColorCatalogChanged;
 
         public event EventHandler<ColorSpace> ColorSpaceChanged;
@@ -1079,6 +1081,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Int32 _numberofspools;
+
+        /// <summary>
+        /// Gets or sets the jobbase number of spools.
+        /// </summary>
+
+        [Column("NUMBER_OF_SPOOLS")]
+
+        public  Int32 NumberOfSpools
+        {
+            get 
+            {
+                return _numberofspools; 
+            }
+
+            set 
+            {
+                if (_numberofspools != value)
+                {
+                    _numberofspools = value;
+
+                    OnNumberOfSpoolsChanged(value);
+
+                }
+            }
+        }
+
         protected ColorCatalog _colorcatalog;
 
         /// <summary>
@@ -1638,6 +1667,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the NumberOfSpools has changed.
+        /// </summary>
+        protected virtual void OnNumberOfSpoolsChanged(Int32 numberofspools)
+        {
+            NumberOfSpoolsChanged?.Invoke(this, numberofspools);
+            RaisePropertyChanged(nameof(NumberOfSpools));
+        }
+
+        /// <summary>
         /// Called when the ColorCatalog has changed.
         /// </summary>
         protected virtual void OnColorCatalogChanged(ColorCatalog colorcatalog)