Working on PPC Machine Studio External Bridge !

2 files changed, 58 insertions, 27 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 f0b6bbfdf..3c348c796 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
@@ -3,23 +3,74 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.Core.Commands;
 using Tango.Core.DI;
+using Tango.Integration.ExternalBridge;
 using Tango.PPC.Common;
 using Tango.PPC.Common.ExternalBridge;
+using Tango.PPC.Common.Navigation;
 
 namespace Tango.PPC.UI.ViewModels
 {
+    [TangoCreateWhenRegistered]
     public class ExternalBridgeViewVM : PPCViewModel
     {
-        /// <summary>
-        /// Gets or sets the external bridge service.
-        /// </summary>
-        [TangoInject]
-        public IPPCExternalBridgeService ExternalBridgeService { get; set; }
+        private ExternalBridgeClientConnectedEventArgs _connection;
+        public ExternalBridgeClientConnectedEventArgs Connection
+        {
+            get { return _connection; }
+            set { _connection = value; RaisePropertyChangedAuto(); }
+        }
+
+        private User _user;
+        public User User
+        {
+            get { return _user; }
+            set { _user = value;  RaisePropertyChangedAuto(); }
+        }
+
+        public RelayCommand CloseSessionCommand { get; set; }
+
+        public ExternalBridgeViewVM()
+        {
+            CloseSessionCommand = new RelayCommand(CloseSession);
+        }
+
+        private void CloseSession()
+        {
+            ExternalBridgeService.DisconnectSession();
+        }
 
         public override void OnApplicationStarted()
         {
-            //throw new NotImplementedException();
+            ExternalBridgeService.ClientConnected += ExternalBridgeService_ClientConnected;
+            ExternalBridgeService.ClientDisconnected += ExternalBridgeService_ClientDisconnected;
+        }
+
+        private void ExternalBridgeService_ClientDisconnected(object sender, EventArgs e)
+        {
+            InvokeUI(() =>
+            {
+                NavigationManager.NavigateTo(NavigationView.HomeModule);
+            });
+        }
+
+        private void ExternalBridgeService_ClientConnected(object sender, ExternalBridgeClientConnectedEventArgs e)
+        {
+            if (e.Request.Password == MachineProvider.Machine.ExternalBridgePassword)
+            {
+                e.Confirmed = true;
+
+                Connection = e;
+
+                User = Adapter.Users.SingleOrDefault(x => x.Guid == e.Request.UserGuid);
+
+                InvokeUI(() =>
+                {
+                    NavigationManager.NavigateTo(NavigationView.ExternalBridgeView, false);
+                });
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
index cf85246f8..67d885685 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.DI;
+using Tango.Integration.ExternalBridge;
 using Tango.PPC.Common;
 using Tango.PPC.Common.Application;
 using Tango.PPC.Common.Authentication;
@@ -21,29 +22,8 @@ namespace Tango.PPC.UI.ViewModels
     /// <seealso cref="Tango.PPC.Common.PPCViewModel" />
     public class MainViewVM : PPCViewModel
     {
-        [TangoInject]
-        public IPPCExternalBridgeService ExternalBridgeService { get; set; }
-
         public override void OnApplicationStarted()
         {
-            ExternalBridgeService.ClientConnected += ExternalBridgeService_ClientConnected;
-            ExternalBridgeService.ClientDisconnected += ExternalBridgeService_ClientDisconnected;
-        }
-
-        private void ExternalBridgeService_ClientDisconnected(object sender, EventArgs e)
-        {
-            InvokeUI(() =>
-            {
-                NavigationManager.NavigateTo(Common.Navigation.NavigationView.HomeModule);
-            });
-        }
-
-        private void ExternalBridgeService_ClientConnected(object sender, EventArgs e)
-        {
-            InvokeUI(() =>
-            {
-                NavigationManager.NavigateTo(Common.Navigation.NavigationView.ExternalBridgeView, false);
-            });
         }
     }
 }