aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-01-07 16:06:38 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-01-07 16:06:38 +0200
commite111c33bc87acf40202f9e5423e21b087a366f07 (patch)
treefac6d85ec3589620b1daea9a9f740a2120b0ca10 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels
parent6da42fd28ffbb680d85bb9e695520713ff51022a (diff)
downloadTango-e111c33bc87acf40202f9e5423e21b087a366f07.tar.gz
Tango-e111c33bc87acf40202f9e5423e21b087a366f07.zip
Added new events !!!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
index 1f93a96dc..c813e9752 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
@@ -140,8 +140,6 @@ namespace Tango.MachineStudio.Logging.ViewModels
_db = ObservablesContext.CreateDefault();
_db.EventTypes.Load();
- _db.EventTypesCategories.Load();
- _db.EventTypesGroups.Load();
DateTime now = DateTime.UtcNow.AddMonths(-1);
@@ -183,7 +181,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
private void OnSelectedEventChanged()
{
- if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown)
+ if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED && !_dialog_shown)
{
_dialog_shown = true;
_notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedEvent), (x) =>
@@ -198,7 +196,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
private void DisplayTimeline(MachinesEvent ev)
{
- var events = Events.OrderBy(x => x.DateTime).SkipWhile(x => x != ev).Skip(1).TakeWhile(x => x.DateTime > ev.DateTime && x.Type != BL.Enumerations.EventTypes.ApplicationStarted).ToObservableCollection();
+ var events = Events.OrderBy(x => x.DateTime).SkipWhile(x => x != ev).Skip(1).TakeWhile(x => x.DateTime > ev.DateTime && x.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED).ToObservableCollection();
events.Insert(0, ev);
TimelineViewVM.Initialize(events.ToList());