Worked on PPC publisher.

2 files changed, 27 insertions, 5 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 7b8d4dbe6..6cf08a43a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
@@ -49,6 +49,7 @@ namespace Tango.PPC.UI.ViewModels
             WiFiSelectionView,
             WiFiTestView,
             TimeZoneView,
+            EnvironmentView,
             SetupWelcomeView,
             SetupProgressView,
             SetupCompletedView,
@@ -130,6 +131,15 @@ namespace Tango.PPC.UI.ViewModels
             set { _selectedTimeZone = value; RaisePropertyChangedAuto(); }
         }
 
+        private DeploymentSlots _deploymentSlot;
+        /// <summary>
+        /// Gets or sets the deployment slot.
+        /// </summary>
+        public DeploymentSlots DeploymentSlot
+        {
+            get { return _deploymentSlot; }
+            set { _deploymentSlot = value; RaisePropertyChangedAuto(); }
+        }
 
         #endregion
 
@@ -159,6 +169,11 @@ namespace Tango.PPC.UI.ViewModels
         /// Gets or sets the time zone selected command.
         /// </summary>
         public RelayCommand TimeZoneSelectedCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the environment selected command.
+        /// </summary>
+        public RelayCommand EnvironmentSelectedCommand { get; set; }
         #endregion
 
         #region Constructors
@@ -172,7 +187,8 @@ namespace Tango.PPC.UI.ViewModels
         {
             MachineSetupManager = machineSetupManager;
 
-            HostAddress = Settings.MachineServiceAddress;
+            DeploymentSlot = Settings.DeploymentSlot;
+
             SerialNumber = "";
 
             CompleteCommand = new RelayCommand(CompleteSetup, () => State == MachineSetupStates.Completed);
@@ -183,7 +199,13 @@ namespace Tango.PPC.UI.ViewModels
 
             InstallCommand = new RelayCommand(Install);
             RestartCommand = new RelayCommand(() => { NavigateTo(MachineSetupView.WelcomeView); });
-            TimeZoneSelectedCommand = new RelayCommand(() => { NavigateTo(MachineSetupView.SetupWelcomeView); });
+            TimeZoneSelectedCommand = new RelayCommand(() => { NavigateTo(MachineSetupView.EnvironmentView); });
+            EnvironmentSelectedCommand = new RelayCommand(() => 
+            {
+                NavigateTo(MachineSetupView.SetupWelcomeView);
+                Settings.DeploymentSlot = DeploymentSlot;
+                HostAddress = Settings.GetMachineServiceAddress();
+            });
 
             _operationSystemManager = operationSystemManager;
 
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 79974bff4..a553f3a18 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.MachineServiceAddress);
+                var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
 
                 if (response.IsUpdateAvailable)
                 {
@@ -145,7 +145,7 @@ namespace Tango.PPC.UI.ViewModels
                 }
                 else
                 {
-                    _db_compare_result = await MachineUpdateManager.UpdateDBCheck(MachineProvider.Machine.SerialNumber, Settings.MachineServiceAddress);
+                    _db_compare_result = await MachineUpdateManager.UpdateDBCheck(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
 
                     if (_db_compare_result.RequiresUpdate)
                     {
@@ -176,7 +176,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 try
                 {
-                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber, Settings.MachineServiceAddress);
+                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
                     LogManager.Log("Machine update completed.");
                     await NavigateTo(MachineUpdateView.UpdateCompletedView);
                 }