diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-09 16:41:18 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-09 16:41:18 +0200 |
| commit | a15947f35cc602d26cf3f51a5c76b6ada939ea12 (patch) | |
| tree | 0dbd6c979324bb0714f5dd16df05f9290dac867d /Software/Visual_Studio/MachineStudio/Modules | |
| parent | aeebb8d47e1d78b50d9ae5afd9df6eaf9765ed87 (diff) | |
| download | Tango-a15947f35cc602d26cf3f51a5c76b6ada939ea12.tar.gz Tango-a15947f35cc602d26cf3f51a5c76b6ada939ea12.zip | |
Implemented job upload using JobDescriptionFile.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
3 files changed, 6 insertions, 6 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml index c9c7a4efc..16d312da4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml @@ -190,8 +190,8 @@ </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn> <DataGridTextColumn SortDirection="Descending" Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" /> - <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.EventTypesGroup.Name}" /> - <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Name}" /> + <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" /> + <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Title}" /> <DataGridTemplateColumn Header="MESSAGE" Width="1*"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> 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> |