Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 12 insertions, 7 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
index 48aae2b8f..1bd1e1eea 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
@@ -18,6 +18,7 @@ using Tango.PPC.Common.Connection;
 using Tango.PPC.Common.MachineSetup;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.OS;
+using Tango.PPC.Common.Web;
 using Tango.PPC.UI.ViewsContracts;
 using Tango.Settings;
 using Tango.SharedUI.Helpers;
@@ -60,6 +61,7 @@ namespace Tango.PPC.UI.ViewModels
         private MachineSetupResult _setup_result;
         private IOperationSystemManager _operationSystemManager;
         private IPPCApplicationManager _appManager;
+        private PPCWebClient _ppcWebClient;
 
         #region Properties
 
@@ -192,8 +194,9 @@ namespace Tango.PPC.UI.ViewModels
         /// </summary>
         /// <param name="applicationManager">The application manager.</param>
         /// <param name="machineSetupManager">The machine setup manager.</param>
-        public MachineSetupViewVM(IPPCApplicationManager applicationManager, IMachineSetupManager machineSetupManager, IOperationSystemManager operationSystemManager)
+        public MachineSetupViewVM(PPCWebClient ppcWebClient, IPPCApplicationManager applicationManager, IMachineSetupManager machineSetupManager, IOperationSystemManager operationSystemManager)
         {
+            _ppcWebClient = ppcWebClient;
             _appManager = applicationManager;
             MachineSetupManager = machineSetupManager;
 
@@ -210,11 +213,12 @@ namespace Tango.PPC.UI.ViewModels
             InstallCommand = new RelayCommand(Install);
             RestartCommand = new RelayCommand(() => { NavigateTo(MachineSetupView.WelcomeView); });
             TimeZoneSelectedCommand = new RelayCommand(() => { NavigateTo(MachineSetupView.EnvironmentView); });
-            EnvironmentSelectedCommand = new RelayCommand(() => 
+            EnvironmentSelectedCommand = new RelayCommand(() =>
             {
                 NavigateTo(MachineSetupView.SetupWelcomeView);
                 Settings.DeploymentSlot = DeploymentSlot;
                 HostAddress = Settings.GetMachineServiceAddress();
+                Settings.Save();
             });
 
             _operationSystemManager = operationSystemManager;
@@ -347,8 +351,9 @@ namespace Tango.PPC.UI.ViewModels
 
             try
             {
+                _ppcWebClient.Environment = DeploymentSlot;
                 await _operationSystemManager.ChangeTimeZone(SelectedTimeZone);
-                _setup_result = await MachineSetupManager.Setup(SerialNumber, HostAddress);
+                _setup_result = await MachineSetupManager.Setup(SerialNumber);
                 State = MachineSetupStates.Completed;
                 LogManager.Log("Machine setup completed.");
                 await NavigateTo(MachineSetupView.SetupCompletedView);
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index 2f6199ecb..6046f0300 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -136,7 +136,7 @@ namespace Tango.PPC.UI.ViewModels
             {
                 IsDbUpdate = false;
 
-                var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
+                var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber);
 
                 if (response.IsUpdateAvailable)
                 {
@@ -145,7 +145,7 @@ namespace Tango.PPC.UI.ViewModels
                 }
                 else
                 {
-                    _db_compare_result = await MachineUpdateManager.UpdateDBCheck(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
+                    _db_compare_result = await MachineUpdateManager.UpdateDBCheck(MachineProvider.Machine.SerialNumber);
 
                     if (_db_compare_result.RequiresUpdate)
                     {
@@ -176,7 +176,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 try
                 {
-                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
+                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber);
                     LogManager.Log("Machine update completed.");
                     await NavigateTo(MachineUpdateView.UpdateCompletedView);
                 }
@@ -299,7 +299,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 try
                 {
-                    _update_result = await MachineUpdateManager.Update(fileItem.Path);
+                    _update_result = await MachineUpdateManager.UpdateFromTUP(fileItem.Path);
                     LogManager.Log("Machine update from package completed.");
                     await NavigateTo(MachineUpdateView.UpdateCompletedView);
                 }