merge conflicts

1 files changed, 39 insertions, 1 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 5fd086198..fd31cd950 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
@@ -115,6 +115,21 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _selectedSpool = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
+        private Site _selectedSite;
+        public Site SelectedSite
+        {
+            get { return _selectedSite; }
+            set { _selectedSite = value; RaisePropertyChangedAuto(); }
+        }
+
+        private List<Site> _sites;
+        public List<Site> Sites
+        {
+            get { return _sites; }
+            set { _sites = value; RaisePropertyChangedAuto(); }
+        }
+
+
         private ColorCalibrationViewVM _colorCalibrationViewVM;
         public ColorCalibrationViewVM ColorCalibrationViewVM
         {
@@ -123,7 +138,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         }
 
         private HardwareConfigurationViewVM _hardwareConfigurationViewVM;
-
         public HardwareConfigurationViewVM HardwareConfigurationViewVM
         {
             get { return _hardwareConfigurationViewVM; }
@@ -134,6 +148,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             }
         }
 
+        private MachineUpdatesViewVM _machineUpdatesViewVM;
+        public MachineUpdatesViewVM MachineUpdatesViewVM
+        {
+            get { return _machineUpdatesViewVM; }
+            set { _machineUpdatesViewVM = value; RaisePropertyChangedAuto(); }
+        }
+
+        private TupViewVM _tupViewVM;
+        public TupViewVM TupViewVM
+        {
+            get { return _tupViewVM; }
+            set { _tupViewVM = value; RaisePropertyChangedAuto(); }
+        }
 
         #endregion
 
@@ -225,6 +252,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             RemoveSpoolCommand = new RelayCommand(RemoveSpool, () => SelectedSpool != null);
             CloneMachineCommand = new RelayCommand(CloneMachine, () => SelectedMachine != null);
             ResetDeviceRegistrationCommand = new RelayCommand(ResetDeviceRegistration);
+
+            MachineUpdatesViewVM = new MachineUpdatesViewVM(_notification);
+            TupViewVM = new TupViewVM(_notification);
         }
 
         #endregion
@@ -459,6 +489,10 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         }
                     }
 
+                    Sites = await ActiveMachineAdapter.Context.Sites.ToListAsync();
+                    Sites.Insert(0, new Site() { Name = "NONE", ID = -1 });
+                    SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid);
+
                     ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, ActiveMachine, _activeMachineAdapter.Context)
                     {
                         Rmls = ActiveMachineAdapter.Rmls,
@@ -469,6 +503,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     HardwareConfigurationViewVM = new HardwareConfigurationViewVM(_notification);
                     HardwareConfigurationViewVM.Init(ActiveMachine.Configuration);
 
+                    await MachineUpdatesViewVM.Init(ActiveMachine, ActiveMachineAdapter.Context);
+                    TupViewVM.Init(ActiveMachine);
+
                     ActiveMachine.Configuration.HardwareVersionChanged += Configuration_HardwareVersionChanged;
 
                     View.NavigateTo(MachineDesignerNavigationView.MachineDetailsView);
@@ -632,6 +669,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     ActiveMachine.ConfigurationGuid = ActiveMachine.Configuration.Guid;
                     ActiveMachine.LastUpdated = DateTime.UtcNow;
                     ActiveMachine.ProductionDate = DateTime.UtcNow;
+                    ActiveMachine.SiteGuid = SelectedSite == null ? null : (SelectedSite.ID == -1 ? null : SelectedSite.Guid);
 
                     ColorCalibrationViewVM.Save();