From 338edba081dba2a2aefb634811be1cc84ec93d64 Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Tue, 25 Aug 2020 10:08:01 +0300
Subject: merge

---
 .../ViewModels/JobRunsViewVM.cs                    | 45 +++++++++++++---------
 1 file changed, 26 insertions(+), 19 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels')

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 0ecb12ba7..ae1592d8d 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
@@ -23,9 +23,21 @@ using Tango.BL.ValueObjects;
 using System.Diagnostics;
 using Microsoft.Win32;
 using Tango.CSV;
+using System.ComponentModel;
 
 namespace Tango.MachineStudio.Statistics.ViewModels
 {
+    public enum HeadCleaningSelectionEnum
+    {
+        [Description("Exclude")]
+        Exclude = 0,
+        [Description("Include")]
+        Include = 1,
+        [Description("Only")]
+        Only = 2
+    };
+
+
     public class JobRunsViewVM : ViewModel
     {
         private INotificationProvider _notification;
@@ -33,6 +45,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         private List<User> _allUsers;
         private List<RmlModel> _rmlsModels;
 
+        
+
         #region Properties
 
         private ObservableCollection<JobRunModel> _jobRuns;
@@ -175,14 +189,14 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             }
         }
 
-        private SelectedObjectCollection<bool> _isHeadCleaningSelection;
+        private HeadCleaningSelectionEnum _headCleaningSelected;
 
-        public SelectedObjectCollection<bool> IsHeadCleaningSelection
+        public HeadCleaningSelectionEnum HeadCleaningSelected
         {
-            get { return _isHeadCleaningSelection; }
+            get { return _headCleaningSelected; }
             set
             {
-                _isHeadCleaningSelection = value;
+                _headCleaningSelected = value;
                 RaisePropertyChangedAuto();
             }
         }
@@ -270,17 +284,8 @@ 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));
+            HeadCleaningSelected = HeadCleaningSelectionEnum.Exclude;
+            
             JobsProvider = new SuggestionProvider((filter) =>
             {
                 try
@@ -336,8 +341,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                     IsFree = true;
                 }
             }
+            
         }
-
+        
         /// <summary>
         /// Loads the job runs by filters. 
         /// </summary>
@@ -407,10 +413,11 @@ 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)
+                        
+                        if(HeadCleaningSelected != HeadCleaningSelectionEnum.Include)
                         {
-                            db_JobRuns = db_JobRuns.Where(x => isHeadCleaningArr.Contains(x.IsHeadCleaning));
+                            bool isHeadCleaning = HeadCleaningSelected == HeadCleaningSelectionEnum.Only;
+                            db_JobRuns = db_JobRuns.Where(x => isHeadCleaning == x.IsHeadCleaning);
                         }
 
                         List<String> rmlGuids = SelectedThreads.SynchedSource.Select(y => y.Guid).ToList();
-- 
cgit v1.3.1