From 69f1398d9a17ac98ae4a13b48915970b65f66270 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 27 Jul 2020 14:32:18 +0200 Subject: [PATCH 1/2] fix out usersoftkeys --- .../Config/userSoftKeyConfig.xml | 42 +++++++------------ .../Config/userSoftKeyConfigValidator.xsd | 17 +++----- .../ServerConfigController.cs | 2 +- .../Thermo.Active.Config.csproj | 2 +- .../Controllers/UserSoftkeysController.cs | 2 + .../DTOModels/DTOUserSoftKeyModel.cs | 2 + 6 files changed, 26 insertions(+), 41 deletions(-) diff --git a/Thermo.Active.Config/Config/userSoftKeyConfig.xml b/Thermo.Active.Config/Config/userSoftKeyConfig.xml index 627e05b0..1098d053 100644 --- a/Thermo.Active.Config/Config/userSoftKeyConfig.xml +++ b/Thermo.Active.Config/Config/userSoftKeyConfig.xml @@ -350,10 +350,8 @@ Apertura cornice true - - general_sizes_frame_dim_x - - + general_sizes_frame_dim_x + general_sizes_frame_dim_x_button @@ -366,10 +364,8 @@ Profondità cornice true - - general_sizes_frame_dim_y - - + general_sizes_frame_dim_y + general_sizes_frame_dim_y_button @@ -382,10 +378,8 @@ Larghezza piastrafinestra true - - general_sizes_plate_dim_x - - + general_sizes_plate_dim_x + general_sizes_plate_dim_x_button @@ -398,10 +392,8 @@ Profondità piastrafinestra true - - general_sizes_plate_dim_y - - + general_sizes_plate_dim_y + general_sizes_plate_dim_y_button @@ -426,10 +418,8 @@ Start Ciclo Caricatore true - - cycle_loader_enable - - + cycle_loader_enable + cycle_loader_enable_button @@ -442,10 +432,8 @@ Dashboard Setpoint Plus true - - dash_setpoint_plus - - + dash_setpoint_plus + dash_setpoint_plus_button @@ -458,10 +446,8 @@ Dashboard Setpoint Minus true - - dash_setpoint_minus - - + dash_setpoint_minus + dash_setpoint_minus_button diff --git a/Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd b/Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd index a2f5d180..f8a25f80 100644 --- a/Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd +++ b/Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd @@ -24,14 +24,6 @@ - - - - - - - - @@ -39,7 +31,8 @@ - + + @@ -75,7 +68,8 @@ - + + @@ -96,7 +90,8 @@ - + + diff --git a/Thermo.Active.Config/ServerConfigController.cs b/Thermo.Active.Config/ServerConfigController.cs index fbce0ebe..4d88589c 100644 --- a/Thermo.Active.Config/ServerConfigController.cs +++ b/Thermo.Active.Config/ServerConfigController.cs @@ -518,8 +518,8 @@ namespace Thermo.Active.Config IsActive = Convert.ToBoolean(x.Element("active").Value), IsVisible = Convert.ToBoolean(x.Element("visible").Value), IsStarred = x.Element("starred") != null ? Convert.ToBoolean(x.Element("starred").Value) : false, - RefCallParam = x.Element("refCallParam") != null ? x.Element("refCallParam").Value : "", RefCallLabel = x.Element("refCallLabel") != null ? x.Element("refCallLabel").Value : "", + RefCallParam = x.Element("refCallParam") != null ? x.Element("refCallParam").Value : "", Category = Convert.ToInt32(x.Element("category").Value), LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read localized names and convert into a dictionary y => y.Attribute("langKey").Value, y => y.Value diff --git a/Thermo.Active.Config/Thermo.Active.Config.csproj b/Thermo.Active.Config/Thermo.Active.Config.csproj index 5d3bf79a..acf35c5a 100644 --- a/Thermo.Active.Config/Thermo.Active.Config.csproj +++ b/Thermo.Active.Config/Thermo.Active.Config.csproj @@ -88,7 +88,7 @@ PreserveNewest - PreserveNewest + Always Designer diff --git a/Thermo.Active.Database/Controllers/UserSoftkeysController.cs b/Thermo.Active.Database/Controllers/UserSoftkeysController.cs index cc86becc..cc8d186a 100644 --- a/Thermo.Active.Database/Controllers/UserSoftkeysController.cs +++ b/Thermo.Active.Database/Controllers/UserSoftkeysController.cs @@ -46,6 +46,8 @@ namespace Thermo.Active.Database.Controllers Id = softKey.Id, Category = softKey.Category, OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded, + RefCallLabel = softKey.RefCallLabel, + RefCallParam = softKey.RefCallParam, Type = softKey.Type, SubKeys = tmpSubKey }); diff --git a/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs b/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs index 4390baee..b46dd7db 100644 --- a/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs +++ b/Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs @@ -8,6 +8,8 @@ namespace Thermo.Active.Model.DTOModels public int Id { get; set; } public int Category { get; set; } public bool OperatorConfirmationNeeded { get; set; } + public string RefCallParam { get; set; } = ""; + public string RefCallLabel { get; set; } = ""; public SOFTKEY_TYPE Type { get; set; } public Dictionary SubKeys { get; set; } } From 7ee0cdb5a61bdf663da10eaf0970adb3ad84fadf Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 27 Jul 2020 14:32:56 +0200 Subject: [PATCH 2/2] new rel --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index b4de4cb4..8895c4c4 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.10.54")] \ No newline at end of file +[assembly: AssemblyVersion("0.10.55")] \ No newline at end of file