1 files changed, 9 insertions, 9 deletions
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);