aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2020-03-01 14:08:45 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2020-03-01 14:08:45 +0200
commit07cc6f6c59a1965f21ef92e6c2b4b3077199a364 (patch)
tree15aeb7617b0909bfbac5e228d9f6349f2310ebb8 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs
parent3f80b6889eedc225204c66a3180123a0df70bd7a (diff)
downloadTango-07cc6f6c59a1965f21ef92e6c2b4b3077199a364.tar.gz
Tango-07cc6f6c59a1965f21ef92e6c2b4b3077199a364.zip
Changes in Actions log to get properly logs by selection dates.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs12
1 files changed, 8 insertions, 4 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 408789d9f..534bb364f 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
@@ -141,11 +141,15 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
using (ObservablesContext db = ObservablesContext.CreateDefault())
{
- DateTime startUtc = StartSelectedDate.ToUniversalTime();
- TimeSpan offsetTime = (EndSelectedDate.Date == DateTime.Now.Date) ? DateTime.Now.TimeOfDay : new TimeSpan(23, 59, 59);
- DateTime endUtc = EndSelectedDate.ToUniversalTime() + offsetTime;
+
+ 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);
+
+ Debug.Write($"TEST TIME {startUtc} from {endUtc} " + System.Environment.NewLine);
+
IsRunning = true;
- ActionLogs = await new ActionLogsCollectionBuilder(db).Set(x => x.LastUpdated <= DbFunctions.TruncateTime(endUtc) && x.LastUpdated >= DbFunctions.TruncateTime(startUtc.Date))
+ ActionLogs = await new ActionLogsCollectionBuilder(db).Set(x => x.LastUpdated <= DbFunctions.TruncateTime(endUtc) && x.LastUpdated >= DbFunctions.TruncateTime(startUtc))
.WithUsers()
.WithActionType(SelectedActionLogTypes.SynchedSource.ToArray())
.Query(y => y.Where