From 9949e351e152a929da696ef2f0a1f8b1668e83fa Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 12 Jan 2020 15:56:50 +0200
Subject: Merged Beta+ fixes to master.

---
 .../PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs          | 1 +
 .../Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml | 2 ++
 .../PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs         | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/PPC/Modules')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
index 1de54b784..a2f67b2ba 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
@@ -178,6 +178,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             if (_handler != null)
             {
+                _stop_job_btn.Pop();
                 _handler.Cancel();
             }
         }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index 2a21f772e..6bc1337b9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -38,6 +38,8 @@
                                     <Setter Property="Visibility" Value="Visible"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
+                                    <Setter Property="Maximum" Value="100"></Setter>
+                                    <Setter Property="Value" Value="99.9999999"></Setter>
                                     <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
index 13aeeb671..f3ffcda14 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
@@ -265,7 +265,7 @@ namespace Tango.PPC.Technician.ViewModels
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    var jobRuns = await db.JobRuns.Where(x => x.MachineGuid == MachineProvider.Machine.Guid).ToListAsync();
+                    var jobRuns = await db.JobRuns.ToListAsync();
 
                     TotalDyeTime = TimeSpan.FromHours(jobRuns.Select(x => x.EndDate - x.StartDate).Sum(x => x.TotalHours)).ToString(@"hh\:mm\:ss");
 
-- 
cgit v1.3.1