From 74d0a44feb79b66b4f8a1bd7e0296e8f604a2805 Mon Sep 17 00:00:00 2001 From: "CMS3762\\carminatini" Date: Thu, 15 Feb 2018 15:51:51 +0100 Subject: [PATCH] Fix alarm Click + Test part of Server --- Step.UI/ServerControlWindow.cs | 2 ++ Step.Utils/Constants.cs | 1 + Step/Controllers/SignalR/NcHub.cs | 6 +++++- Step/wwwroot/src/modules/alarms/alarm-detail.vue | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Step.UI/ServerControlWindow.cs b/Step.UI/ServerControlWindow.cs index c5d6c5fa..d2ff408f 100644 --- a/Step.UI/ServerControlWindow.cs +++ b/Step.UI/ServerControlWindow.cs @@ -40,6 +40,8 @@ namespace Step.UI TXTType.Text = NcConfig.NcVendor; InitializeMessageListeners(); + + MessageServices.Current.Subscribe(SHOW_MSG_UI, (a, b) => { MessageBox.Show(a.ToString()); }); } private static ServerControlWindow ctrlwindow = null; diff --git a/Step.Utils/Constants.cs b/Step.Utils/Constants.cs index 47260dbf..c6401681 100644 --- a/Step.Utils/Constants.cs +++ b/Step.Utils/Constants.cs @@ -72,6 +72,7 @@ namespace Step.Utils public const string SEND_MESSAGE = "SEND_MESSAGE"; public const string SEND_NC_STATUS = "NC_STATUS"; public const string SEND_THREADS_STATUS = "THREAD_STATUS"; + public const string SHOW_MSG_UI = "SHOW_MSG_UI"; // MVVM Messages to signalR tasks public const string SEND_ALARMS = "SEND_ALARMS"; diff --git a/Step/Controllers/SignalR/NcHub.cs b/Step/Controllers/SignalR/NcHub.cs index a04e71fd..df1b462d 100644 --- a/Step/Controllers/SignalR/NcHub.cs +++ b/Step/Controllers/SignalR/NcHub.cs @@ -5,6 +5,8 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.SignalR; using Step.NC; +using TeamDev.SDK.MVVM; +using static Step.Utils.Constants; namespace Step.Controllers.SignalR { @@ -54,15 +56,17 @@ namespace Step.Controllers.SignalR ncHandler.Connect(); ncHandler.RefreshAllAlarms(); } + MessageServices.Current.Publish(SHOW_MSG_UI, null, "Refresh All Alarms."); } public void RefreshAlarm(string id) { - + MessageServices.Current.Publish(SHOW_MSG_UI, null, "Refresh Single Alarm. ID: " + id); } public void RecoveryProcedure(string id) { + MessageServices.Current.Publish(SHOW_MSG_UI, null, "Recovery Alarm. ID: " + id); } } diff --git a/Step/wwwroot/src/modules/alarms/alarm-detail.vue b/Step/wwwroot/src/modules/alarms/alarm-detail.vue index 09da44b4..29c0dfb5 100644 --- a/Step/wwwroot/src/modules/alarms/alarm-detail.vue +++ b/Step/wwwroot/src/modules/alarms/alarm-detail.vue @@ -67,10 +67,10 @@ export default { this.$emit("close-detail"); }, refresh() { - Hub.Current.RefreshAlarm(this.alarm.Id); + Hub.Current.RefreshAlarm(this.alarm.id); }, recovery() { - Hub.Current.RecoveryProcedure(this.alarm.Id); + Hub.Current.RecoveryProcedure(this.alarm.id); } } };