1 files changed, 10 insertions, 9 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/MachineViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/MachineViewVM.cs
index cbd6c1cf1..24a0cbc42 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/MachineViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/ViewModels/MachineViewVM.cs
@@ -7,6 +7,7 @@ using Tango.BL.Entities;
 using Tango.FSE.Common;
 using Tango.FSE.Common.Navigation;
 using Tango.FSE.MachineConfiguration.Messages;
+using static Tango.FSE.BL.Services.MachineConfigurationService;
 using static Tango.FSE.MachineConfiguration.ViewModels.MachineViewVM;
 
 namespace Tango.FSE.MachineConfiguration.ViewModels
@@ -15,7 +16,7 @@ namespace Tango.FSE.MachineConfiguration.ViewModels
     {
         public class NavigationObject
         {
-            public String MachineSerialNumber { get; set; }
+            public String MachineGuid { get; set; }
         }
 
         public enum NavigationView
@@ -35,25 +36,25 @@ namespace Tango.FSE.MachineConfiguration.ViewModels
             }
         }
 
-        private Machine _machine;
-        public Machine Machine
+        private MachineEditingComposition _editingComposition;
+        public MachineEditingComposition EditingComposition
         {
-            get { return _machine; }
-            set { _machine = value; RaisePropertyChangedAuto(); }
+            get { return _editingComposition; }
+            set { _editingComposition = value; RaisePropertyChangedAuto(); }
         }
 
         public void OnNavigatedToWithObject(NavigationObject obj)
         {
             SelectedView = NavigationView.ConfigurationView;
-            LoadMachine(obj.MachineSerialNumber);
+            LoadMachine(obj.MachineGuid);
         }
 
-        private async void LoadMachine(String serialNumber)
+        private async void LoadMachine(String machineGuid)
         {
             using (NotificationProvider.PushTaskItem("Loading machine configuration..."))
             {
-                Machine = await Services.MachinesService.GetMachineFull(serialNumber);
-                RaiseMessage(new MachineLoadedMessage() { Machine = Machine });
+                EditingComposition = await Services.MachineConfigurationService.GetMachineEditingComposition(machineGuid);
+                RaiseMessage(new EditingCompositionLoadedMessage() { EditingComposition = EditingComposition });
             }
         }
     }