From b8965cdf88ad29f66460905ad8307f2a38d1d0e4 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Thu, 22 Feb 2018 14:13:16 +0100 Subject: [PATCH 1/3] Fix ncDisconnection --- Step/Listeners/SignalR/SignalRListener.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Step/Listeners/SignalR/SignalRListener.cs b/Step/Listeners/SignalR/SignalRListener.cs index 439c006e..429aa5a4 100644 --- a/Step/Listeners/SignalR/SignalRListener.cs +++ b/Step/Listeners/SignalR/SignalRListener.cs @@ -43,14 +43,14 @@ namespace Step.Listeners.SignalR public static void SendNcNetworkStatus(object ncStatus) { - if ((bool)ncStatus == false) + //if ((bool)ncStatus == false) { var context = GlobalHost.ConnectionManager.GetHubContext(); // Send data to clients context.Clients.Group("ncData").ncNetworkStatus( new { - connected = false + connected = ncStatus } ); } From 4454d2bb4bdc4be37feda9933dbd769c28c5d287 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Thu, 22 Feb 2018 14:14:14 +0100 Subject: [PATCH 2/3] Fix nc network status --- Step/Listeners/SignalR/SignalRListener.cs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Step/Listeners/SignalR/SignalRListener.cs b/Step/Listeners/SignalR/SignalRListener.cs index 429aa5a4..e49b5dc1 100644 --- a/Step/Listeners/SignalR/SignalRListener.cs +++ b/Step/Listeners/SignalR/SignalRListener.cs @@ -43,17 +43,14 @@ namespace Step.Listeners.SignalR public static void SendNcNetworkStatus(object ncStatus) { - //if ((bool)ncStatus == false) - { - var context = GlobalHost.ConnectionManager.GetHubContext(); - // Send data to clients - context.Clients.Group("ncData").ncNetworkStatus( - new - { - connected = ncStatus - } - ); - } + var context = GlobalHost.ConnectionManager.GetHubContext(); + // Send data to clients + context.Clients.Group("ncData").ncNetworkStatus( + new + { + connected = ncStatus + } + ); } public static void SendProcessesData(object processesStatus) From 0d1ccc13bdb2c7ac3463894d9f1f220a955a3201 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Thu, 22 Feb 2018 14:27:21 +0100 Subject: [PATCH 3/3] Fix nc disconnection --- Step/Listeners/SignalR/SignalRListener.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Step/Listeners/SignalR/SignalRListener.cs b/Step/Listeners/SignalR/SignalRListener.cs index e49b5dc1..5e092909 100644 --- a/Step/Listeners/SignalR/SignalRListener.cs +++ b/Step/Listeners/SignalR/SignalRListener.cs @@ -51,6 +51,14 @@ namespace Step.Listeners.SignalR connected = ncStatus } ); + if( !(bool)ncStatus) + { + LastAlarms = new DTOAlarmsModel(); + LastAxes = new DTOAxesModel(); + LastExpiredMaintenances = new List(); ; + LastPowerOnData = new DTOPowerOnDataModel(); + LastRuntimeFunctionality = new List(); + } } public static void SendProcessesData(object processesStatus)