diff --git a/Test.UI/Components/Pages/Aedifica.razor.cs b/Test.UI/Components/Pages/Aedifica.razor.cs index 263b519..02d45aa 100644 --- a/Test.UI/Components/Pages/Aedifica.razor.cs +++ b/Test.UI/Components/Pages/Aedifica.razor.cs @@ -9,7 +9,7 @@ namespace Test.UI.Components.Pages public partial class Aedifica : IDisposable { - private string subChannel = ""; + private string channelSub = ""; private string CalcUid = "TestBeam"; private string currSvg = ""; private string apiUrl = ""; @@ -51,7 +51,7 @@ namespace Test.UI.Components.Pages GenericBasePath = Config.GetValue("ServerConf:GenericBaseUrl") ?? ""; //imgTag = Config.GetValue("ServerConf:ImageFileTag") ?? ""; calcTag = Config.GetValue("ServerConf:CalcTag") ?? ""; - subChannel = Config.GetValue("ServerConf:SvgChannel") ?? ""; + channelSub = Config.GetValue("ServerConf:ChannelSvg") ?? ""; } private async Task SendBtlRequest(Dictionary CurrArgs) @@ -74,7 +74,7 @@ namespace Test.UI.Components.Pages // conversione on-the-fly SVG da mostrare if (!string.IsNullOrEmpty(currArgs.newMessage)) { - if (currArgs.msgUid.Equals($"{subChannel}:{CalcUid}")) + if (currArgs.msgUid.Equals($"{channelSub}:{CalcUid}")) { currSvg = currArgs.newMessage; } diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index d8a7c98..10bbe9d 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -179,7 +179,7 @@ namespace Test.UI.Components.Pages private Hardware hardwareMassUpdate; - private string hwOptionChannel = ""; + private string channelHwOpt = ""; private string imgBasePath = ""; /// @@ -195,8 +195,8 @@ namespace Test.UI.Components.Pages private string profileMassUpdate; - private string shapeChannel = ""; - private string svgChannel = ""; + private string channelShape = ""; + private string channelSvg = ""; private string windowUid = "CurrWindow"; #endregion Private Fields @@ -219,9 +219,9 @@ namespace Test.UI.Components.Pages imgBasePath = Config.GetValue("ServerConf:ImageBaseUrl") ?? ""; GenericBasePath = Config.GetValue("ServerConf:GenericBaseUrl") ?? ""; calcTag = Config.GetValue("ServerConf:CalcTag") ?? ""; - svgChannel = Config.GetValue("ServerConf:SvgChannel") ?? ""; - shapeChannel = Config.GetValue("ServerConf:ShapeChannel") ?? ""; - hwOptionChannel = Config.GetValue("ServerConf:HwOptChannel") ?? ""; + channelSvg = Config.GetValue("ServerConf:ChannelSvg") ?? ""; + channelShape = Config.GetValue("ServerConf:ChannelShape") ?? ""; + channelHwOpt = Config.GetValue("ServerConf:ChannelHwOpt") ?? ""; } /// @@ -283,7 +283,7 @@ namespace Test.UI.Components.Pages // conversione on-the-fly SVG da mostrare if (!string.IsNullOrEmpty(currArgs.newMessage)) { - if (currArgs.msgUid.StartsWith($"{hwOptionChannel}:{windowUid}") && currArgs.newMessage.Length > 2) + if (currArgs.msgUid.StartsWith($"{channelHwOpt}:{windowUid}") && currArgs.newMessage.Length > 2) { // deserializzo il dizionario delle risposte... Dictionary rawDict = JsonConvert.DeserializeObject>(currArgs.newMessage) ?? new Dictionary(); @@ -305,7 +305,7 @@ namespace Test.UI.Components.Pages // conversione on-the-fly SVG da mostrare if (!string.IsNullOrEmpty(currArgs.newMessage) && currArgs.newMessage.Length > 2) { - if (currArgs.msgUid.StartsWith($"{shapeChannel}:{windowUid}")) + if (currArgs.msgUid.StartsWith($"{channelShape}:{windowUid}")) { // deserializzo il dizionario delle risposte... var rawDict = JsonConvert.DeserializeObject>(currArgs.newMessage); @@ -324,7 +324,7 @@ namespace Test.UI.Components.Pages // conversione on-the-fly SVG da mostrare if (!string.IsNullOrEmpty(currArgs.newMessage)) { - if (currArgs.msgUid.Equals($"{svgChannel}:{windowUid}")) + if (currArgs.msgUid.Equals($"{channelSvg}:{windowUid}")) { currSvg = currArgs.newMessage; CurrData.SvgPreview = currArgs.newMessage; diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index e0685c4..e824788 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.11.618 + 2.7.11.710 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -323,6 +323,9 @@ + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 83e6033..da424ba 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.11.618 + 2.7.11.710 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -425,6 +425,9 @@ + + +