Some improvements to job runs.

1 files changed, 19 insertions, 7 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 3aa93cd3e..6be0948a9 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
@@ -347,7 +347,13 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                                 x.Status,
                                 x.UploadingStartDate,
                                 x.UserGuid,
-                                x.LiquidQuantityString,
+                                x.CyanQuantity,
+                                x.MagentaQuantity,
+                                x.YellowQuantity,
+                                x.BlackQuantity,
+                                x.TransparentQuantity,
+                                x.LubricantQuantity,
+                                x.CleanerQuantity
                             });
 
 
@@ -405,7 +411,13 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                                 Status = x.Status,
                                 UploadingStartDate = x.UploadingStartDate,
                                 UserGuid = x.UserGuid,
-                                LiquidQuantityString = x.LiquidQuantityString,
+                                CyanQuantity = x.CyanQuantity,
+                                MagentaQuantity = x.MagentaQuantity,
+                                YellowQuantity = x.YellowQuantity,
+                                BlackQuantity = x.BlackQuantity,
+                                TransparentQuantity = x.TransparentQuantity,
+                                LubricantQuantity = x.LubricantQuantity,
+                                CleanerQuantity = x.CleanerQuantity
                             }).ToList();
 
                         var modelList = runs.Select(x => new JobRunModel()
@@ -482,8 +494,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                 val = selection.Sum(x => (x.JobRun.EndDate - x.JobRun.ActualStartDate).Value.TotalHours);
                 average = selection.Average(x => (x.JobRun.EndDate - x.JobRun.ActualStartDate).Value.TotalMilliseconds);
             }
-            StatisticsValueCollection.AddStatisticsValue("Total Runs Duration", val, " hours");
-            StatisticsValueCollection.AddStatisticsValue("Average Runs Duration", Math.Max(TimeSpan.FromMilliseconds(average).TotalHours, 0), " hours");
+            StatisticsValueCollection.AddStatisticsValue("Total Dyeing Time", val, " hours");
+            StatisticsValueCollection.AddStatisticsValue("Total Dyeing Time", Math.Max(TimeSpan.FromMilliseconds(average).TotalHours, 0), " hours");
         }
 
         /// <summary>
@@ -510,7 +522,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("Actual Total Runs Length", val, " m");
+            StatisticsValueCollection.AddStatisticsValue("Total Dyeing Length", val, " m");
         }
 
         /// <summary>
@@ -548,7 +560,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         /// </summary>
         protected void GenerateAllLiquidQuantities()
         {
-            var runs = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.JobRun.LiquidQuantities.Count > 0).ToList();
+            var runs = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.JobRun.LiquidQuantitiesFast.Count > 0).ToList();
 
             Dictionary<LiquidTypes, ulong> total_quantities = new Dictionary<LiquidTypes, ulong>();
 
@@ -559,7 +571,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
 
             foreach (var run in runs)
             {
-                foreach (var lq in run.JobRun.LiquidQuantities)
+                foreach (var lq in run.JobRun.LiquidQuantitiesFast)
                 {
                     if (lq.Quantity < 0)
                     {