diff options
| author | Roy <Roy.mail.net@gmail.com> | 2022-07-25 12:54:37 +0300 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2022-07-25 12:54:37 +0300 |
| commit | 4092bd80c05bff5c11a5c852fe571f592ca6dc8e (patch) | |
| tree | a23832391f3fab993d8fdd6b9c719811ddf2b2d9 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs | |
| parent | 81fd4174e5d1009d9d7f45b6a20de382f43e50cb (diff) | |
| parent | c18b110b5c8d33750ad5f0cf9c5e3b8c47d059e6 (diff) | |
| download | Tango-4092bd80c05bff5c11a5c852fe571f592ca6dc8e.tar.gz Tango-4092bd80c05bff5c11a5c852fe571f592ca6dc8e.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
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.cs | 4 |
1 files changed, 3 insertions, 1 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 c8556960d..9dcce7d05 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 @@ -300,7 +300,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels JobRuns = new ObservableCollection<JobRunModel>(); LoadJobRunsCommand = new RelayCommand(async () => await LoadJobRuns(), () => IsFree && SelectedMachines!= null && SelectedMachines.Source.Count >0); ExportToExcelCommand = new RelayCommand(ExportToExcel, () => IsFree); - LengthUpperValue = 10000.0; + LengthUpperValue = 100000.0; LengthLowerValue = 0.0; DateTime now = DateTime.Now; StartSelectedDate = now.AddMonths(-1); @@ -646,6 +646,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels "Gradient Resolution", "Status", "End Date", + "Total dyeing time", "End Position", "Cyan", "Magenta", @@ -677,6 +678,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels excel_model.GR = jobRunModel.JobRun.GradientResolutionCm.ToString(); excel_model.Status = jobRunModel.JobRun.JobRunStatus.ToString(); excel_model.EndTime = jobRunModel.JobRun.EndDate != null ? ((DateTime)jobRunModel.JobRun.EndDate).ToLocalTime().ToString("MM/dd/yy HH:mm"): ""; + excel_model.TotalDyeingTime = jobRunModel.JobRun.TotalDyeingTime != default(TimeSpan) ? ((TimeSpan)jobRunModel.JobRun.TotalDyeingTime).ToString(@"hh\:mm\:ss") : TimeSpan.FromSeconds(0).ToString(@"hh\:mm\:ss"); excel_model.EndPosition = String.Format("{0:0.##}", jobRunModel.JobRun.EndPosition); excel_model.Cyan = jobRunModel.JobRun.CyanQuantity < 0 ? "" :jobRunModel.JobRun.CyanQuantity.ToString(); excel_model.Magenta = jobRunModel.JobRun.MagentaQuantity < 0 ? "" : jobRunModel.JobRun.MagentaQuantity.ToString(); |