From 39ba30b9660a11d15e00afa80217219078d4b698 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 23 Jan 2020 17:07:26 +0200 Subject: Added new fields to job runs fixer --- .../Utilities/Tango.JobRunsGenerator/Program.cs | 28 +++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs') diff --git a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs index 7808a6957..ba90cc805 100644 --- a/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.JobRunsGenerator/Program.cs @@ -66,25 +66,15 @@ namespace Tango.JobRunsGenerator run.JobSource = job.Source; - if (run.JobLength == 0) - { - run.JobLength = job.LengthIncludingNumberOfUnits; - } - - if (run.JobName == null) - { - run.JobName = job.Name; - } - - if (run.JobString == null) - { - run.JobString = job.ToJobFileWhenLoaded().ToString(); - } - - if (run.LiquidQuantityString == null) - { - run.LiquidQuantities = MachineOperator.CreateJobRunLiquidQuantities(job, machine.Configuration, job.Rml.GetActiveProcessGroup().ProcessParametersTables.First(), run.EndPosition, job.LengthIncludingNumberOfUnits, 20); - } + if (run.JobLength == 0) run.JobLength = job.LengthIncludingNumberOfUnits; + if (run.JobName == null) run.JobName = job.Name; + if (run.JobString == null) run.JobString = job.ToJobFileWhenLoaded().ToString(); + if (run.LiquidQuantityString == null) run.LiquidQuantities = MachineOperator.CreateJobRunLiquidQuantities(job, machine.Configuration, job.Rml.GetActiveProcessGroup().ProcessParametersTables.First(), run.EndPosition, job.LengthIncludingNumberOfUnits, 20); + if (run.UserGuid != null) run.UserGuid = job.UserGuid; + if (run.UploadingStartDate == null) run.UploadingStartDate = run.StartDate; + if (run.HeatingStartDate == null) run.HeatingStartDate = run.StartDate; + if (run.ActualStartDate == null) run.ActualStartDate = run.StartDate; + run.IsGradient = job.Segments.Any(x => x.BrushStops.Count > 1); saveIndex++; -- cgit v1.3.1