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

1 files changed, 35 insertions, 2 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 05eb9ef8d..0ecb12ba7 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
@@ -175,6 +175,19 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             }
         }
 
+        private SelectedObjectCollection<bool> _isHeadCleaningSelection;
+
+        public SelectedObjectCollection<bool> IsHeadCleaningSelection
+        {
+            get { return _isHeadCleaningSelection; }
+            set
+            {
+                _isHeadCleaningSelection = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+
         /// <summary>
         /// Gets or sets the JobRuns providers.
         /// </summary>
@@ -256,6 +269,18 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             });
             IsGradientSelection.SelectionChanged -= (x, y) => RaisePropertyChanged(nameof(IsGradientSelection));
             IsGradientSelection.SelectionChanged += (x, y) => RaisePropertyChanged(nameof(IsGradientSelection));
+
+            IsHeadCleaningSelection = new SelectedObjectCollection<bool>(new ObservableCollection<bool>()
+            {
+                true,
+                false
+            }, new ObservableCollection<bool>()
+            {
+                true,
+                false
+            });
+            IsHeadCleaningSelection.SelectionChanged -= (x, y) => RaisePropertyChanged(nameof(IsHeadCleaningSelection));
+            IsHeadCleaningSelection.SelectionChanged += (x, y) => RaisePropertyChanged(nameof(IsHeadCleaningSelection));
             JobsProvider = new SuggestionProvider((filter) =>
             {
                 try
@@ -359,7 +384,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                                 x.BlackQuantity,
                                 x.TransparentQuantity,
                                 x.LubricantQuantity,
-                                x.CleanerQuantity
+                                x.CleanerQuantity,
+                                x.IsHeadCleaning
                             });
                         var machineIDs = new HashSet<string>(SelectedMachines.SynchedSource.ToList().Select(p => p.Guid));
                         if (machineIDs.Count > 0)
@@ -381,6 +407,12 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                         {
                             db_JobRuns = db_JobRuns.Where(x => isGradientArr.Contains(x.IsGradient));
                         }
+                        bool[] isHeadCleaningArr = IsHeadCleaningSelection.SynchedSource.Select(x => (bool)x).ToArray();
+                        if(isHeadCleaningArr.Length > 0)
+                        {
+                            db_JobRuns = db_JobRuns.Where(x => isHeadCleaningArr.Contains(x.IsHeadCleaning));
+                        }
+
                         List<String> rmlGuids = SelectedThreads.SynchedSource.Select(y => y.Guid).ToList();
                         if (rmlGuids != null && rmlGuids.Count > 0)
                         {
@@ -421,7 +453,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                                 BlackQuantity = x.BlackQuantity,
                                 TransparentQuantity = x.TransparentQuantity,
                                 LubricantQuantity = x.LubricantQuantity,
-                                CleanerQuantity = x.CleanerQuantity
+                                CleanerQuantity = x.CleanerQuantity,
+                                IsHeadCleaning = x.IsHeadCleaning
                             }).ToList();
                         
                         var modelList = runs.Select(x => new JobRunModel()