Liquid quantities implementation in xaml.

Related Work Items: #2509

1 files changed, 62 insertions, 17 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 cf74071c9..07e431751 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
@@ -25,11 +25,14 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         private List<Machine> _allMachines;
         private List<User> _allUsers;
         private List<RmlModel> _rmlsModels;
-        private List<JobRun> _allJobRuns;
+        private List<Job> _allJobRuns;
 
         #region Properties
 
         private ObservableCollection<JobRunModel> _jobRuns;
+        /// <summary>
+        /// Gets or sets the job runs. Contains filtered data of JobRunModel.
+        /// </summary>
         public ObservableCollection<JobRunModel> JobRuns
         {
             get { return _jobRuns; }
@@ -41,6 +44,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         private JobRunModel _selectedJobRun = null;
+        /// <summary>
+        /// Gets or sets the JobRunModel. Binding to selected item of grid items.
+        /// </summary>
         public JobRunModel SelectedJobRun
         {
             get { return _selectedJobRun; }
@@ -52,6 +58,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         private SelectedObjectCollection<Machine> _selectedMachines;
+        /// <summary>
+        /// Gets or sets the selected machines. Contains all available machines and selected machines. Binding to ComboBox Machines.
+        /// </summary>
         public SelectedObjectCollection<Machine> SelectedMachines
         {
             get { return _selectedMachines; }
@@ -63,6 +72,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         private DateTime _startSelectedDate;
+        /// <summary>
+        /// Gets or sets the start selected date.
+        /// </summary>
         public DateTime StartSelectedDate
         {
             get { return _startSelectedDate; }
@@ -70,6 +82,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         private DateTime _endSelectedDate;
+        /// <summary>
+        /// Gets or sets the end selected date.
+        /// </summary>
         public DateTime EndSelectedDate
         {
             get { return _endSelectedDate; }
@@ -77,6 +92,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         protected Double _lengthLowerValue;
+        /// <summary>
+        /// Gets or sets the length lower value of Range Slider
+        /// </summary>
         public Double LengthLowerValue
         {
             get { return _lengthLowerValue; }
@@ -88,6 +106,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         protected Double _lengthUpperValue;
+        /// <summary>
+        /// Gets or sets the length upper value of Range Slider.
+        /// </summary>
         public Double LengthUpperValue
         {
             get { return _lengthUpperValue; }
@@ -99,6 +120,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         private SelectedObjectCollection<JobSource> _jobRunSelectedSources;
+        /// <summary>
+        /// Gets or sets the job run selected sources. Binding to ComboBox "Source".
+        /// </summary>
         public SelectedObjectCollection<JobSource> JobRunSelectedSources
         {
             get { return _jobRunSelectedSources; }
@@ -106,6 +130,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         private SelectedObjectCollection<JobRunStatus> _jobRunSelectedStatuses;
+        /// <summary>
+        /// Gets or sets the job run selected statuses. Binding to ComboBox "Status".
+        /// </summary>
         public SelectedObjectCollection<JobRunStatus> JobRunSelectedStatuses
         {
             get { return _jobRunSelectedStatuses; }
@@ -113,6 +140,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         public SelectedObjectCollection<bool> _isGradientSelection;
+        /// <summary>
+        /// Gets or sets the is gradient selection. Binding to ComboBox "IsGradient".
+        /// </summary>
         public SelectedObjectCollection<bool> IsGradientSelection
         {
             get { return _isGradientSelection; }
@@ -124,6 +154,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         }
 
         private SelectedObjectCollection<RmlModel> _selectedThreads;
+        /// <summary>
+        /// Gets or sets the selected threads. Contains all available threads and selected threads. Binding to ComboBox "Thread".
+        /// </summary>
         public SelectedObjectCollection<RmlModel> SelectedThreads
         {
             get { return _selectedThreads; }
@@ -137,21 +170,26 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         /// <summary>
         /// Gets or sets the JobRuns providers.
         /// </summary>
-        public ISuggestionProvider JobRunsProvider { get; set; }
+        public ISuggestionProvider JobsProvider { get; set; }
 
-        private  JobRun _jobRun;
-        public JobRun JobRun
+        private  Job _selectedJob;
+        /// <summary>
+        /// Gets or sets the job. Used as Sele
+        /// </summary>
+        public Job SelectedJob
         {
-            get { return _jobRun; }
-            set {
-                _jobRun = value;
-                if (_jobRun != null)
-                {
-                    SelectedJobName = _jobRun.JobName;
-                }
-                RaisePropertyChangedAuto(); }
+            get { return _selectedJob; }
+            set
+            {
+                _selectedJob = value;
+                SelectedJobName = _selectedJob != null ? _selectedJob.Name : "";
+                RaisePropertyChangedAuto();
+            }
         }
 
+        /// <summary>
+        /// Gets or sets the name of the selected job. Used in filter.
+        /// </summary>
         private string SelectedJobName { get; set; }
         
 
@@ -209,12 +247,12 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             });
             IsGradientSelection.SelectionChanged -= (x, y) => RaisePropertyChanged(nameof(IsGradientSelection));
             IsGradientSelection.SelectionChanged += (x, y) => RaisePropertyChanged(nameof(IsGradientSelection));
-            JobRunsProvider = new SuggestionProvider((filter) =>
+            JobsProvider = new SuggestionProvider((filter) =>
             {
                 try
                 {
                     SelectedJobName = filter;
-                    return _allJobRuns.Where(x => x.JobName != null && x.JobName.ToString().StartsWith(filter, StringComparison.CurrentCultureIgnoreCase)).ToList();
+                    return _allJobRuns.Where(x => x.Name != null && x.Name.ToString().StartsWith(filter, StringComparison.CurrentCultureIgnoreCase)).ToList();
                 }
                 catch
                 {
@@ -223,7 +261,10 @@ namespace Tango.MachineStudio.Statistics.ViewModels
             });
            
         }
-        
+
+        /// <summary>
+        /// Initializes this instance. Called form main view VM in OnApplicationReady
+        /// </summary>
         public async void Init()
         {
             using (_notification.PushTaskItem("Loading job runs..."))
@@ -234,7 +275,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
 
                     using (var db = ObservablesContext.CreateDefault())
                     {
-                        _allJobRuns = await db.JobRuns.ToListAsync(); ;
+                        _allJobRuns = await db.Jobs.ToListAsync(); ;
                         _allMachines = await db.Machines.ToListAsync();
                         _allUsers = await db.Users.Include(x => x.Contact).ToListAsync();
                         _rmlsModels  = await db.Rmls.Select(x=> new RmlModel(){ Name = x.Name, Guid = x.Guid}).ToListAsync();
@@ -253,7 +294,10 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                 }
             }
         }
-        
+
+        /// <summary>
+        /// Loads the job runs by filters. 
+        /// </summary>
         private async Task LoadJobRuns()
         {
             using (_notification.PushTaskItem("Loading job runs..."))
@@ -273,6 +317,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                         .WithJobSource(JobRunSelectedSources.SynchedSource)
                         .WithJobStatus(JobRunSelectedStatuses.SynchedSource)
                         .WithGradient(IsGradientSelection.SynchedSource)
+                        .WithRmls(SelectedThreads.SynchedSource.Select(x => x.Guid).ToList())
                         .Query(y => y.Where(x => (String.IsNullOrEmpty(SelectedJobName) || x.JobName.ToString().ToLower().StartsWith(SelectedJobName.ToLower()))
                         && ( x.JobLength < LengthUpperValue && x.JobLength >= LengthLowerValue)
                         ))