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

1 files changed, 29 insertions, 29 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 9f44bc270..5cb216a6c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -253,7 +253,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="applicationDisplayPanelVersion">The application display panel version.</param>
         public void DropTouchPanel(ApplicationDisplayPanelVersion applicationDisplayPanelVersion)
         {
-            Configuration.ApplicationDisplayPanelVersions = applicationDisplayPanelVersion;
+            Configuration.ApplicationDisplayPanelVersion = applicationDisplayPanelVersion;
             Configuration.ApplicationDisplayPanelVersionGuid = applicationDisplayPanelVersion.Guid;
         }
 
@@ -263,7 +263,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="applicationFirmwareVersion">The application firmware version.</param>
         public void DropApplicationFirmwareVersion(ApplicationFirmwareVersion applicationFirmwareVersion)
         {
-            Configuration.ApplicationFirmwareVersions = applicationFirmwareVersion;
+            Configuration.ApplicationFirmwareVersion = applicationFirmwareVersion;
             Configuration.ApplicationFirmwareVersionGuid = applicationFirmwareVersion.Guid;
         }
 
@@ -273,7 +273,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="applicationVersion">The application version.</param>
         public void DropApplicationVersion(ApplicationVersion applicationVersion)
         {
-            Configuration.ApplicationVersions = applicationVersion;
+            Configuration.ApplicationVersion = applicationVersion;
             Configuration.ApplicationVersionGuid = applicationVersion.Guid;
         }
 
@@ -283,7 +283,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="hardwareVersion">The hardware version.</param>
         public void DropHardwareVersion(HardwareVersion hardwareVersion)
         {
-            Configuration.HardwareVersions = hardwareVersion;
+            Configuration.HardwareVersion = hardwareVersion;
             Configuration.HardwareVersionGuid = hardwareVersion.Guid;
         }
 
@@ -293,7 +293,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="embeddedFirmwareVersion">The embedded firmware version.</param>
         public void DropEmbeddedFirmware(EmbeddedFirmwareVersion embeddedFirmwareVersion)
         {
-            Configuration.EmbeddedFirmwareVersions = embeddedFirmwareVersion;
+            Configuration.EmbeddedFirmwareVersion = embeddedFirmwareVersion;
             Configuration.EmbeddedFirmwareVersionGuid = embeddedFirmwareVersion.Guid;
         }
 
@@ -303,7 +303,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="embeddedSoftwareVersion">The embedded software version.</param>
         public void DropEmbeddedSoftware(EmbeddedSoftwareVersion embeddedSoftwareVersion)
         {
-            Configuration.EmbeddedSoftwareVersions = embeddedSoftwareVersion;
+            Configuration.EmbeddedSoftwareVersion = embeddedSoftwareVersion;
             Configuration.EmbeddedSoftwareVersionGuid = embeddedSoftwareVersion.Guid;
         }
 
@@ -313,7 +313,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="applicationOsVersion">The application os version.</param>
         public void DropApplicationOsVersion(ApplicationOsVersion applicationOsVersion)
         {
-            Configuration.ApplicationOsVersions = applicationOsVersion;
+            Configuration.ApplicationOsVersion = applicationOsVersion;
             Configuration.ApplicationVersionGuid = applicationOsVersion.Guid;
         }
 
@@ -324,7 +324,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="idsPack">The ids pack.</param>
         public void DropCartridgeType(CartridgeType cartridgeType, IdsPack idsPack)
         {
-            idsPack.CartridgeTypes = cartridgeType;
+            idsPack.CartridgeType = cartridgeType;
             idsPack.CartridgeTypeGuid = cartridgeType.Guid;
         }
 
@@ -335,7 +335,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="idsPack">The ids pack.</param>
         public void DropDispenserType(DispenserType dispenserType, IdsPack idsPack)
         {
-            idsPack.DispenserTypes = dispenserType;
+            idsPack.DispenserType = dispenserType;
             idsPack.DispenserTypeGuid = dispenserType.Guid;
         }
 
@@ -346,7 +346,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="idsPack">The ids pack.</param>
         public void DropMidTankType(MidTankType midTankType, IdsPack idsPack)
         {
-            idsPack.MidTankTypes = midTankType;
+            idsPack.MidTankType = midTankType;
             idsPack.MidTankTypeGuid = midTankType.Guid;
         }
 
