From e2fbc8e6047fef09681b994efe2ca1043d25ac9d Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 16 Feb 2020 14:48:33 +0200 Subject: Implement Job Runs View. Create 2 views in Statistics. Implements Part of JobRunsView. Related Work Items: #2509 --- .../Models/JobRunModel.cs | 46 +++++++++------------- 1 file changed, 19 insertions(+), 27 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs') 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..e269f761f 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,37 @@ - -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 _machines = new Dictionary(); + 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 TimeSpan? HeatingDuration { get; set; } - public Task LoadMachine(ObservablesContext context) + + + 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; + } + } } } -- cgit v1.3.1