Added ObservablesContextAdapter and it's interactions.

6 files changed, 17 insertions, 16 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
index f0b33ed06..1811ea7c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
@@ -443,7 +443,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             {
                 IsFree = false;
 
-                _dbContext.GetConfiguration(x => x.Guid == SelectedMachine.ConfigurationGuid);
+                _dbContext.Adapter.GetConfiguration(x => x.Guid == SelectedMachine.ConfigurationGuid);
 
                 LiquidVolumes = SelectedMachine.Configuration.NoneEmptyIdsPacks.OrderBy(x => x.PackIndex).Select(x => new LiquidVolumeVM()
                 {
@@ -558,10 +558,10 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
                 {
                     using (_notification.PushTaskItem("Loading RML data..."))
                     {
-                        _dbContext.GetConfiguration(x => x.Guid == SelectedMachine.ConfigurationGuid);
-                        _dbContext.GetRmlCCTs(SelectedRML.Guid);
-                        _dbContext.GetRmlCATs(SelectedRML.Guid, SelectedMachine.Guid);
-                        _dbContext.GetRmlLiquidTypes(SelectedRML.Guid);
+                        _dbContext.Adapter.GetConfiguration(x => x.Guid == SelectedMachine.ConfigurationGuid);
+                        _dbContext.Adapter.GetRmlCCTs(SelectedRML.Guid);
+                        _dbContext.Adapter.GetRmlCATs(SelectedRML.Guid, SelectedMachine.Guid);
+                        _dbContext.Adapter.GetRmlLiquidTypes(SelectedRML.Guid);
 
                         LiquidTypesRmls = SelectedMachine.Configuration.NoneEmptyIdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList();
                         //RmlProcessParametersTableGroup = SelectedRML.ProcessParametersTablesGroups.ToList().SingleOrDefault(x => x.Active);
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
index 8dcd92691..54b954745 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
@@ -70,7 +70,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             CurrentVersion = new HardwareVersion();
 
             SaveCommand = new RelayCommand(Save, () => SelectedVersion != null && IsFree);
-            NewCommand = new RelayCommand(New,() => IsFree);
+            NewCommand = new RelayCommand(New, () => IsFree);
             DeleteCommand = new RelayCommand(Delete, () => !_isNew && SelectedVersion != null && IsFree);
 
             CurrentVersion = new HardwareVersion();
@@ -133,7 +133,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             _db = ObservablesContext.CreateDefault();
             _db.Configuration.LazyLoadingEnabled = false;
 
-            CurrentVersion = _db.GetHardwareVersion(x => x.Guid == selectedVersion.Guid);
+            CurrentVersion = _db.Adapter.GetHardwareVersion(x => x.Guid == selectedVersion.Guid);
 
 
             InvokeUINow(() =>
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 bac916771..183cdb247 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
@@ -271,7 +271,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         InitCollections().Wait();
                         Machine = _db.Machines.Where(x => x.Guid == SelectedMachine.Guid).Include(x => x.Organization).SingleOrDefault(x => x.Guid == SelectedMachine.Guid);
-                        Configuration = _db.GetConfiguration(x => x.Guid == Machine.ConfigurationGuid);
+                        Configuration = _db.Adapter.GetConfiguration(x => x.Guid == Machine.ConfigurationGuid);
 
                         SetHistory();
 
@@ -300,7 +300,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         CanWork = false;
 
-                        SelectedHistoryConfiguration = _db.GetConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
+                        SelectedHistoryConfiguration = _db.Adapter.GetConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
                         Configuration = SelectedHistoryConfiguration;
                         Machine.Configuration = Configuration;
 
@@ -688,7 +688,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     await Task.Factory.StartNew(() =>
                     {
                         var version = _db.MachineVersions.Where(x => x.Guid == Machine.MachineVersion.Guid).Include(x => x.DefaultConfiguration).FirstOrDefault();
-                        var version_config = _db.GetConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
+                        var version_config = _db.Adapter.GetConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
                         Configuration = version_config.Clone();
                         Machine.Configuration = Configuration;
                     });
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs
index 1bedcb1ca..4aedf8bc7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ProcessParametersItem.cs
@@ -106,7 +106,7 @@ namespace Tango.MachineStudio.Technician.TechItems
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    var group = db.GetActiveProcessParametersTablesGroup(SelectedResetRML.Guid);
+                    var group = db.Adapter.GetRmlActiveProcessParametersTablesGroup(SelectedResetRML.Guid);
 
                     if (group != null)
                     {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index f96960883..55235b3c2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -1682,8 +1682,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         {
                             using (ObservablesContext db = ObservablesContext.CreateDefault())
                             {
-                                config = db.GetConfiguration(x => x.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid).Clone();
-                                hw = db.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid).Clone();
+                                config = db.Adapter.GetConfiguration(x => x.Guid == ApplicationManager.ConnectedMachine.Machine.ConfigurationGuid).Clone();
+                                hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid).Clone();
                             }
                         });
 
@@ -1773,12 +1773,13 @@ namespace Tango.MachineStudio.Technician.ViewModels
             if (MachineOperator != null)
             {
                 ObservablesContext db = ObservablesContext.CreateDefault();
+                ObservablesContextAdapter adapter = new ObservablesContextAdapter(db);
 
                 HardwareVersion hw = null;
 
                 await Task.Factory.StartNew(() =>
                 {
-                    hw = db.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid);
+                    hw = adapter.GetHardwareVersionByMachine(ApplicationManager.ConnectedMachine.Machine.Guid);
                 });
 
                 foreach (var motorConfig in hw.HardwareMotors)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
index a5ef4f095..0def388d3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
@@ -202,7 +202,7 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                     _userContext.Configuration.LazyLoadingEnabled = false;
 
                     Roles = _userContext.Roles.ToObservableCollection();
-                    ManagedUser = _userContext.GetUser(SelectedUser.Guid);
+                    ManagedUser = _userContext.Adapter.GetUser(SelectedUser.Guid);
                     ManagedUserRoles = ManagedUser.Roles.ToObservableCollection();
                 });
 
@@ -258,7 +258,7 @@ namespace Tango.MachineStudio.UsersAndRoles.ViewModels
                     _manageContext = ObservablesContext.CreateDefault();
                     _manageContext.Configuration.LazyLoadingEnabled = false;
 
-                    ManagedOrganization = _manageContext.GetOrganizationAndUsers(SelectedOrganization.Guid);
+                    ManagedOrganization = _manageContext.Adapter.GetOrganizationAndUsers(SelectedOrganization.Guid);
                 });
 
                 _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationManagementView);