aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2020-03-05 16:10:17 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2020-03-05 16:10:17 +0200
commit1834b13df30bcf71aab363f9e504c4e79b3f2224 (patch)
tree2778a4b38f9173aeeecee2b1a84a9793e83bc4f5 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
parentf40acd728957df61aad7fc0be2801ba8084b65fb (diff)
downloadTango-1834b13df30bcf71aab363f9e504c4e79b3f2224.tar.gz
Tango-1834b13df30bcf71aab363f9e504c4e79b3f2224.zip
Machine Studio. Fixed lubricant 0 Volume when change to RGB mode.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs5
1 files changed, 3 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 567867a80..a51d18909 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
@@ -313,7 +313,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
DateTime endUtc = EndSelectedDate.ToUniversalTime() + offsetTime;
string jobName = SelectedJob == null ? "" : SelectedJob.Name;
- var runs = await new JobRunsCollectionBuilder(db).Set(x => x.ActualStartDate <= DbFunctions.TruncateTime(endUtc) && x.ActualStartDate >= DbFunctions.TruncateTime(startUtc.Date))
+ 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)
@@ -329,7 +329,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
JobRun = x,
Machine = _allMachines.FirstOrDefault(y => y.Guid == x.MachineGuid),
User = _allUsers.SingleOrDefault(y => y.Guid == x.UserGuid),
- }).ToList();
+ Rml = _rmlsModels.SingleOrDefault(y => y.Guid == x.RmlGuid)
+ }).OrderByDescending(x => x.JobRun.StartDate).ToList();
modelList.ForEach(x => x.Init());
JobRuns = modelList.ToObservableCollection();