From 20482140c124fd1d5caaffcc9b0dfe853b30dd6f Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Sat, 27 Jan 2018 17:18:10 +0200
Subject: Re-factored DAL Observables using EF Code First !!!!!!

---
 .../Tango.MachineStudio.DB/Views/DBViews/CatView.xaml      |  2 +-
 .../Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml     |  4 ++--
 .../Views/DBViews/ConfigurationView.xaml                   | 14 +++++++-------
 .../Views/DBViews/ConfigurationsView.xaml                  | 14 +++++++-------
 .../Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml  |  8 ++++----
 .../Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml | 10 +++++-----
 .../Views/DBViews/LiquidTypesRmlView.xaml                  |  2 +-
 .../Views/DBViews/LiquidTypesRmlsView.xaml                 |  4 ++--
 .../Views/DBViews/MachineVersionView.xaml                  |  2 +-
 .../Views/DBViews/MachineVersionsView.xaml                 |  2 +-
 .../Tango.MachineStudio.DB/Views/DBViews/MachineView.xaml  |  2 +-
 .../Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml |  2 +-
 .../Views/DBViews/ProcessParametersTableView.xaml          |  2 +-
 .../Views/DBViews/ProcessParametersTablesView.xaml         |  2 +-
 .../Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml      | 14 +++++++-------
 .../Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml     | 14 +++++++-------
 16 files changed, 49 insertions(+), 49 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml
index 9cd01cfc4..080591c15 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml
@@ -32,7 +32,7 @@
             <TextBox Text="{Binding EditEntity.Name}"></TextBox>
 
             <TextBlock Text="Liquid Type:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidTypes,Mode=TwoWay}">
+            <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidType,Mode=TwoWay}">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
index e72146525..6eb693780 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
@@ -23,13 +23,13 @@
                     <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Liquid Type" Binding="{Binding LiquidTypes.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Liquid Type" Binding="{Binding LiquidType.Name}"></DataGridTextColumn>
                     <DataGridTemplateColumn Header="Liquid Type Color">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <Rectangle Width="50">
                                     <Rectangle.Fill>
-                                        <SolidColorBrush Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter},Mode=TwoWay}"></SolidColorBrush>
+                                        <SolidColorBrush Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter},Mode=TwoWay}"></SolidColorBrush>
                                     </Rectangle.Fill>
                                 </Rectangle>
                             </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationView.xaml
index afbaf660a..2e34379e5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationView.xaml
@@ -28,25 +28,25 @@
             <TextBlock Text="Creation Date:" FontWeight="Bold"></TextBlock>
             <TextBox Text="{Binding EditEntity.CreationDate,Mode=TwoWay}" IsReadOnly="True"></TextBox>
             <TextBlock Text="Application Version:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.ApplicationVersions}" SelectedItem="{Binding EditEntity.ApplicationVersions,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.ApplicationVersions}" SelectedItem="{Binding EditEntity.ApplicationVersion,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
 
             <TextBlock Text="Application Firmware Version:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.ApplicationFirmwareVersions}" SelectedItem="{Binding EditEntity.ApplicationFirmwareVersions,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.ApplicationFirmwareVersions}" SelectedItem="{Binding EditEntity.ApplicationFirmwareVersion,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
 
             <TextBlock Text="Application OS Version:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.ApplicationOsVersions}" SelectedItem="{Binding EditEntity.ApplicationOsVersions,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.ApplicationOsVersions}" SelectedItem="{Binding EditEntity.ApplicationOsVersion,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
 
             <TextBlock Text="Display Panel Version:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.ApplicationDisplayPanelVersions}" SelectedItem="{Binding EditEntity.ApplicationDisplayPanelVersions,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.ApplicationDisplayPanelVersions}" SelectedItem="{Binding EditEntity.ApplicationDisplayPanelVersion,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
 
             <TextBlock Text="Embedded Firmware Version:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.EmbeddedFirmwareVersions}" SelectedItem="{Binding EditEntity.EmbeddedFirmwareVersions,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.EmbeddedFirmwareVersions}" SelectedItem="{Binding EditEntity.EmbeddedFirmwareVersion,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
 
             <TextBlock Text="Embedded Software Version:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.EmbeddedSoftwareVersions}" SelectedItem="{Binding EditEntity.EmbeddedSoftwareVersions,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.EmbeddedSoftwareVersions}" SelectedItem="{Binding EditEntity.EmbeddedSoftwareVersion,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
 
             <TextBlock Text="Hardware Version:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.HardwareVersions}" SelectedItem="{Binding EditEntity.HardwareVersions,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.HardwareVersions}" SelectedItem="{Binding EditEntity.HardwareVersion,Mode=TwoWay}" ItemTemplate="{StaticResource comTemplate}"></ComboBox>
 
         </controls:TableGrid>
     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationsView.xaml
