Improved MS csv report.

2 files changed, 43 insertions, 20 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
index 364984375..8b916237a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/ExcelModel.cs
@@ -9,30 +9,45 @@ namespace Tango.MachineStudio.Statistics.Models
     public class ExcelModel
     {
         public String ID { get; set; }
+        public String Gen { get; set; }
         public String Machine { get; set; }
-        public String User { get; set; }
+        //public String User { get; set; }
+        public String Source { get; set; }
         public String JobName { get; set; }
+        public String JobKind { get; set; }
         public String Thread { get; set; }
         public String Length { get; set; }
-        public String Source { get; set; }
-        public String UploadDuration { get; set; }
-        public String HeatingDuration { get; set; }
+        public String NumberOfUnits { get; set; }
+        //public String UploadDuration { get; set; }
+        //public String HeatingDuration { get; set; }
         public String StartTime { get; set; }
-        public String IsGradient { get; set; }
-        public String GR { get; set; }
-        public String Status { get; set; }
-        public String EndTime { get; set; }
-        public String TotalDyeingTime { get; set; }
+        public String Duration { get; set; }
+        public String Distance { get; set; }
+        public String StartPosition { get; set; }
         public String EndPosition { get; set; }
-        public String Cyan { get; set; }
-        public String Magenta { get; set; }
-        public String Yellow { get; set; }
-        public String Black { get; set; }
-        public String Transparent { get; set; }
-        public String Lubricant { get; set; }
-        public String Cleaner { get; set; }
-        public String LightCyan { get; set; }
-        public String LightMagenta { get; set; }
-        public String LightYellow { get; set; }
+        //public String IsGradient { get; set; }
+        //public String GR { get; set; }
+        public String Status { get; set; }
+        //public String EndTime { get; set; }
+        //public String TotalDyeingTime { get; set; }
+       
+        public String OutputCyan { get; set; }
+        public String OutputMagenta { get; set; }
+        public String OutputYellow { get; set; }
+        public String OutputBlack { get; set; }
+        public String OutputLightCyan { get; set; }
+        public String OutputLightMagenta { get; set; }
+        public String OutputLightYellow { get; set; }
+        public String OutputBlue { get; set; }
+        public String OutputLightBlue { get; set; }
+        public String OutputOrange { get; set; }
+        public String OutputLightOrange { get; set; }
+        public String OutputRubine { get; set; }
+        public String OutputLightRubine { get; set; }
+        public String OutputNavy { get; set; }
+        public String OutputViolet { get; set; }
+        public String OutputTransparentInk { get; set; }
+        public String OutputLubricant { get; set; }
+        public String FailureReason { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs
index 7f9d0e57d..5ec0f14b6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs
@@ -66,9 +66,17 @@ namespace Tango.MachineStudio.Statistics.Models
             }
         }
 
+        public TimeSpan Duration
+        {
+            get
+            {
+                return JobRun.EndDate - JobRun.StartDate;
+            }
+        }
+
         public double ActualLength
         {
-            get { return LogicalLengthMeters * JobRun.NumberOfUnits; }
+            get { return LogicalLengthMeters * Math.Max(JobRun.NumberOfUnits, 1); }
         }
 
         public void Init()