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

1 files changed, 4 insertions, 5 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,