aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/JobRunsViewVM.cs
diff options
context:
space:
mode:
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.cs14
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);
}