diff --git a/WebWindowComplex/Models/OnReqHwOptEventArgs.cs b/WebWindowComplex/Models/OnReqHwOptEventArgs.cs index 9e58da1..234cb3d 100644 --- a/WebWindowComplex/Models/OnReqHwOptEventArgs.cs +++ b/WebWindowComplex/Models/OnReqHwOptEventArgs.cs @@ -11,16 +11,16 @@ namespace WebWindowComplex.Models #region Public Fields public string sJwd; - public string sCodHw; + public int nGroupId; #endregion Public Fields #region Public Constructors - public OnReqHwOptEventArgs(string sJwd, string sCodHw) + public OnReqHwOptEventArgs(string sJwd, int nGroupId) { this.sJwd = sJwd; - this.sCodHw = sCodHw; + this.nGroupId = nGroupId; } #endregion Public Constructors diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 5217695..636d240 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -233,12 +233,13 @@ namespace WebWindowComplex.Models #if false // calcolo senza hw m_ParentWindow.OnUpdatePreview(JsonConvert.SerializeObject(m_ParentWindow.Serialize(true))); + m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized(true)); #endif // continuo refresh - ReqRefreshShape(); + //ReqRefreshShape(); + RefreshHardwareList(); RefreshHardwareOptionList(); SetFirstHardware(); - // da vedere: dovrebbe esserci un unico oggetto tra JsonConvert.SerializeObject(m_ParentWindow.Serialize(true) e m_ParentWindow.sSerialized() m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized()); } } @@ -496,7 +497,7 @@ namespace WebWindowComplex.Models { HwOptionList.Clear(); // chiamata evento calcolo opzioni hardware - OnReqHwOptionPreview(m_ParentWindow.sSerialized(), SelHardware.Id); + OnReqHwOptionPreview(m_ParentWindow.sSerialized(), GroupId); } public void SetSelFamilyHardware(string sFamilyHw) @@ -647,9 +648,9 @@ namespace WebWindowComplex.Models } } - internal void OnReqHwOptionPreview(string sJwd, string codHw) + internal void OnReqHwOptionPreview(string sJwd, int groupId) { - OnReqHwOptEventArgs e = new OnReqHwOptEventArgs(sJwd, codHw); + OnReqHwOptEventArgs e = new OnReqHwOptEventArgs(sJwd, groupId); EventHandler handler = OnReqHwOption; if (handler != null) { @@ -660,6 +661,7 @@ namespace WebWindowComplex.Models internal void RefreshHardwareOptionList() { m_HwdOptionList.Clear(); + //ReqRefreshHwOption(); } internal override JsonArea Serialize(bool hideHw) diff --git a/WebWindowComplex/Models/Window.cs b/WebWindowComplex/Models/Window.cs index cbe80e5..24440a4 100644 --- a/WebWindowComplex/Models/Window.cs +++ b/WebWindowComplex/Models/Window.cs @@ -116,9 +116,9 @@ namespace WebWindowComplex.Models return JsonWindow; } - internal string sSerialized() + internal string sSerialized(bool hideHw = false) { - return JsonConvert.SerializeObject(Serialize(), Formatting.Indented); + return JsonConvert.SerializeObject(Serialize(hideHw), Formatting.Indented); } #endregion Internal Methods diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 842e83a..fc2cdb5 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.3015 + 2.7.10.3017 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -192,6 +192,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 7482096..dea51fc 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.3015 + 2.7.10.3017 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -292,6 +292,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +