diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 5aacdc40..3a0456d3 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Config/Config/softKeyConfig.xml b/Step.Config/Config/softKeyConfig.xml
index 501e2952..b221d6b1 100644
--- a/Step.Config/Config/softKeyConfig.xml
+++ b/Step.Config/Config/softKeyConfig.xml
@@ -10,7 +10,7 @@
Ita
-
+
true
1
false
@@ -18,12 +18,12 @@
Test
Ita
-
- 1
- 1
-
-
-
+
+ 1
+ 1
+
+
+
false
2
false
@@ -31,12 +31,12 @@
Test
Ita
-
- 1
- 1
-
-
-
+
+ 1
+ 1
+
+
+
true
2
false
@@ -44,11 +44,11 @@
Test
Ita
-
- 1
-
-
-
+
+ 1
+
+
+
true
2
false
@@ -56,12 +56,12 @@
Test
Ita
-
- 1
- 1
-
-
-
+
+ 1
+ 1
+
+
+
true
2
false
@@ -69,13 +69,13 @@
Test
Ita
-
- 1
- 1
- 1
-
-
-
+
+ 1
+ 1
+ 1
+
+
+
true
2
false
@@ -83,14 +83,14 @@
Test
Ita
-
- 1
- 1
- 1
- 1
-
-
-
+
+ 1
+ 1
+ 1
+ 1
+
+
+
true
2
false
@@ -98,15 +98,15 @@
Test
Ita
-
- 1
- 1
- 1
- 1
- 1
-
-
-
+
+ 1
+ 1
+ 1
+ 1
+ 1
+
+
+
true
2
false
@@ -114,15 +114,15 @@
Test
Ita
-
- 1
- 1
- 1
- 1
- 1
- 1
-
-
+
+ 1
+ 1
+ 1
+ 1
+ 1
+ 1
+
+
true
1
diff --git a/Step.Config/Config/softKeyConfigValidator.xsd b/Step.Config/Config/softKeyConfigValidator.xsd
index f26398dc..ad154c86 100644
--- a/Step.Config/Config/softKeyConfigValidator.xsd
+++ b/Step.Config/Config/softKeyConfigValidator.xsd
@@ -3,9 +3,9 @@
-
+
-
+
@@ -39,10 +39,10 @@
-
+
-
+
diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs
index fc973d2d..1c8c351e 100644
--- a/Step.Config/ServerConfigController.cs
+++ b/Step.Config/ServerConfigController.cs
@@ -20,7 +20,7 @@ namespace Step.Config
ReadServerConfig();
ReadAreaConfig();
ReadMaintenancesConfig();
- ReadSoftkeysConfig();
+ ReadSoftKeysConfig();
ReadAlarmsConfig();
ReadHeadsConfig();
}
@@ -208,7 +208,7 @@ namespace Step.Config
.ToList();
}
- private static void ReadSoftkeysConfig()
+ private static void ReadSoftKeysConfig()
{
// Get Softkeys
XDocument xmlConfigFile = GetXmlHandlerWithValidator(SOFTKEYS_CONFIG_SCHEMA_PATH, SOFTKEYS_CONFIG_PATH);
@@ -228,7 +228,7 @@ namespace Step.Config
y => y.Attribute("langKey").Value, y => y.Value
),
- SubKeys = x.Element("plcKeys")?.Elements().Select(y => new SubKeysModel() // Populate subkeys if exist
+ SubKeys = x.Element("subKeys")?.Elements().Select(y => new SubKeysModel() // Populate subkeys if exist
{
Id = id++,
PlcId = Convert.ToInt32(y.Attribute("plcId").Value),
diff --git a/Step.Utils/supportFunctions.cs b/Step.Utils/supportFunctions.cs
index b92fdc87..479dd41a 100644
--- a/Step.Utils/supportFunctions.cs
+++ b/Step.Utils/supportFunctions.cs
@@ -8,8 +8,8 @@ namespace Step.Utils
{
switch (type)
{
- case "softkey_procedure": return SOFTKEY_TYPE.PROCEDURE;
- case "softkey_group": return SOFTKEY_TYPE.GROUP;
+ case "softKey_procedure": return SOFTKEY_TYPE.PROCEDURE;
+ case "softKey_group": return SOFTKEY_TYPE.GROUP;
default: return SOFTKEY_TYPE.TOGGLE;
}
}
diff --git a/Step/Controllers/SignalR/NcHub.cs b/Step/Controllers/SignalR/NcHub.cs
index 7126abf3..52f210c3 100644
--- a/Step/Controllers/SignalR/NcHub.cs
+++ b/Step/Controllers/SignalR/NcHub.cs
@@ -71,8 +71,19 @@ namespace Step.Controllers.SignalR
MessageServices.Current.Publish(SHOW_MSG_UI, null, "Refresh All Alarms.");
}
- public void RefreshAlarm(string id)
+ public void RefreshAlarm(uint id)
{
+ using (NcHandler ncHandler = new NcHandler())
+ {
+ CmsError libraryError = ncHandler.Connect();
+ if (libraryError.IsError())
+ throw new HubException(libraryError.message);
+
+ libraryError = ncHandler.numericalControl.PLC_WRefreshMessage(id);
+ if (libraryError.IsError())
+ throw new HubException(libraryError.message);
+ }
+
MessageServices.Current.Publish(SHOW_MSG_UI, null, "Refresh Single Alarm. ID: " + id);
}
diff --git a/Step/Controllers/WebApi/ConfigurationController.cs b/Step/Controllers/WebApi/ConfigurationController.cs
index 80b91c61..cf0cf72a 100644
--- a/Step/Controllers/WebApi/ConfigurationController.cs
+++ b/Step/Controllers/WebApi/ConfigurationController.cs
@@ -47,32 +47,32 @@ namespace Step.Controllers.WebApi
public IHttpActionResult GetSoftKeysConfig()
{
Dictionary> output = new Dictionary>();
- foreach (var softkey in SoftKeysConfig)
+ foreach (var softKey in SoftKeysConfig)
{
// Check if category exists
- if (!output.ContainsKey(softkey.Category))
+ if (!output.ContainsKey(softKey.Category))
{
// Add category if not exits
- output.Add(softkey.Category, new List< DTOSoftKeyConfigModel>());
+ output.Add(softKey.Category, new List< DTOSoftKeyConfigModel>());
}
// Create subkeys dictionary for group
Dictionary tmpSubKey = new Dictionary();
- if (softkey.Type == SOFTKEY_TYPE.GROUP && softkey.SubKeys != null)
+ if (softKey.Type == SOFTKEY_TYPE.GROUP && softKey.SubKeys != null)
{
tmpSubKey = new Dictionary();
- foreach (var subkey in softkey.SubKeys)
+ foreach (var subKey in softKey.SubKeys)
{
- tmpSubKey.Add(subkey.Id, subkey.Text);
+ tmpSubKey.Add(subKey.Id, subKey.Text);
}
}
// Add to the category the new softkey
- output[softkey.Category].Add(new DTOSoftKeyConfigModel()
+ output[softKey.Category].Add(new DTOSoftKeyConfigModel()
{
- Id = softkey.Id,
- Category = softkey.Category,
- OperatorConfirmationNeeded = softkey.OperatorConfirmationNeeded,
- Type = softkey.Type,
+ Id = softKey.Id,
+ Category = softKey.Category,
+ OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
+ Type = softKey.Type,
SubKeys = tmpSubKey
});