Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

8 files changed, 197 insertions, 49 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs
index b730d7881..cd928d9c9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/JobLengthConverter.cs
@@ -19,7 +19,13 @@ namespace Tango.MachineStudio.Statistics.Converters
                     double length = (double)values[0];
                     double endPoint = (double)values[1];
                     double width = (double)values[2];
-                    return Math.Round((endPoint / length) * width, MidpointRounding.AwayFromZero);
+                    var v = Math.Round((endPoint / length) * width, MidpointRounding.AwayFromZero);
+
+                    if (double.IsInfinity(v))
+                    {
+                        return 0d;
+                    }
+                    return v;
                 }
             }
             catch { }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs
index 23d7564e8..32050cdb1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Converters/NanoLiterToLiterFormatConverter.cs
@@ -12,13 +12,14 @@ namespace Tango.MachineStudio.Statistics.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-           try
-           {
-                double val =(double) ((int)value) / 1000000000;
-                return val.ToString("N2", CultureInfo.InvariantCulture);
-           }
-           catch{ }
-          
+            try
+            {
+                var longValue = System.Convert.ToUInt64(value.ToString());
+                double val = (longValue / 1000000000d);
+                return val.ToString("0.0");
+            }
+            catch { }
+
             return "";
         }
 
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 ef5527406..b5615e4d1 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
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.Statistics.Models
         public string Text { get; set; }
     }
 
-    public class StatisticsValueCollection: ExtendedObject
+    public class StatisticsValueCollection : ExtendedObject
     {
         private List<Color> _pieColors;
 
@@ -43,7 +43,9 @@ namespace Tango.MachineStudio.Statistics.Models
         public ObservableCollection<StatisticsValue> StatisticsCollection
         {
             get { return _statisticsCollection; }
-            set { _statisticsCollection = value;
+            set
+            {
+                _statisticsCollection = value;
                 RaisePropertyChangedAuto();
             }
         }
@@ -96,18 +98,18 @@ namespace Tango.MachineStudio.Statistics.Models
             set { _pieGradientSolid = value; RaisePropertyChangedAuto(); }
         }
 
-        private List<JobRunLiquidQuantity> _liquidQuantities;
+        private List<TotalLiquidQuantityModel> _liquidQuantities;
 
         /// <summary>
         /// Gets or sets the liquid quantities.
         /// </summary>
-        public List<JobRunLiquidQuantity> LiquidQuantities
+        public List<TotalLiquidQuantityModel> LiquidQuantities
         {
             get
             {
                 if (_liquidQuantities == null)
                 {
-                    _liquidQuantities = new List<JobRunLiquidQuantity>();
+                    _liquidQuantities = new List<TotalLiquidQuantityModel>();
                 }
                 return _liquidQuantities;
             }
@@ -115,12 +117,12 @@ namespace Tango.MachineStudio.Statistics.Models
             { _liquidQuantities = value; RaisePropertyChangedAuto(); }
         }
 
-        private int _totalLiquidQuantities;
+        private ulong _totalLiquidQuantities;
 
         /// <summary>
         /// Gets or sets the total liquid quantities.
         /// </summary>
-        public int TotalLiquidQuantities
+        public ulong TotalLiquidQuantities
         {
             get { return _totalLiquidQuantities; }
             set { _totalLiquidQuantities = value; RaisePropertyChangedAuto(); }
@@ -139,7 +141,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(Colors.Yellow);
+            _pieColors.Add(Color.FromRgb(255, 216, 76));
 
 
             PieJobSource = new LabeledSeriesCollection()
@@ -214,7 +216,7 @@ namespace Tango.MachineStudio.Statistics.Models
             };
 
             PieJobSource.SeriesCollection.Add(series);
-            
+
             series = new PieSeries()
             {
                 Title = "MS",
@@ -250,7 +252,7 @@ namespace Tango.MachineStudio.Statistics.Models
                 DataLabels = true,
                 ToolTip = "",
                 LabelPoint = labelPoint,
-               
+
             };
             PieJobRunStatus.SeriesCollection.Add(series);
 
@@ -294,7 +296,7 @@ namespace Tango.MachineStudio.Statistics.Models
 
             PieGradientSolid.SeriesCollection.Add(series);
 
-            
+
             RaisePropertyChanged("PieGradientSolid");
         }
         #endregion
@@ -302,10 +304,15 @@ namespace Tango.MachineStudio.Statistics.Models
         /// <summary>
         /// Generates the statistics liquid quantity and TotalLiquidQuantities.
         /// </summary>
