Re-factored DAL Observables using EF Code First !!!!!!

1 files changed, 20 insertions, 20 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
index a7e604352..691fa6987 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
@@ -57,8 +57,8 @@
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Images/hardware.png" Width="10" VerticalAlignment="Center" Margin="5" RenderOptions.BitmapScalingMode="Fant"></Image>
                                 <TextBlock Padding="2 0 2 0" VerticalAlignment="Center" TextAlignment="Center" Foreground="Gainsboro" IsHitTestVisible="False" FontSize="6" TextWrapping="Wrap">
-                                            <Run Text="{Binding Configuration.HardwareVersions.Name}"></Run>
-                                            <Run Text="{Binding Configuration.HardwareVersions.Version}"></Run>
+                                            <Run Text="{Binding Configuration.HardwareVersion.Name}"></Run>
+                                            <Run Text="{Binding Configuration.HardwareVersion.Version}"></Run>
                                 </TextBlock>
                             </StackPanel>
                         </Border>
@@ -105,7 +105,7 @@
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
-                                    <Grid dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}">
+                                    <Grid dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" >
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="1*"/>
                                             <RowDefinition Height="30"/>
@@ -123,7 +123,7 @@
                                                     <Image.Style>
                                                         <Style TargetType="Image">
                                                             <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding DispenserTypes}" Value="{x:Null}">
+                                                                <DataTrigger Binding="{Binding DispenserType}" Value="{x:Null}">
                                                                     <Setter Property="Opacity" Value="0.2"></Setter>
                                                                 </DataTrigger>
                                                             </Style.Triggers>
@@ -134,7 +134,7 @@
                                                     <Rectangle.Fill>
                                                         <LinearGradientBrush StartPoint="0,0" EndPoint="0,0.8" Opacity="0.8">
                                                             <GradientStop Offset="0" Color="Transparent" />
-                                                            <GradientStop Offset="1" Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                            <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
                                                         </LinearGradientBrush>
                                                     </Rectangle.Fill>
                                                 </Rectangle>
@@ -145,7 +145,7 @@
                                                     <Image.Style>
                                                         <Style TargetType="Image">
                                                             <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding MidTankTypes}" Value="{x:Null}">
+                                                                <DataTrigger Binding="{Binding MidTankType}" Value="{x:Null}">
                                                                     <Setter Property="Opacity" Value="0.2"></Setter>
                                                                 </DataTrigger>
                                                             </Style.Triggers>
@@ -156,7 +156,7 @@
                                                     <Rectangle.Fill>
                                                         <LinearGradientBrush StartPoint="0,0" EndPoint="0,0.8" Opacity="0.8">
                                                             <GradientStop Offset="0" Color="Transparent" />
-                                                            <GradientStop Offset="1" Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                            <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
                                                         </LinearGradientBrush>
                                                     </Rectangle.Fill>
                                                 </Rectangle>
@@ -167,7 +167,7 @@
                                             <Grid.Style>
                                                 <Style TargetType="Grid">
                                                     <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding CartridgeTypes}" Value="{x:Null}">
+                                                        <DataTrigger Binding="{Binding CartridgeType}" Value="{x:Null}">
                                                             <Setter Property="Opacity" Value="0.2"></Setter>
                                                         </DataTrigger>
                                                     </Style.Triggers>
@@ -185,7 +185,7 @@
                                                 <Border.Background>
                                                     <LinearGradientBrush Opacity="0.7">
                                                         <GradientStop Offset="0" Color="Transparent" />
-                                                        <GradientStop Offset="1" Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                        <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
                                                     </LinearGradientBrush>
                                                 </Border.Background>
                                             </Border>
@@ -228,13 +228,13 @@
 
                         <StackPanel Orientation="Horizontal">
                             <Image Source="../Images/embedded.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
-                            <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersions.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersions.Version}"/></TextBlock>
+                            <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
                         </StackPanel>
                         <StackPanel Grid.Row="1" Orientation="Horizontal">
                             <Image Source="../Images/embedded-software.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
                             <TextBlock Padding="1" IsHitTestVisible="False" VerticalAlignment="Center" Foreground="Gainsboro" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="14" Margin="0,6,0,1" Width="47">
-                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.EmbeddedSoftwareVersion.Version}"></Run>
                             </TextBlock>
                         </StackPanel>
                     </Grid>
@@ -290,16 +290,16 @@
                         <StackPanel>
                             <Image Source="../Images/tablet.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                             <TextBlock Padding="2 0 2 0" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Version}"></Run>
                             </TextBlock>
                         </StackPanel>
 
                         <StackPanel Grid.Row="2" >
                             <Image Source="../Images/app.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                             <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationVersion.Version}"></Run>
                             </TextBlock>
                         </StackPanel>
 
@@ -307,16 +307,16 @@
                         <StackPanel Grid.Row="3" >
                             <Image Source="../Images/application-firmware.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                             <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Version}"></Run>
                             </TextBlock>
                         </StackPanel>
 
                         <StackPanel Grid.Row="1" >
                             <Image Source="../Images/android.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
                             <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationOsVersions.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationOsVersions.Version}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationOsVersion.Name}"></Run>
+                                        <Run Text="{Binding Configuration.ApplicationOsVersion.Version}"></Run>
                             </TextBlock>
                         </StackPanel>
                     </Grid>