Final touches on X1.

1 files changed, 12 insertions, 1 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
index a45f65a54..85b7002a5 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
@@ -8,6 +8,7 @@ using System.Data.Entity;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -507,6 +508,7 @@ namespace Tango.FSE.Statistics.ViewModels
                 SeriesCollection seriesCollection = new SeriesCollection();
 
                 List<LiquidQuantityModel> liquidQuantities = new List<LiquidQuantityModel>();
+                Dictionary<LiquidTypes, PropertyInfo> jobRunProperties = new Dictionary<LiquidTypes, PropertyInfo>();
 
                 foreach (var liquidType in _liquidTypes.ToList())
                 {
@@ -515,13 +517,22 @@ namespace Tango.FSE.Statistics.ViewModels
                         LiquidType = liquidType,
                         Quantity = 0
                     });
+
+                    jobRunProperties.Add(liquidType.Type, typeof(JobRunDTO).GetProperty(liquidType.Type.ToString() + "Quantity"));
                 }
 
                 foreach (var stop in Stops)
                 {
                     foreach (var quantity in liquidQuantities)
                     {
-                        quantity.Quantity += (double)typeof(JobRun).GetProperty(quantity.LiquidType.Type.ToString() + "Quantity").GetValue(stop.JobRun);
+                        try
+                        {
+                            quantity.Quantity += (double)jobRunProperties[quantity.LiquidType.Type].GetValue(stop.JobRun);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, $"Error on summaries for liquid type {quantity.LiquidType.Type}.");
+                        }
                     }
                 }