diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-22 17:08:21 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-22 17:08:21 +0200 |
| commit | 22aae5a0e6bdd9ed91bf2c852980e08fe3c2dc29 (patch) | |
| tree | 719dc8cd0e7ae0444f0633bdd296edfca41ffa4f /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels | |
| parent | ec36bdb8a6fb3d460929c7f6f20e695dd98688c4 (diff) | |
| parent | 2eb0eb6cd5c3b4ba2b43c733d2aa78ecca675793 (diff) | |
| download | Tango-22aae5a0e6bdd9ed91bf2c852980e08fe3c2dc29.tar.gz Tango-22aae5a0e6bdd9ed91bf2c852980e08fe3c2dc29.zip | |
Merged Light Inks branch again with ms statistics update.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs | 14 |
1 files changed, 13 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 ae1592d8d..e1876e87e 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 @@ -391,6 +391,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels x.TransparentQuantity, x.LubricantQuantity, x.CleanerQuantity, + x.LightCyanQuantity, + x.LightMagentaQuantity, + x.LightYellowQuantity, x.IsHeadCleaning }); var machineIDs = new HashSet<string>(SelectedMachines.SynchedSource.ToList().Select(p => p.Guid)); @@ -461,6 +464,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels TransparentQuantity = x.TransparentQuantity, LubricantQuantity = x.LubricantQuantity, CleanerQuantity = x.CleanerQuantity, + LightCyanQuantity = x.LightCyanQuantity, + LightMagentaQuantity = x.LightMagentaQuantity, + LightYellowQuantity = x.LightYellowQuantity, IsHeadCleaning = x.IsHeadCleaning }).ToList(); @@ -526,7 +532,10 @@ namespace Tango.MachineStudio.Statistics.ViewModels "Black", "Transparent", "Lubricant", - "Cleaner" + "Cleaner", + "LightCyan", + "LightMagenta", + "LightYellow" }, }); var selection = JobRuns.Where(z => z.JobRun.EndPosition > 0 && z.JobRun.EndDate != null && z.JobRun.ActualStartDate != null); @@ -555,6 +564,9 @@ namespace Tango.MachineStudio.Statistics.ViewModels excel_model.Transparent = jobRunModel.JobRun.TransparentQuantity < 0 ? "" : jobRunModel.JobRun.TransparentQuantity.ToString(); excel_model.Lubricant = jobRunModel.JobRun.LubricantQuantity < 0 ? "" : jobRunModel.JobRun.LubricantQuantity.ToString(); excel_model.Cleaner = jobRunModel.JobRun.CleanerQuantity < 0 ? "" : jobRunModel.JobRun.CleanerQuantity.ToString(); + excel_model.LightCyan = jobRunModel.JobRun.LightCyanQuantity < 0 ? "" : jobRunModel.JobRun.LightCyanQuantity.ToString(); + excel_model.LightMagenta = jobRunModel.JobRun.LightMagentaQuantity < 0 ? "" : jobRunModel.JobRun.LightMagentaQuantity.ToString(); + excel_model.LightYellow = jobRunModel.JobRun.LightYellowQuantity < 0 ? "" : jobRunModel.JobRun.LightYellowQuantity.ToString(); csvFile.Append(excel_model); } |