merge conflicts

1 files changed, 17 insertions, 27 deletions

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 8e5642e3d..2bf3a42a4 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
@@ -1,45 +1,35 @@
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.BL;
 using Tango.BL.Entities;
-using Tango.Core.ExtensionMethods;
 
 namespace Tango.MachineStudio.Statistics.Models
 {
-    public class JobRunModel : JobRun
+    public class JobRunModel
     {
-        private static Dictionary<String, Machine> _machines = new Dictionary<string, Machine>();
+        public JobRun JobRun { get; set; }
 
-        public JobRunModel()
-        {
+        public Machine Machine { get; set; }
 
-        }
+        public User User { get; set; }
 
-        public JobRunModel(JobRun run)
-        {
-            run.MapPropertiesTo(this, MappingFlags.NoReferenceTypes);
-        }
+        public TimeSpan? UploadDuration { get; set; }
 
-        public Task LoadMachine(ObservablesContext context)
+        public TimeSpan? HeatingDuration { get; set; }
+
+        public void Init()
         {
-            return Task.Factory.StartNew(() =>
+            if (JobRun.HeatingStartDate != null)
             {
-                if (!_machines.ContainsKey(MachineGuid))
-                {
-                    Machine = context.Machines.SingleOrDefault(x => x.Guid == MachineGuid);
-                    _machines.Add(MachineGuid, Machine);
-                }
-                else
-                {
-                    Machine = _machines[MachineGuid];
-                }
-            });
-        }
+                UploadDuration = JobRun.HeatingStartDate - JobRun.StartDate;
+            }
 
-        public Machine Machine { get; set; }
+            if (JobRun.ActualStartDate != null && JobRun.HeatingStartDate != null)
+            {
+                HeatingDuration = JobRun.ActualStartDate - JobRun.HeatingStartDate;
+            }
+        }
     }
 }