Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 12 insertions, 13 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
index c091f1221..069435307 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
@@ -185,14 +185,13 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
 
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-
-                    DateTime startUtc = new DateTime(StartSelectedDate.Date.Ticks, DateTimeKind.Utc);
-                    TimeSpan offsetTime = (EndSelectedDate.Date == DateTime.Now.Date) ? DateTime.Now.TimeOfDay : new TimeSpan(24, 0, 0);
-                    DateTime endUtc = new DateTime(EndSelectedDate.Date.Ticks + offsetTime.Ticks, DateTimeKind.Utc);
+                    DateTime startUtc = StartSelectedDate.ToUniversalTime();
+                    TimeSpan offsetTime = (EndSelectedDate.Date == DateTime.Now.Date) ? DateTime.Now.TimeOfDay : new TimeSpan(23, 59, 59);
+                    DateTime endUtc = EndSelectedDate.ToUniversalTime() + offsetTime;
 
                     Debug.Write($"TEST TIME  {startUtc}  from {endUtc} " + System.Environment.NewLine);
 
-                    var db_ActionLogs = db.ActionLogs.Where(x => x.LastUpdated <= DbFunctions.TruncateTime(endUtc) && x.LastUpdated >= DbFunctions.TruncateTime(startUtc))
+                    var db_ActionLogs = db.ActionLogs.Where(x => x.LastUpdated <= endUtc && x.LastUpdated >= startUtc.Date)
                            .Select(x => new
                            {
                                x.ID,
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 6be0948a9..254dcd6e1 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
@@ -82,7 +82,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         public DateTime StartSelectedDate
         {
             get { return _startSelectedDate; }
-            set { _startSelectedDate = value; RaisePropertyChangedAuto(); }
+            set { _startSelectedDate = value;
+                RaisePropertyChangedAuto(); }
         }
 
         private DateTime _endSelectedDate;
@@ -322,11 +323,10 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                         DateTime startUtc = StartSelectedDate.ToUniversalTime();
                         TimeSpan offsetTime = (EndSelectedDate.Date == DateTime.Now.Date) ? DateTime.Now.TimeOfDay : new TimeSpan(23, 59, 59);
                         DateTime endUtc = EndSelectedDate.ToUniversalTime() + offsetTime;
-                        string jobName = SelectedJob == null ? "" : SelectedJob.Name;
-
 
-
-                        var db_JobRuns = db.JobRuns.Where(x => x.StartDate <= DbFunctions.TruncateTime(endUtc) && x.StartDate >= DbFunctions.TruncateTime(startUtc.Date))
+                        string jobName = SelectedJob == null ? "" : SelectedJob.Name;
+                        
+                        var db_JobRuns = db.JobRuns.Where(x => (x.StartDate <= endUtc && x.StartDate >= startUtc.Date))
                             .Select(x => new
                             {
                                 x.ID,
@@ -355,8 +355,6 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                                 x.LubricantQuantity,
                                 x.CleanerQuantity
                             });
-
-
                         var machineIDs = new HashSet<string>(SelectedMachines.SynchedSource.ToList().Select(p => p.Guid));
                         if (machineIDs.Count > 0)
                         {
@@ -419,7 +417,7 @@ namespace Tango.MachineStudio.Statistics.ViewModels
                                 LubricantQuantity = x.LubricantQuantity,
                                 CleanerQuantity = x.CleanerQuantity
                             }).ToList();
-
+                        
                         var modelList = runs.Select(x => new JobRunModel()
                         {
                             JobRun = x,
@@ -454,6 +452,8 @@ namespace Tango.MachineStudio.Statistics.ViewModels
         protected void GenerateStatistics()
         {
             StatisticsValueCollection.Clean();
+            if (JobRuns.Count() == 0)
+                return;
             GenerateTotalRunsCount();
             GenerateTotalRunsLength();
             GenerateTotalThreadConsumption();