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

3 files changed, 70 insertions, 10 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
index a8faeea7b..80a95d1bf 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
@@ -7,6 +7,7 @@ using Tango.BL.Entities;
 using Tango.Core.Commands;
 using Tango.Core.DI;
 using Tango.Integration.ExternalBridge;
+using Tango.PMR.Integration;
 using Tango.PPC.Common;
 using Tango.PPC.Common.ExternalBridge;
 using Tango.PPC.Common.Navigation;
@@ -115,12 +116,15 @@ namespace Tango.PPC.UI.ViewModels
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
         private void ExternalBridgeService_ClientDisconnected(object sender, EventArgs e)
         {
-            LogManager.Log("External bridge client disconnected. Navigating to home module...");
-
-            InvokeUI(() =>
+            if (IsVisible)
             {
-                NavigationManager.NavigateTo(NavigationView.HomeModule);
-            });
+                LogManager.Log("External bridge client disconnected. Navigating to home module...");
+
+                InvokeUI(() =>
+                {
+                    NavigationManager.NavigateTo(NavigationView.HomeModule);
+                });
+            }
         }
 
         /// <summary>
@@ -132,7 +136,7 @@ namespace Tango.PPC.UI.ViewModels
         {
             LogManager.Log($"External bridge connection request received.\n{e.ToJsonString()}");
 
-            if (e.Request.Password == Settings.ExternalBridgePassword)
+            if (!e.Request.Intent.RequiresPassword() || e.Request.Password == Settings.ExternalBridgePassword)
             {
                 e.Confirmed = true;
 
@@ -145,11 +149,14 @@ namespace Tango.PPC.UI.ViewModels
                     LogManager.Log($"External bridge connection user has been identified as {User.Contact.FullName}");
                 }
 
-                LogManager.Log("Navigating to external bridge view...");
-                InvokeUI(() =>
+                if (e.Request.Intent == ExternalBridgeLoginIntent.FullControl)
                 {
-                    NavigationManager.NavigateTo(NavigationView.ExternalBridgeView, false);
-                });
+                    LogManager.Log("Navigating to external bridge view...");
+                    InvokeUI(() =>
+                    {
+                        NavigationManager.NavigateTo(NavigationView.ExternalBridgeView, false);
+                    });
+                }
             }
             else
             {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
index 1c1eeca5e..9e8a9fe34 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
@@ -115,6 +115,12 @@ namespace Tango.PPC.UI.ViewModels
         /// Gets or sets the power command.
         /// </summary>
         public RelayCommand PowerCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the restart application command.
+        /// </summary>
+        public RelayCommand RestartApplicationCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -139,6 +145,7 @@ namespace Tango.PPC.UI.ViewModels
             });
 
             PowerCommand = new RelayCommand(() => IsPowerOpened = true);
+            RestartApplicationCommand = new RelayCommand(RestartApplication);
         }
 
         #endregion
@@ -221,6 +228,17 @@ namespace Tango.PPC.UI.ViewModels
             }
         }
 
+        /// <summary>
+        /// Restarts the application.
+        /// </summary>
+        private async void RestartApplication()
+        {
+            if (await NotificationProvider.ShowQuestion("Are you sure you want to restart the application?"))
+            {
+                ApplicationManager.Restart();
+            }
+        }
+
         #endregion
 
         #region Override Methods
@@ -244,6 +262,25 @@ namespace Tango.PPC.UI.ViewModels
 
         #endregion
 
+        #region Public Methods
+
+        /// <summary>
+        /// Toggles the application technician mode.
+        /// </summary>
+        public void ToggleTechnicianMode()
+        {
+            if (!ApplicationManager.IsInTechnicianMode)
+            {
+                ApplicationManager.EnterTechnicianMode();
+            }
+            else
+            {
+                ApplicationManager.ExitTechnicianMode();
+            }
+        }
+
+        #endregion
+
         #region Event Handlers
 
         /// <summary>
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 b5b5f56bc..f265c5dbf 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -33,6 +33,7 @@ namespace Tango.PPC.UI.ViewModels
 
         private MachineUpdateResult _update_result;
         private DbCompareResult _db_compare_result;
+        private bool _isChecking;
 
         #region Properties
 
@@ -132,10 +133,21 @@ namespace Tango.PPC.UI.ViewModels
         {
             await NavigateTo(MachineUpdateView.UpdateCheckView);
 
+            if (_isChecking) return;
+
             try
             {
+                _isChecking = true;
                 IsDbUpdate = false;
 
+                await Task.Delay(2000);
+                if (!await ConnectivityProvider.CheckInternetConnection())
+                {
+                    _isChecking = false;
+                    await NavigateTo(MachineUpdateView.UpdateCheckErrorView);
+                    return;
+                }
+
                 var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber);
 
                 if (response.IsUpdateAvailable)
@@ -164,6 +176,10 @@ namespace Tango.PPC.UI.ViewModels
                 LogManager.Log(ex, "Error while trying to check for updates.");
                 await NavigateTo(MachineUpdateView.UpdateFailedView);
             }
+            finally
+            {
+                _isChecking = false;
+            }
         }
 
         private async void Update()