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

1 files changed, 20 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
index 6107a906d..dd54873ce 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
@@ -8,6 +8,7 @@ using Tango.PPC.Common;
 using Tango.PPC.Common.Navigation;
 using SimpleValidator.Extensions;
 using System.ComponentModel.DataAnnotations;
+using Tango.SharedUI.Helpers;
 
 namespace Tango.PPC.UI.ViewModels
 {
@@ -32,6 +33,17 @@ namespace Tango.PPC.UI.ViewModels
             set { _password = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isLoading;
+        /// <summary>
+        /// Gets or sets a value indicating whether the application is busy with loading modules.
+        /// </summary>
+        public bool IsLoading
+        {
+            get { return _isLoading; }
+            set { _isLoading = value; RaisePropertyChangedAuto(); }
+        }
+
+
         public LoginViewVM()
         {
             LoginCommand = new RelayCommand(Login);
@@ -49,16 +61,22 @@ namespace Tango.PPC.UI.ViewModels
         {
             if (Validate())
             {
+                IsLoading = true;
+                UIHelper.DoEvents();
+
                 var user = AuthenticationProvider.Login(Email, Password);
 
                 if (user == null)
                 {
+                    IsLoading = false;
                     NotificationProvider.ShowWarning("Email or password are incorrect.");
                 }
 
-                ApplicationManager.ModulesInitialized += (_, __) =>
+                ApplicationManager.ModulesInitialized += async (_, __) =>
                 {
-                    NavigationManager.NavigateTo(NavigationView.HomeModule);
+                    await Task.Delay(500);
+                    await NavigationManager.NavigateTo(NavigationView.HomeModule);
+                    IsLoading = false;
                 };
             }
         }