Machine Studio. Statistics Job Runs page, change colors of pies, a little changes in GUI.

3 files changed, 27 insertions, 23 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 2ad165d79..287e09009 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
@@ -11,6 +11,8 @@ using System.Windows.Media;
 using Tango.BL.Enumerations;
 using Tango.BL.ValueObjects;
 using Tango.Core;
+using System.Windows.Media;
+using System.Windows;
 
 namespace Tango.MachineStudio.Statistics.Models
 {
@@ -133,8 +135,10 @@ namespace Tango.MachineStudio.Statistics.Models
             ThreadConsumptionPerThreadCollection = new CompositeCollection();
 
             _pieColors = new List<Color>();
-            _pieColors.Add(Color.FromRgb(239, 131, 43));//green
-            _pieColors.Add(Color.FromRgb(144, 233, 144));//orange
+            _pieColors.Add(((SolidColorBrush)Application.Current.Resources["RedBrush100"]).Color);
+            _pieColors.Add(((SolidColorBrush)Application.Current.Resources["OrangeBrush300"]).Color);
+            _pieColors.Add(((SolidColorBrush)Application.Current.Resources["GreenBrush300"]).Color);
+            _pieColors.Add(((SolidColorBrush)Application.Current.Resources["BlueBrush100"]).Color);
             _pieColors.Add(Color.FromRgb(100, 184, 236));//blue
 
 
@@ -202,7 +206,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "PPC",
                 Values = new ChartValues<int>() { PPCCount },
-                Fill = new SolidColorBrush(_pieColors[0]),
+                Fill = new SolidColorBrush(_pieColors[2]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -215,7 +219,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "MS",
                 Values = new ChartValues<int>() { MSCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[3]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -242,7 +246,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Aborted",
                 Values = new ChartValues<int>() { abortedCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[1]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint,
@@ -254,7 +258,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Completed",
                 Values = new ChartValues<int>() { completedCount },
-                Fill = new SolidColorBrush(_pieColors[1]),
+                Fill = new SolidColorBrush(_pieColors[2]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -270,7 +274,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Solid",
                 Values = new ChartValues<int>() { solidCount },
-                Fill = new SolidColorBrush(_pieColors[0]),
+                Fill = new SolidColorBrush(_pieColors[2]),
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint
@@ -281,7 +285,7 @@ namespace Tango.MachineStudio.Statistics.Models
             {
                 Title = "Gradient",
                 Values = new ChartValues<int>() { gradientCount },
-                Fill = new SolidColorBrush(_pieColors[2]),
+                Fill = new SolidColorBrush(_pieColors[3]),
                 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 ed7bbec56..ca40273f9 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
@@ -368,10 +368,10 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         {
             StatisticsValueCollection.Clean();
             GenerateTotalRunsLength();
+            GenerateTotalThreadConsumption();
             GenerateRunsDuration();
             GenerateAverageUploadDuration();
             GenerateAverageHeatingDuration();
-            GenerateTotalThreadConsumption();
 
             GeneratePieCharts();
             CreateThreadConsumptionPerThread();
@@ -395,8 +395,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             var selection = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.JobRun.EndDate != null && z.JobRun.ActualStartDate != null);
             double val = selection.Sum(x => (x.JobRun.EndDate - x.JobRun.ActualStartDate).Value.TotalHours);
             StatisticsValueCollection.AddStatisticsValue("Total Runs Duration", val, " hours");
-            double average = selection.Average(x => (x.JobRun.EndDate - x.JobRun.ActualStartDate).Value.TotalHours);
-            StatisticsValueCollection.AddStatisticsValue("Average Runs Duration", average, " hours");
+            double average = selection.Average(x => (x.JobRun.EndDate - x.JobRun.ActualStartDate).Value.TotalMilliseconds);
+            StatisticsValueCollection.AddStatisticsValue("Average Runs Duration", Math.Max(TimeSpan.FromMilliseconds(average).TotalHours, 0), " hours");
         }
 
         /// <summary>
@@ -404,8 +404,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         /// </summary>
         protected void GenerateAverageUploadDuration()
         {
-            var val = (long)JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.UploadDuration != null).Average(x => x.UploadDuration.Value.TotalMilliseconds);
-            StatisticsValueCollection.AddStatisticsValue("Average Upload Duration", Math.Max(TimeSpan.FromMilliseconds(val).TotalMinutes, 0), " minutes");
+            var average = (long)JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.UploadDuration != null).Average(x => x.UploadDuration.Value.TotalMilliseconds);
+            StatisticsValueCollection.AddStatisticsValue("Average Upload Duration", Math.Max(TimeSpan.FromMilliseconds(average).TotalMinutes, 0), " minutes");
         }
 
         /// <summary>
@@ -413,8 +413,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         /// </summary>
         protected void GenerateAverageHeatingDuration()
         {
-            var average = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.HeatingDuration != null && z.HeatingDuration.Value.Ticks > 0).Average(x => x.HeatingDuration.Value.TotalMinutes);
-            StatisticsValueCollection.AddStatisticsValue("Average Heating Duration", Math.Max(average, 0), " minutes");
+            var average = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.HeatingDuration != null && z.HeatingDuration.Value.Ticks > 0).Average(x => x.HeatingDuration.Value.TotalMilliseconds);
+            StatisticsValueCollection.AddStatisticsValue("Average Heating Duration", Math.Max(TimeSpan.FromMilliseconds(average).TotalMinutes, 0), " minutes");
         }
 
         /// <summary>
@@ -423,7 +423,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         protected void GenerateTotalThreadConsumption()
         {
             double val = JobRuns.Where(z => z.JobRun.EndPosition > 0).Sum(x => x.JobRun.EndPosition);
-            StatisticsValueCollection.AddStatisticsValue("Total Thread Consumption", val, " m");
+            StatisticsValueCollection.AddStatisticsValue("Actual Total Runs Length", val, " m");
         }
 
         /// <summary>
@@ -466,7 +466,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
 
             foreach (LiquidTypes ltype in (LiquidTypes[])Enum.GetValues(typeof(LiquidTypes)))
             {
-                var liquidQuantityByTypeList = db_liquidQuantities.Select(x => x.SingleOrDefault(y => y.LiquidType == ltype)).Where(x => x != null);
+                var liquidQuantityByTypeList = db_liquidQuantities.Select(x => x.FirstOrDefault(y => y.LiquidType == ltype)).Where(x => x != null);
                 var count = liquidQuantityByTypeList != null ? liquidQuantityByTypeList.Sum(x => x.Quantity) : 0;
                 JobRunLiquidQuantity lq = new JobRunLiquidQuantity() { LiquidType = ltype, Quantity = count };
                 allLiquidQuantities.Add(lq);
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 58d94aca1..057647858 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
@@ -552,7 +552,7 @@
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <TextBlock Text="{Binding Name}"/>
+                                        <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
                                         <TextBlock Text=": "/>
                                         <TextBlock Text="{Binding Value, StringFormat={}{0:0.00}}"/>
                                         <TextBlock Text="{Binding Unit}"/>
@@ -560,7 +560,7 @@
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
                         </ItemsControl>
-                        <TextBlock Margin="0 10 0 0" Text="Total Thread Consumption per thread:">
+                        <TextBlock Margin="0 10 0 0" Text="Total Thread Consumption per thread:" FontWeight="SemiBold">
                             <TextBlock.Style>
                                 <Style TargetType="TextBlock">
                                     <Setter Property="Visibility" Value="Visible" />
@@ -581,7 +581,7 @@
                             <ItemsControl.Resources>
                                 <DataTemplate DataType="{x:Type model:StatisticsValue}">
                                     <StackPanel Orientation="Horizontal">
-                                        <TextBlock Text="{Binding Name}"/>
+                                        <TextBlock Text="{Binding Name}" FontWeight="SemiBold"/>
                                         <TextBlock Text=": "/>
                                         <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/>
                                         <TextBlock Text="{Binding Unit}"/>
@@ -597,7 +597,7 @@
                                                             <ItemsControl.ItemTemplate>
                                                                 <DataTemplate>
                                                                     <StackPanel Orientation="Horizontal" Margin="2">
-                                                                        <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                                        <TextBlock Margin="5 0 0 0" Text="{Binding Name}" FontWeight="SemiBold"/>
                                                                         <TextBlock Text=": "/>
                                                                         <TextBlock Text="{Binding Value, StringFormat={}{0:0.0}}"/>
                                                                         <TextBlock Text="{Binding Unit}"/>
@@ -666,7 +666,7 @@
                                             </Ellipse.Fill>
                                         </Ellipse>
                                         <StackPanel Orientation="Vertical" Margin="4">
-                                            <TextBlock Text="{Binding LiquidType,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
+                                            <TextBlock Text="{Binding LiquidType,Converter={StaticResource EnumToDescriptionConverter}}" FontWeight="SemiBold"></TextBlock>
                                             <TextBlock >
                                              <Run Text="{Binding Quantity, Converter={StaticResource NanoLiterToLiterFormatConverter}}"></Run>
                                             <Run Text=" liters"></Run>
@@ -677,7 +677,7 @@
                         </ItemsControl.ItemTemplate>
                         </ItemsControl>
                         <TextBlock DockPanel.Dock="Bottom" Margin="4 10 0 0 ">
-                            <Run Text="Total liquid quantities for all: "/>
+                            <Run Text="Total liquid quantities for all: " FontWeight="SemiBold"/>
                             <Run Text="{Binding StatisticsValueCollection.TotalLiquidQuantities, Converter={StaticResource NanoLiterToLiterFormatConverter}}"></Run>
                             <Run Text=" liters"></Run>
                             <TextBlock.Style>