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

2 files changed, 35 insertions, 13 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
index ef5527406..b5615e4d1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/StatisticsValueCollection.cs
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.Statistics.Models
         public string Text { get; set; }
     }
 
-    public class StatisticsValueCollection: ExtendedObject
+    public class StatisticsValueCollection : ExtendedObject
     {
         private List<Color> _pieColors;
 
@@ -43,7 +43,9 @@ namespace Tango.MachineStudio.Statistics.Models
         public ObservableCollection<StatisticsValue> StatisticsCollection
         {
             get { return _statisticsCollection; }
-            set { _statisticsCollection = value;
+            set
+            {
+                _statisticsCollection = value;
                 RaisePropertyChangedAuto();
             }
         }
@@ -96,18 +98,18 @@ namespace Tango.MachineStudio.Statistics.Models
             set { _pieGradientSolid = value; RaisePropertyChangedAuto(); }
         }
 
-        private List<JobRunLiquidQuantity> _liquidQuantities;
+        private List<TotalLiquidQuantityModel> _liquidQuantities;
 
         /// <summary>
         /// Gets or sets the liquid quantities.
         /// </summary>
-        public List<JobRunLiquidQuantity> LiquidQuantities
+        public List<TotalLiquidQuantityModel> LiquidQuantities
         {
             get
             {
                 if (_liquidQuantities == null)
                 {
-                    _liquidQuantities = new List<JobRunLiquidQuantity>();
+                    _liquidQuantities = new List<TotalLiquidQuantityModel>();
                 }
                 return _liquidQuantities;
             }
@@ -115,12 +117,12 @@ namespace Tango.MachineStudio.Statistics.Models
             { _liquidQuantities = value; RaisePropertyChangedAuto(); }
         }
 
-        private int _totalLiquidQuantities;
+        private ulong _totalLiquidQuantities;
 
         /// <summary>
         /// Gets or sets the total liquid quantities.
         /// </summary>
-        public int TotalLiquidQuantities
+        public ulong TotalLiquidQuantities
         {
             get { return _totalLiquidQuantities; }
             set { _totalLiquidQuantities = value; RaisePropertyChangedAuto(); }
@@ -139,7 +141,7 @@ namespace Tango.MachineStudio.Statistics.Models
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["OrangeBrush"]).Color);
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["GreenBrush"]).Color);
             _pieColors.Add(((SolidColorBrush)Application.Current.Resources["BlueBrush100"]).Color);
-            _pieColors.Add(Colors.Yellow);
+            _pieColors.Add(Color.FromRgb(255, 216, 76));
 
 
             PieJobSource = new LabeledSeriesCollection()
@@ -214,7 +216,7 @@ namespace Tango.MachineStudio.Statistics.Models
             };
 
             PieJobSource.SeriesCollection.Add(series);
-            
+
             series = new PieSeries()
             {
                 Title = "MS",
@@ -250,7 +252,7 @@ namespace Tango.MachineStudio.Statistics.Models
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint,
-               
+
             };
             PieJobRunStatus.SeriesCollection.Add(series);
 
@@ -294,7 +296,7 @@ namespace Tango.MachineStudio.Statistics.Models
 
             PieGradientSolid.SeriesCollection.Add(series);
 
-            
+
             RaisePropertyChanged("PieGradientSolid");
         }
         #endregion
@@ -302,10 +304,15 @@ namespace Tango.MachineStudio.Statistics.Models
         /// <summary>
         /// Generates the statistics liquid quantity and TotalLiquidQuantities.
         /// </summary>
-        public void GenerateStatisticsLiquidQuantity(List<JobRunLiquidQuantity> liquidQuantities)
+        public void GenerateStatisticsLiquidQuantity(List<TotalLiquidQuantityModel> liquidQuantities)
         {
             LiquidQuantities = liquidQuantities;
-            TotalLiquidQuantities = liquidQuantities.Sum(x => x.Quantity);
+            TotalLiquidQuantities = 0;
+
+            foreach (var item in liquidQuantities)
+            {
+                TotalLiquidQuantities += (ulong)item.Quantity;
+            }
         }
 
     }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs
new file mode 100644
index 000000000..b5e2e9fb7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Enumerations;
+
+namespace Tango.MachineStudio.Statistics.Models
+{
+    public class TotalLiquidQuantityModel
+    {
+        public LiquidTypes LiquidType { get; set; }
+        public ulong Quantity { get; set; }
+    }
+}