-        public void GenerateStatisticsLiquidQuantity(List<JobRunLiquidQuantity> liquidQuantities)
+        public void GenerateStatisticsLiquidQuantity(List<TotalLiquidQuantityModel> liquidQuantities)
         {
             LiquidQuantities = liquidQuantities;
-            TotalLiquidQuantities = liquidQuantities.Sum(x => x.Quantity);
+            TotalLiquidQuantities = 0;
+
+            foreach (var item in liquidQuantities)
+            {
+                TotalLiquidQuantities += (ulong)item.Quantity;
+            }
         }
 
     }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs
new file mode 100644
index 000000000..b5e2e9fb7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/TotalLiquidQuantityModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Enumerations;
+
+namespace Tango.MachineStudio.Statistics.Models
+{
+    public class TotalLiquidQuantityModel
+    {
+        public LiquidTypes LiquidType { get; set; }
+        public ulong Quantity { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Tango.MachineStudio.Statistics.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Tango.MachineStudio.Statistics.csproj
index adac4bb9f..f77dbd482 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Tango.MachineStudio.Statistics.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Tango.MachineStudio.Statistics.csproj
@@ -84,6 +84,7 @@
     <Compile Include="Converters\NanoLiterToLiterFormatConverter.cs" />
     <Compile Include="Converters\StringToBoolYesNoNullConverter.cs" />
     <Compile Include="Converters\StringToFirstLetterConverter.cs" />
+    <Compile Include="Models\TotalLiquidQuantityModel.cs" />
     <Compile Include="Models\JobRunModel.cs" />
     <Compile Include="Models\JobRunStatisticsModel.cs" />
     <Compile Include="Models\LabeledSeriesCollection.cs" />
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 94d06a178..800346ff9 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
@@ -20,6 +20,7 @@ using System.Windows.Media;
 using LiveCharts.Wpf;
 using LiveCharts;
 using Tango.BL.ValueObjects;
+using System.Diagnostics;
 
 namespace Tango.MachineStudio.Statistics.ViewModels
 {
@@ -81,7 +82,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         public DateTime StartSelectedDate
         {
             get { return _startSelectedDate; }
-            set { _startSelectedDate = value; RaisePropertyChangedAuto(); }
+            set { _startSelectedDate = value;
+                RaisePropertyChangedAuto(); }
         }
 
         private DateTime _endSelectedDate;
@@ -318,21 +320,104 @@ namespace Tango.MachineStudio.Statistics.ViewModels
 
                     using (var db = ObservablesContext.CreateDefault())
                     {
-                        DateTime startUtc = StartSelectedDate.ToUniversalTime();
+                        DateTime startUtc = new DateTime(StartSelectedDate.Year, StartSelectedDate.Month, StartSelectedDate.Day, 0, 0, 0).ToUniversalTime();
                         TimeSpan offsetTime = (EndSelectedDate.Date == DateTime.Now.Date) ? DateTime.Now.TimeOfDay : new TimeSpan(23, 59, 59);
                         DateTime endUtc = EndSelectedDate.ToUniversalTime() + offsetTime;
+
                         string jobName = SelectedJob == null ? "" : SelectedJob.Name;
+                        
+                        var db_JobRuns = db.JobRuns.Where(x => (x.StartDate <= endUtc && x.StartDate >= startUtc))
+                            .Select(x => new
+                            {
+                                x.ID,
+                                x.ActualStartDate,
+                                x.EndDate,
+                                x.EndPosition,
+                                x.GradientResolutionCm,
+                                x.Guid,
+                                x.HeatingStartDate,
+                                x.IsGradient,
+                                x.JobGuid,
+                                x.JobLength,
+                                x.JobName,
+                                x.JobSource,
+                                x.MachineGuid,
+                                x.RmlGuid,
+                                x.StartDate,
+                                x.Status,
+                                x.UploadingStartDate,
+                                x.UserGuid,
+                                x.CyanQuantity,
+                                x.MagentaQuantity,
+                                x.YellowQuantity,
+                                x.BlackQuantity,
+                                x.TransparentQuantity,
+                                x.LubricantQuantity,
+                                x.CleanerQuantity
+                            });
+                        var machineIDs = new HashSet<string>(SelectedMachines.SynchedSource.ToList().Select(p => p.Guid));
+                        if (machineIDs.Count > 0)
+                        {
+                            db_JobRuns = db_JobRuns.Where(x => machineIDs.Contains(x.MachineGuid));
+                        }
+                        int[] jobRunSourceArr = JobRunSelectedSources.SynchedSource.Select(x => (int)x).ToArray();
+                        if (jobRunSourceArr.Length > 0)
+                        {
+                            db_JobRuns = db_JobRuns.Where(x => jobRunSourceArr.Contains(x.JobSource));
+                        }
+                        int[] jobRunStatusArr = JobRunSelectedStatuses.SynchedSource.Select(x => (int)x).ToArray();
+                        if (jobRunStatusArr.Length > 0)
+                        {
+                            db_JobRuns = db_JobRuns.Where(x => jobRunStatusArr.Contains(x.Status));
+                        }
+                        bool[] isGradientArr = IsGradientSelection.SynchedSource.Select(x => (bool)x).ToArray();
+                        if (isGradientArr.Length > 0)
+                        {
+                            db_JobRuns = db_JobRuns.Where(x => isGradientArr.Contains(x.IsGradient));
+                        }
+                        List<String> rmlGuids = SelectedThreads.SynchedSource.Select(y => y.Guid).ToList();
+                        if (rmlGuids != null && rmlGuids.Count > 0)
+                        {
+                            db_JobRuns = db_JobRuns.Where(x => rmlGuids.Contains(x.RmlGuid));
+                        }
+                        if (!String.IsNullOrEmpty(jobName))
+                        {
+                            db_JobRuns = db_JobRuns.Where(x => x.JobName.ToLower().StartsWith(jobName.ToLower()));
+                        }
+
+                        var runs_db = await db_JobRuns.ToListAsync(); //Execute actual query.
 
-                        var runs = await new JobRunsCollectionBuilder(db).Set(x => x.StartDate <= DbFunctions.TruncateTime(endUtc) && x.StartDate >= DbFunctions.TruncateTime(startUtc.Date))
-                        .WithMachines(SelectedMachines.SynchedSource.ToList())
-                        .WithJobSource(JobRunSelectedSources.SynchedSource)
-                        .WithJobStatus(JobRunSelectedStatuses.SynchedSource)
-                        .WithGradient(IsGradientSelection.SynchedSource)
-                        .WithRmls(SelectedThreads.SynchedSource.Select(x => x.Guid).ToList())
-                        .Query(y => y.Where(x => (String.IsNullOrEmpty(jobName) || x.JobName.ToLower().StartsWith(jobName.ToLower()))
-                                                && (x.JobLength < LengthUpperValue && x.JobLength >= LengthLowerValue)))
-                        .BuildListAsync();
 
+                        List<JobRun> runs = runs_db.Where(x => (x.JobLength < LengthUpperValue && x.JobLength >= LengthLowerValue))
+                            .Select(x => new JobRun()
+                            {
+                                ID = x.ID,
+                                ActualStartDate = x.ActualStartDate,
+                                EndDate = x.EndDate,
+                                EndPosition = x.EndPosition,
+                                GradientResolutionCm = x.GradientResolutionCm,
+                                Guid = x.Guid,
+                                HeatingStartDate = x.HeatingStartDate,
+                                IsGradient = x.IsGradient,
+                                JobGuid = x.JobGuid,
+                                JobLength = x.JobLength,
+                                JobName = x.JobName,
+                                JobSource = x.JobSource,
+                                MachineGuid = x.MachineGuid,
+                                RmlGuid = x.RmlGuid,
+                                StartDate = x.StartDate,
+                                Status = x.Status,
+                                UploadingStartDate = x.UploadingStartDate,
+                                UserGuid = x.UserGuid,
+                                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()
                         {
                             JobRun = x,
@@ -367,6 +452,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         protected void GenerateStatistics()
         {
             StatisticsValueCollection.Clean();
+            if (JobRuns.Count() == 0)
+                return;
             GenerateTotalRunsCount();
             GenerateTotalRunsLength();
             GenerateTotalThreadConsumption();
@@ -381,7 +468,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
 
         protected void GenerateTotalRunsCount()
         {//Total Runs: 
-            int val =JobRuns.Where(z => z.JobRun.EndPosition > 0).Count();
+            int val = JobRuns.Count();
             StatisticsValueCollection.AddStatisticsValue("Total Runs ", val, " ");
         }
 
@@ -400,10 +487,15 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         protected void GenerateRunsDuration()
         {
             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.TotalMilliseconds);
-            StatisticsValueCollection.AddStatisticsValue("Average Runs Duration", Math.Max(TimeSpan.FromMilliseconds(average).TotalHours, 0), " hours");
+            double val = 0d;
+            double average = 0d;
+            if (selection != null && selection.Count<JobRunModel>() > 0)
+            {
+                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 Dyeing Time", val, " hours");
+            StatisticsValueCollection.AddStatisticsValue("Total Dyeing Time", Math.Max(TimeSpan.FromMilliseconds(average).TotalHours, 0), " hours");
         }
 
         /// <summary>
@@ -430,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>
@@ -468,16 +560,42 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         /// </summary>
         protected void GenerateAllLiquidQuantities()
         {
-            var db_liquidQuantities = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.JobRun.LiquidQuantities.Count > 0).Select(y => y.JobRun.LiquidQuantities).ToList();
-            List<JobRunLiquidQuantity> allLiquidQuantities = new List<JobRunLiquidQuantity>();
+            var runs = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.JobRun.LiquidQuantitiesFast.Count > 0).ToList();
+
+            Dictionary<LiquidTypes, ulong> total_quantities = new Dictionary<LiquidTypes, ulong>();
 
             foreach (LiquidTypes ltype in (LiquidTypes[])Enum.GetValues(typeof(LiquidTypes)))
             {
-                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);
+                total_quantities[ltype] = 0;
+            }
+
+            foreach (var run in runs)
+            {
+                foreach (var lq in run.JobRun.LiquidQuantitiesFast)
+                {
+                    if (lq.Quantity < 0)
+                    {
+                        Debug.WriteLine($"Warning: JobRun '{run.JobRun.ID}' contains an invalid value '{lq.Quantity}' for {lq.LiquidType} quantity.");
+                    }
+
+                    total_quantities[lq.LiquidType] += Convert.ToUInt64(Math.Max(lq.Quantity, 0));
+                }
             }
+
+            List<TotalLiquidQuantityModel> allLiquidQuantities = total_quantities.Select(x => new TotalLiquidQuantityModel()
+            {
+                LiquidType = x.Key,
+                Quantity = x.Value
+            }).ToList();
+
+
+            //foreach (LiquidTypes ltype in (LiquidTypes[])Enum.GetValues(typeof(LiquidTypes)))
+            //{
+            //    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);
+            //}
             StatisticsValueCollection.GenerateStatisticsLiquidQuantity(allLiquidQuantities);
         }
         #endregion
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 af363b32a..6431d72fb 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
@@ -326,7 +326,7 @@
                             </StackPanel>
                         </StackPanel>
                     </Grid>
-                    <Button Grid.Column="1" HorizontalAlignment="Right" Command="{Binding LoadJobRunsCommand}"  Margin="0 0 10 0" Padding="70 15" Height="Auto" VerticalAlignment="Center">RUN</Button>
+                    <Button Grid.Column="1" HorizontalAlignment="Right" Command="{Binding LoadJobRunsCommand}"  Margin="0 0 10 0" Padding="70 15" Height="Auto" VerticalAlignment="Center">ANALYZE</Button>
                 </Grid>
             </Border>
         </Grid>
@@ -466,7 +466,7 @@
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="1*" MaxWidth="200"/>
                                 </Grid.ColumnDefinitions>
-                                <ItemsControl ItemsSource="{Binding JobRun.LiquidQuantities,Mode=OneWay}" Margin="0 0 0 0" Height="70">
+                                <ItemsControl ItemsSource="{Binding JobRun.LiquidQuantitiesFast,Mode=OneWay}" Margin="0 0 0 0" Height="70">
                                 <ItemsControl.ItemContainerStyle>
                                     <Style TargetType="ContentPresenter">
                                         <Setter Property="Visibility" Value="Visible"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
index 170d3276a..21c099db9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Views/MainView.xaml
@@ -26,12 +26,12 @@
                         <Setter Property="Padding" Value="20,2"></Setter>
                     </Style>
                 </TabControl.Resources>
-                <TabItem Header="STATS" Margin="-100 0 0 0 ">
-                    <local:ChartsView x:Name="processParametersView" DataContext="{Binding ChartsViewVM}"/>
-                </TabItem>
                 <TabItem Header="JOB RUNS" Margin="-100 0 0 0 ">
                     <local:JobRunsView x:Name="jobRunsView"  DataContext="{Binding JobRunsViewVM}"/>
                 </TabItem>
+                <TabItem Header="STATS" Margin="-100 0 0 0 ">
+                    <local:ChartsView x:Name="processParametersView" DataContext="{Binding ChartsViewVM}"/>
+                </TabItem>
             </TabControl>
         </Grid>
     </Grid>