@@ -357,7 +357,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="idsPack">The ids pack.</param>
         public void DropLiquidType(LiquidType liquidType, IdsPack idsPack)
         {
-            idsPack.LiquidTypes = liquidType;
+            idsPack.LiquidType = liquidType;
             idsPack.LiquidTypeGuid = liquidType.Guid;
         }
 
@@ -399,7 +399,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
             List<String> errors = new List<string>();
 
-            if (Machine.MachineVersions == null)
+            if (Machine.MachineVersion == null)
             {
                 errors.Add("Machine version is required.");
             }
@@ -424,37 +424,37 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 errors.Add("Configuration name is required.");
             }
 
-            if (Configuration.ApplicationDisplayPanelVersions == null)
+            if (Configuration.ApplicationDisplayPanelVersion == null)
             {
                 errors.Add("Touch Panel is required.");
             }
 
-            if (Configuration.ApplicationFirmwareVersions == null)
+            if (Configuration.ApplicationFirmwareVersion == null)
             {
                 errors.Add("Application firmware is required.");
             }
 
-            if (Configuration.ApplicationOsVersions == null)
+            if (Configuration.ApplicationOsVersion == null)
             {
                 errors.Add("Application operation system is required.");
             }
 
-            if (Configuration.ApplicationVersions == null)
+            if (Configuration.ApplicationVersion == null)
             {
                 errors.Add("Application version is required.");
             }
 
-            if (Configuration.EmbeddedFirmwareVersions == null)
+            if (Configuration.EmbeddedFirmwareVersion == null)
             {
                 errors.Add("Embedded firmware is required.");
             }
 
-            if (Configuration.EmbeddedSoftwareVersions == null)
+            if (Configuration.EmbeddedSoftwareVersion == null)
             {
                 errors.Add("Embedded software is required.");
             }
 
-            if (Configuration.HardwareVersions == null)
+            if (Configuration.HardwareVersion == null)
             {
                 errors.Add("Hardware version is required.");
             }
@@ -466,19 +466,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     errors.Add(String.Format("Name is required on IDS pack number '{0}'.", Configuration.IdsPacks.IndexOf(pack) + 1));
                     continue;
                 }
-                if (pack.CartridgeTypes == null)
+                if (pack.CartridgeType == null)
                 {
                     errors.Add(String.Format("Cartridge type is required on IDS pack '{0}'.", pack.Name));
                 }
-                if (pack.DispenserTypes == null)
+                if (pack.DispenserType == null)
                 {
                     errors.Add(String.Format("Dispenser type is required on IDS pack '{0}'.", pack.Name));
                 }
-                if (pack.LiquidTypes == null)
+                if (pack.LiquidType == null)
                 {
                     errors.Add(String.Format("Liquid type is required on IDS pack '{0}'.", pack.Name));
                 }
-                if (pack.MidTankTypes == null)
+                if (pack.MidTankType == null)
                 {
                     errors.Add(String.Format("Mid Tank type is required on IDS pack '{0}'.", pack.Name));
                 }
@@ -582,9 +582,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// </summary>
         private void SetVersionConfiguration()
         {
-            if (Machine.MachineVersions != null)
+            if (Machine.MachineVersion != null)
             {
-                Configuration = Machine.MachineVersions.Configuration.CloneConfiguration();
+                Configuration = Machine.MachineVersion.DefaultConfiguration.CloneConfiguration();
             }
             else
             {
@@ -605,8 +605,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         if (vm.SelectedVersion != null)
                         {
-                            vm.SelectedVersion.Configuration = Configuration.CloneConfiguration();
-                            vm.SelectedVersion.DefaultConfigurationGuid = vm.SelectedVersion.Configuration.Guid;
+                            vm.SelectedVersion.DefaultConfiguration = Configuration.CloneConfiguration();
+                            vm.SelectedVersion.DefaultConfigurationGuid = vm.SelectedVersion.DefaultConfiguration.Guid;
                             await vm.SelectedVersion.SaveAsync();
                         }
                         else
@@ -615,8 +615,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             newVersion.Version = vm.Version;
                             newVersion.Name = vm.VersionName;
 
-                            newVersion.Configuration = Configuration.CloneConfiguration();
-                            newVersion.DefaultConfigurationGuid = newVersion.Configuration.Guid;
+                            newVersion.DefaultConfiguration = Configuration.CloneConfiguration();
+                            newVersion.DefaultConfigurationGuid = newVersion.DefaultConfiguration.Guid;
                             await newVersion.SaveAsync();
                         }
                     }