From ab31d366a5d9e5c6f8e9ce1bcb4e76e9ab46d526 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 16 Mar 2020 16:12:49 +0200
Subject: MS. Statistic Job Runs page. Add "Total Runs: Integer".

---
 .../Models/StatisticsValueCollection.cs                        | 10 +++++-----
 .../Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs |  9 ++++++++-
 .../Tango.MachineStudio.Statistics/Views/JobRunsView.xaml      |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

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 eab4eecde..ef5527406 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
@@ -20,7 +20,7 @@ namespace Tango.MachineStudio.Statistics.Models
     {
         public string Name { get; set; }
 
-        public double Value { get; set; }
+        public object Value { get; set; }
 
         public string Unit { get; set; }
     }
@@ -139,7 +139,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(Color.FromRgb(100, 184, 236));//blue
+            _pieColors.Add(Colors.Yellow);
 
 
             PieJobSource = new LabeledSeriesCollection()
@@ -175,7 +175,7 @@ namespace Tango.MachineStudio.Statistics.Models
         /// <summary>
         /// Adds the statistics value.
         /// </summary>
-        public void AddStatisticsValue(string name, double value, string unit)
+        public void AddStatisticsValue(string name, object value, string unit)
         {
             StatisticsCollection.Add(new StatisticsValue() { Name = name, Value = value, Unit = unit });
             RaisePropertyChanged("StatisticsCollection");
@@ -206,7 +206,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "PPC",
                 Values = new ChartValues<int>() { PPCCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[4]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -274,7 +274,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Solid",
                 Values = new ChartValues<int>() { solidCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[4]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
index ca40273f9..94d06a178 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
@@ -367,6 +367,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         protected void GenerateStatistics()
         {
             StatisticsValueCollection.Clean();
+            GenerateTotalRunsCount();
             GenerateTotalRunsLength();
             GenerateTotalThreadConsumption();
             GenerateRunsDuration();
@@ -377,7 +378,13 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             CreateThreadConsumptionPerThread();
             GenerateAllLiquidQuantities();
         }
-        
+
+        protected void GenerateTotalRunsCount()
+        {//Total Runs: 
+            int val =JobRuns.Where(z => z.JobRun.EndPosition > 0).Count();
+            StatisticsValueCollection.AddStatisticsValue("Total Runs ", val, " ");
+        }
+
         /// <summary>
         /// Generates the total length of the job runs.
         /// </summary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
index ecc846903..af363b32a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/JobRunsView.xaml
@@ -554,7 +554,7 @@
                                     <StackPanel Orientation="Horizontal" Margin="0 3">
                                         <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
                                         <TextBlock Text=": "/>
-                                        <TextBlock Text="{Binding Value, StringFormat={}{0:0.00}}"/>
+                                        <TextBlock Text="{Binding Value, StringFormat={}{0:#,0.##}}"/>
                                         <TextBlock Text="{Binding Unit}"/>
                                     </StackPanel>
                                 </DataTemplate>
-- 
cgit v1.3.1