aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-01-18 16:20:02 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-01-18 16:20:02 +0200
commit5e68543fd93e441e1e76acc3f439594f66c4412a (patch)
treed64d3d48f1e91723c70a16b484be4cb456584ac1 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views
parent448632f4057e9a81b8bc80701296dcd4ec622877 (diff)
downloadTango-5e68543fd93e441e1e76acc3f439594f66c4412a.tar.gz
Tango-5e68543fd93e441e1e76acc3f439594f66c4412a.zip
Removed Deleted from most of DB Tables !!!!!!!!!!!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml6
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml4
2 files changed, 5 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml
index 699a9ceb6..543e6b40c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml
@@ -28,11 +28,11 @@
<TextBox Text="{Binding EditEntity.Name}"></TextBox>
<TextBlock Text="Configuration:" FontWeight="Bold"></TextBlock>
<ComboBox ItemsSource="{Binding Adapter.Configurations}" SelectedItem="{Binding EditEntity.Configuration,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
- <TextBlock Text="Dispenser:" FontWeight="Bold"></TextBlock>
- <ComboBox ItemsSource="{Binding Adapter.Dispensers}" SelectedItem="{Binding EditEntity.Dispenser,Mode=TwoWay}">
+ <TextBlock Text="Dispenser Type:" FontWeight="Bold"></TextBlock>
+ <ComboBox ItemsSource="{Binding Adapter.DispenserTypes}" SelectedItem="{Binding EditEntity.DispenserTypes,Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate>
- <TextBlock><Run Text="{Binding SerialNumber}"></Run><Run>,</Run> <Run Text="{Binding DispenserTypes.Name}"></Run></TextBlock>
+ <TextBlock><Run Text="{Binding Name}"></Run></TextBlock>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
index 4a35b1900..e5043e3e2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
@@ -22,10 +22,10 @@
<DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
<DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
<DataGridTextColumn Header="Configuration" Binding="{Binding Configuration.Name}"></DataGridTextColumn>
- <DataGridTemplateColumn Header="Dispenser">
+ <DataGridTemplateColumn Header="Dispenser Type">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
- <TextBlock><Run Text="{Binding Dispenser.SerialNumber}"></Run><Run>,</Run> <Run Text="{Binding Dispenser.DispenserTypes.Name}"></Run></TextBlock>
+ <TextBlock><Run Text="{Binding DispenserTypes.Name}"></Run></TextBlock>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>