Dialog Adaptations.

Separate Job View.
Machine Status View Start.
EurekaTouchPanel.

2 files changed, 7 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index a8208323a..d21dcc781 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 using Tango.Core;
 using Tango.Logging;
 using Tango.PMR.Printing;
@@ -26,6 +27,7 @@ namespace Tango.Integration.Operation
         protected double _last_progress;
         protected const int PROGRESS_REPORT_RANGE_METERS = 5;
         protected bool loggedContinueMessage;
+        private MachineTypes _machineType;
 
         #region Events
 
@@ -154,9 +156,10 @@ namespace Tango.Integration.Operation
         /// Initializes a new instance of the <see cref="JobHandler"/> class.
         /// </summary>
         /// <param name="cancelAction">The cancel action.</param>
-        public JobHandler(Action cancelAction, Job job, JobTicket jobTicket, ProcessParametersTable processParameters, JobHandlerModes mode) : this()
+        public JobHandler(Action cancelAction, Job job, JobTicket jobTicket, ProcessParametersTable processParameters, JobHandlerModes mode, MachineTypes machineType) : this()
         {
             _mode = mode;
+            _machineType = machineType;
 
             ProcessParameters = processParameters;
             Job = job;
@@ -175,6 +178,7 @@ namespace Tango.Integration.Operation
 
             Status = new RunningJobStatus();
 
+
             Status.TotalTime = job.GetEstimatedDuration(processParameters);
             Status.RemainingUnits = job.NumberOfUnits;
             Status.TotalProgress = Job.LengthIncludingNumberOfUnits + processParameters.DryerBufferLengthMeters;
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 9c94363df..c5841a8b5 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1801,7 +1801,7 @@ namespace Tango.Integration.Operation
                                 handler.CanCancel = true;
                                 LogManager.Log(ex, "Failed to cancel job.");
                             }
-                        }, job, jobTicket, processParameters, JobHandlingMode);
+                        }, job, jobTicket, processParameters, JobHandlingMode, MachineType);
 
                         handler.StatusChanged += (x, s) =>
                         {
@@ -2913,7 +2913,7 @@ namespace Tango.Integration.Operation
                         handler.CanCancel = true;
                         LogManager.Log(ex, "Failed to cancel job.");
                     }
-                }, clonedJob, ticket, processParameters, JobHandlingMode);
+                }, clonedJob, ticket, processParameters, JobHandlingMode, MachineType);
 
                 handler.StatusChanged += (x, s) =>
                 {