diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-01-16 13:45:38 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-01-16 13:45:38 +0200 |
| commit | 994456523c7adf2f77dd7f74c639262b59d56ec4 (patch) | |
| tree | e238062693ee5e877a86a777cc279498cb31ab0b /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views | |
| parent | 09e4d329538f348c759534f282f2a6ed3bb42420 (diff) | |
| parent | 1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e (diff) | |
| download | Tango-994456523c7adf2f77dd7f74c639262b59d56ec4.tar.gz Tango-994456523c7adf2f77dd7f74c639262b59d56ec4.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views')
2 files changed, 4 insertions, 4 deletions
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 2dda7d342..389b18776 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 @@ -54,7 +54,7 @@ </Style> </materialDesign:PackIcon.Style> </materialDesign:PackIcon> - <TextBlock VerticalAlignment="Center" Text="{Binding Event.EventType.Name}" Margin="10 0 0 0" FontSize="16"></TextBlock> + <TextBlock VerticalAlignment="Center" Text="{Binding Event.EventType.Title}" Margin="10 0 0 0" FontSize="16"></TextBlock> </StackPanel> <Grid Grid.Row="1"> @@ -68,7 +68,7 @@ <TextBlock Text="Machine:" FontWeight="SemiBold" /> <TextBlock Text="{Binding Event.Machine.SerialNumber}"></TextBlock> <TextBlock Text="User:" FontWeight="SemiBold" /> - <TextBlock Text="{Binding Event.User.Contact.FullName}"></TextBlock> + <TextBlock Text="{Binding Event.EventUser.Contact.FullName}"></TextBlock> </controls:TableGrid> <controls:TableGrid RowHeight="30"> 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 846ea1fe2..632495103 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 @@ -201,9 +201,9 @@ </DataGridTemplateColumn> <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="USER" Binding="{Binding EventUser.Contact.FullName,Mode=OneTime}" /> <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" /> - <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Name}" /> + <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Title}" /> <DataGridTemplateColumn Header="MESSAGE" Width="1*"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> |