merge

1 files changed, 9 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 9768498c6..b17321942 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -75,6 +75,8 @@ namespace Tango.Integration.Operation
         private List<BL.ValueObjects.JobRunLiquidQuantity> _currentJobLiquidQuantities;
         private DateTime _diagnosticsTime;
         private MachineStatus _machineStatusBeforeJobStart;
+
+        private DateTime _jobStartDate;
         private DateTime? _jobUploadingStartDate;
         private DateTime? _jobHeatingStartDate;
         private DateTime? _jobActualStartDate;
@@ -1050,6 +1052,7 @@ namespace Tango.Integration.Operation
             PrintingStarted?.Invoke(this, new PrintingEventArgs(handler, job)
             {
                 LiquidQuantities = _currentJobLiquidQuantities.ToList(),
+                StartDate = _jobStartDate,
             });
         }
 
@@ -1063,6 +1066,7 @@ namespace Tango.Integration.Operation
             PrintingCompleted?.Invoke(this, new PrintingEventArgs(handler, job)
             {
                 LiquidQuantities = _currentJobLiquidQuantities.ToList(),
+                StartDate = _jobStartDate,
                 UploadingStartTime = _jobUploadingStartDate,
                 HeatingStartTime = _jobHeatingStartDate,
                 ActualStartTime = _jobActualStartDate,
@@ -1082,6 +1086,7 @@ namespace Tango.Integration.Operation
             PrintingFailed?.Invoke(this, new PrintingFailedEventArgs(handler, job, exception)
             {
                 LiquidQuantities = _currentJobLiquidQuantities.ToList(),
+                StartDate = _jobStartDate,
                 UploadingStartTime = _jobUploadingStartDate,
                 HeatingStartTime = _jobHeatingStartDate,
                 ActualStartTime = _jobActualStartDate,
@@ -1099,6 +1104,7 @@ namespace Tango.Integration.Operation
             PrintingAborted?.Invoke(this, new PrintingEventArgs(handler, job)
             {
                 LiquidQuantities = _currentJobLiquidQuantities.ToList(),
+                StartDate = _jobStartDate,
                 UploadingStartTime = _jobUploadingStartDate,
                 HeatingStartTime = _jobHeatingStartDate,
                 ActualStartTime = _jobActualStartDate,
@@ -1116,6 +1122,7 @@ namespace Tango.Integration.Operation
             PrintingEnded?.Invoke(this, new PrintingEventArgs(handler, job)
             {
                 LiquidQuantities = _currentJobLiquidQuantities.ToList(),
+                StartDate = _jobStartDate,
                 UploadingStartTime = _jobUploadingStartDate,
                 HeatingStartTime = _jobHeatingStartDate,
                 ActualStartTime = _jobActualStartDate,
@@ -2159,6 +2166,8 @@ namespace Tango.Integration.Operation
                     throw new InvalidOperationException("Could not print while status = " + Status);
                 }
 
+                _jobStartDate = DateTime.UtcNow;
+
                 LogManager.Log($"Executing job '{job.Name}'...");
 
                 _currentJobLiquidQuantities = new List<BL.ValueObjects.JobRunLiquidQuantity>();