diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging')
3 files changed, 9 insertions, 11 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()); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml index c75ef41ee..2dda7d342 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml @@ -73,9 +73,9 @@ <controls:TableGrid RowHeight="30"> <TextBlock Text="Category:" FontWeight="SemiBold" /> - <TextBlock Text="{Binding Event.EventType.EventTypesCategory.Name}"></TextBlock> + <TextBlock Text="{Binding Event.EventType.Category}"></TextBlock> <TextBlock Text="Group:" FontWeight="SemiBold" /> - <TextBlock Text="{Binding Event.EventType.EventTypesGroup.Name}"></TextBlock> + <TextBlock Text="{Binding Event.EventType.Group}"></TextBlock> </controls:TableGrid> </UniformGrid> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml index 196b6f930..846ea1fe2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml @@ -136,7 +136,7 @@ <Trigger Property="IsFocused" Value="True"> <Setter Property="Background" Value="Transparent"></Setter> </Trigger> - <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted"> + <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED"> <Setter Property="Background" Value="{StaticResource AccentColorBrush}"></Setter> <Setter Property="Foreground" Value="White" /> <Setter Property="FontWeight" Value="SemiBold"></Setter> @@ -154,7 +154,7 @@ <Trigger Property="IsSelected" Value="True"> <Setter Property="Background" Value="Transparent"></Setter> </Trigger> - <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted"> + <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED"> <Setter Property="Background" Value="{StaticResource AccentColorBrush}"></Setter> <Setter Property="Foreground" Value="White" /> <Setter Property="FontWeight" Value="SemiBold"></Setter> @@ -188,7 +188,7 @@ <Setter Property="Kind" Value="BellPlus"></Setter> <Setter Property="Foreground" Value="Red"></Setter> </DataTrigger> - <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted"> + <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED"> <Setter Property="Kind" Value="ClockFast"></Setter> <Setter Property="Foreground" Value="White"></Setter> </DataTrigger> @@ -202,7 +202,7 @@ <DataGridTextColumn Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" /> <DataGridTextColumn Header="HOST" Binding="{Binding HostName}" /> <DataGridTextColumn Header="USER" Binding="{Binding User.Contact.FullName,Mode=OneTime}" /> - <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.EventTypesGroup.Name}" /> + <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" /> <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Name}" /> <DataGridTemplateColumn Header="MESSAGE" Width="1*"> <DataGridTemplateColumn.CellTemplate> @@ -219,7 +219,7 @@ <Style TargetType="ContentControl"> <Setter Property="ContentTemplate" Value="{x:Null}"></Setter> <Style.Triggers> - <DataTrigger Binding="{Binding Type}" Value="ApplicationStarted"> + <DataTrigger Binding="{Binding Type}" Value="APPLICATION_STARTED"> <Setter Property="ContentTemplate"> <Setter.Value> <DataTemplate> |