index 235e49cc3..819dbd1c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ConfigurationsView.xaml
@@ -16,13 +16,13 @@
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Creation Date" Binding="{Binding CreationDate}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Application Version" Binding="{Binding ApplicationVersions.Version}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Application OS" Binding="{Binding ApplicationOsVersions.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Application Firmware Version" Binding="{Binding ApplicationFirmwareVersions.Version}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Display Panel" Binding="{Binding ApplicationDisplayPanelVersions.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Embedded Firmware Version" Binding="{Binding EmbeddedFirmwareVersions.Version}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Embedded Software Version" Binding="{Binding EmbeddedSoftwareVersions.Version}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Hardware Version" Binding="{Binding HardwareVersions.Version}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Application Version" Binding="{Binding ApplicationVersion.Version}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Application OS" Binding="{Binding ApplicationOsVersion.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Application Firmware Version" Binding="{Binding ApplicationFirmwareVersion.Version}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Display Panel" Binding="{Binding ApplicationDisplayPanelVersion.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Embedded Firmware Version" Binding="{Binding EmbeddedFirmwareVersion.Version}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Embedded Software Version" Binding="{Binding EmbeddedSoftwareVersion.Version}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Hardware Version" Binding="{Binding HardwareVersion.Version}"></DataGridTextColumn>
                 </DataGrid.Columns>
             </DataGrid>
         </controls:DbTableView>
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 543e6b40c..537bdb9f7 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
@@ -29,7 +29,7 @@
             <TextBlock Text="Configuration:" FontWeight="Bold"></TextBlock>
             <ComboBox ItemsSource="{Binding Adapter.Configurations}" SelectedItem="{Binding EditEntity.Configuration,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
             <TextBlock Text="Dispenser Type:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.DispenserTypes}" SelectedItem="{Binding EditEntity.DispenserTypes,Mode=TwoWay}">
+            <ComboBox ItemsSource="{Binding Adapter.DispenserTypes}" SelectedItem="{Binding EditEntity.DispenserType,Mode=TwoWay}">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
                         <TextBlock><Run Text="{Binding Name}"></Run></TextBlock>
@@ -37,7 +37,7 @@
                 </ComboBox.ItemTemplate>
             </ComboBox>
             <TextBlock Text="Liquid Type:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidTypes,Mode=TwoWay}">
+            <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidType,Mode=TwoWay}">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -52,7 +52,7 @@
                 </ComboBox.ItemTemplate>
             </ComboBox>
             <TextBlock Text="Cartridge Type:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.CartridgeTypes}" SelectedItem="{Binding EditEntity.CartridgeTypes,Mode=TwoWay}">
+            <ComboBox ItemsSource="{Binding Adapter.CartridgeTypes}" SelectedItem="{Binding EditEntity.CartridgeType,Mode=TwoWay}">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
                         <TextBlock><Run Text="{Binding Name}"></Run></TextBlock>
@@ -61,7 +61,7 @@
             </ComboBox>
 
             <TextBlock Text="Mid Tank Type:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.MidTankTypes}" SelectedItem="{Binding EditEntity.MidTankTypes,Mode=TwoWay}">
+            <ComboBox ItemsSource="{Binding Adapter.MidTankTypes}" SelectedItem="{Binding EditEntity.MidTankType,Mode=TwoWay}">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
                         <TextBlock><Run Text="{Binding Name}"></Run></TextBlock>
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 e5043e3e2..0837bbf9f 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
@@ -25,7 +25,7 @@
                     <DataGridTemplateColumn Header="Dispenser Type">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock><Run Text="{Binding DispenserTypes.Name}"></Run></TextBlock>
+                                <TextBlock><Run Text="{Binding DispenserType.Name}"></Run></TextBlock>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
@@ -35,10 +35,10 @@
                                 <StackPanel Orientation="Horizontal">
                                     <Rectangle Width="16" Height="16" VerticalAlignment="Center">
                                         <Rectangle.Fill>
-                                            <SolidColorBrush Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                            <SolidColorBrush Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
                                         </Rectangle.Fill>
                                     </Rectangle>
-                                    <TextBlock Margin="5 0 0 0" Text="{Binding LiquidTypes.Name}" VerticalAlignment="Center"></TextBlock>
+                                    <TextBlock Margin="5 0 0 0" Text="{Binding LiquidType.Name}" VerticalAlignment="Center"></TextBlock>
                                 </StackPanel>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
@@ -46,14 +46,14 @@
                     <DataGridTemplateColumn Header="Cartridge Type">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock><Run Text="{Binding CartridgeTypes.Name}"></Run></TextBlock>
+                                <TextBlock><Run Text="{Binding CartridgeType.Name}"></Run></TextBlock>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
                     <DataGridTemplateColumn Header="Mid Tank Type">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock><Run Text="{Binding MidTankTypes.Name}"></Run></TextBlock>
+                                <TextBlock><Run Text="{Binding MidTankType.Name}"></Run></TextBlock>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml
index a3b3f5eed..2fbe2365c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlView.xaml
@@ -21,7 +21,7 @@
             <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
             <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True" IsEnabled="False"></TextBox>
             <TextBlock Text="Liquid Type:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidTypes,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidType,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
             <TextBlock Text="RML:" FontWeight="Bold"></TextBlock>
             <ComboBox ItemsSource="{Binding Adapter.Rmls}" SelectedItem="{Binding EditEntity.Rml}" DisplayMemberPath="Name"></ComboBox>
             <TextBlock Text="Max nl/cm:" FontWeight="Bold"></TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml
index f96402432..11f781e5b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/LiquidTypesRmlsView.xaml
@@ -16,9 +16,9 @@
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Liquid Type" Binding="{Binding LiquidTypes.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Liquid Type" Binding="{Binding LiquidType.Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="RML" Binding="{Binding Rml.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Maximum Nanolitter Per Centimeter" Binding="{Binding MaxNlPerCm}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Maximum Nanoliter Per Centimeter" Binding="{Binding MaxNlPerCm}"></DataGridTextColumn>
                 </DataGrid.Columns>
             </DataGrid>
         </controls:DbTableView>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionView.xaml
index 50a1c790b..a15f9c9e1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionView.xaml
@@ -21,7 +21,7 @@
             <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
             <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
             <TextBlock Text="Default Configuration:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.Configurations}" SelectedItem="{Binding EditEntity.Configuration,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.Configurations}" SelectedItem="{Binding EditEntity.DefaultConfiguration,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
         </controls:TableGrid>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionsView.xaml
index 08cac568f..be917634a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineVersionsView.xaml
@@ -16,7 +16,7 @@
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Version" Binding="{Binding Version}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Default Configuration" Binding="{Binding Configuration.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Default Configuration" Binding="{Binding DefaultConfiguration.Name}"></DataGridTextColumn>
                 </DataGrid.Columns>
             </DataGrid>
         </controls:DbTableView>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineView.xaml
index 0a7ee4c32..ab880a8a8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachineView.xaml
@@ -22,7 +22,7 @@
             <TextBlock Text="Organization:" FontWeight="Bold"></TextBlock>
             <ComboBox ItemsSource="{Binding Adapter.Organizations}" SelectedItem="{Binding EditEntity.Organization,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
             <TextBlock Text="Version:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.MachineVersions}" SelectedItem="{Binding EditEntity.MachineVersions,Mode=TwoWay}" DisplayMemberPath="Version"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.MachineVersions}" SelectedItem="{Binding EditEntity.MachineVersion,Mode=TwoWay}" DisplayMemberPath="Version"></ComboBox>
             <TextBlock Text="Configuration:" FontWeight="Bold"></TextBlock>
             <ComboBox ItemsSource="{Binding Adapter.Configurations}" SelectedItem="{Binding EditEntity.Configuration,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
         </controls:TableGrid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml
index ea48667d9..c6febd63c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MachinesView.xaml
@@ -16,7 +16,7 @@
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Serial Number" Binding="{Binding SerialNumber}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Version" Binding="{Binding MachineVersions.Version}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Version" Binding="{Binding MachineVersion.Version}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Organization" Binding="{Binding Organization.Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Configuration" Binding="{Binding Configuration.Name}"></DataGridTextColumn>
                 </DataGrid.Columns>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTableView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTableView.xaml
index 1e3933ce0..75b559bf2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTableView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTableView.xaml
@@ -23,7 +23,7 @@
             <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
             <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
             <TextBlock Text="Group:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.ProcessParametersTablesGroups}" SelectedItem="{Binding EditEntity.ProcessParametersTablesGroups,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.ProcessParametersTablesGroups}" SelectedItem="{Binding EditEntity.ProcessParametersTablesGroup,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
             <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
             <TextBox Text="{Binding EditEntity.Name,Mode=TwoWay}"></TextBox>
             <TextBlock Text="Index:" FontWeight="Bold"></TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesView.xaml
index d9ad83f68..0e20ce5af 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ProcessParametersTablesView.xaml
@@ -21,7 +21,7 @@
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Group" Binding="{Binding ProcessParametersTablesGroups.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Group" Binding="{Binding ProcessParametersTablesGroup.Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Index" Binding="{Binding TableIndex}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Dyeing Speed" Binding="{Binding DyeingSpeed}"></DataGridTextColumn>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml
index adf5310ee..43a17d8e4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlView.xaml
@@ -32,10 +32,10 @@
             <TextBox Text="{Binding EditEntity.Manufacturer}"></TextBox>
             
             <TextBlock Text="Material:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.MediaMaterials}" SelectedItem="{Binding EditEntity.MediaMaterials,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.MediaMaterials}" SelectedItem="{Binding EditEntity.MediaMaterial,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
             <TextBlock Text="Color:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.MediaColors}" SelectedItem="{Binding EditEntity.MediaColors,Mode=TwoWay}">
+            <ComboBox ItemsSource="{Binding Adapter.MediaColors}" SelectedItem="{Binding EditEntity.MediaColor,Mode=TwoWay}">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -50,19 +50,19 @@
             </ComboBox>
 
             <TextBlock Text="Purpose:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.MediaPurposes}" SelectedItem="{Binding EditEntity.MediaPurposes,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.MediaPurposes}" SelectedItem="{Binding EditEntity.MediaPurpose,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
             <TextBlock Text="Condition:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.MediaConditions}" SelectedItem="{Binding EditEntity.MediaConditions,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.MediaConditions}" SelectedItem="{Binding EditEntity.MediaCondition,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
             <TextBlock Text="Linear Mass Density Unit:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.LinearMassDensityUnits}" SelectedItem="{Binding EditEntity.LinearMassDensityUnits,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.LinearMassDensityUnits}" SelectedItem="{Binding EditEntity.LinearMassDensityUnit,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
             <TextBlock Text="Fiber Shape:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.FiberShapes}" SelectedItem="{Binding EditEntity.FiberShapes,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.FiberShapes}" SelectedItem="{Binding EditEntity.FiberShape,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
             <TextBlock Text="Fiber Syntheses:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.FiberSynths}" SelectedItem="{Binding EditEntity.FiberSynths,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+            <ComboBox ItemsSource="{Binding Adapter.FiberSynths}" SelectedItem="{Binding EditEntity.FiberSynth,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
             <TextBlock Text="Fiber Size:" FontWeight="Bold"></TextBlock>
             <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.FiberSize,Mode=TwoWay}"></mahapps:NumericUpDown>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
index 0a02c6821..86a61d400 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/RmlsView.xaml
@@ -23,23 +23,23 @@
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Manufacturer" Binding="{Binding Manufacturer}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Material" Binding="{Binding MediaMaterials.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Material" Binding="{Binding MediaMaterial.Name}"></DataGridTextColumn>
                     <DataGridTemplateColumn Header="Color">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <Rectangle Width="50">
                                     <Rectangle.Fill>
-                                        <SolidColorBrush Color="{Binding MediaColors.Color,Converter={StaticResource ColorToIntegerConverter},Mode=TwoWay}"></SolidColorBrush>
+                                        <SolidColorBrush Color="{Binding MediaColor.Color,Converter={StaticResource ColorToIntegerConverter},Mode=TwoWay}"></SolidColorBrush>
                                     </Rectangle.Fill>
                                 </Rectangle>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <DataGridTextColumn Header="Purpose" Binding="{Binding MediaPurposes.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Condition" Binding="{Binding MediaConditions.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Linear Mass Density Unit" Binding="{Binding LinearMassDensityUnits.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Fiber Shape" Binding="{Binding FiberShapes.Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Fiber Syntheses" Binding="{Binding FiberSynths.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Purpose" Binding="{Binding MediaPurpose.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Condition" Binding="{Binding MediaCondition.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Linear Mass Density Unit" Binding="{Binding LinearMassDensityUnit.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Fiber Shape" Binding="{Binding FiberShape.Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Fiber Syntheses" Binding="{Binding FiberSynth.Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Fiber Size" Binding="{Binding FiberSize}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Fibers Count" Binding="{Binding NumberOfFibers}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Plies Per Fiber" Binding="{Binding PliesPerFiber}"></DataGridTextColumn>
-- 
cgit v1.3.1