diff --git a/Test.UI/Data/PortafineestraTreAnte.jwd b/Test.UI/Data/PortafineestraTreAnte.jwd index 7ac903b..a7a763f 100644 --- a/Test.UI/Data/PortafineestraTreAnte.jwd +++ b/Test.UI/Data/PortafineestraTreAnte.jwd @@ -1,6 +1,6 @@ { "ProfilePath": "Profilo78", - "Material": "Pino", + "Wood": "Pino", "ColorMaterial": "Wood", "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 8287116..79284da 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -1295,11 +1295,13 @@ namespace WebWindowComplex for (int i = 0; i < SashGroupList.Count; i++) { if ((string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware)) && + prevHardware != null && prevHardware.Count > 0 && SashGroupList.ElementAt(i).nSashQty == prevHardware.ElementAt(i).SashQty) { SashGroupList.ElementAt(i).SetSelFamilyHardwareFromIndex(prevHardware.ElementAt(i).Id); } - else if (!string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware) || SashGroupList.ElementAt(i).SelHardware != null) + else if (prevHardware != null && + (!string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware) || SashGroupList.ElementAt(i).SelHardware != null || SashGroupList.ElementAt(i).SelHardware.Id != "000000")) { var item = SashGroupList.ElementAt(i).SelHardware; if (i > prevHardware.Count - 1) diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 5713a36..4672fb7 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.3015 + 3.1.3.3016 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -106,6 +106,15 @@ + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 24322ab..8eb8ba2 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.3.3015 + 3.1.3.3016 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -143,6 +143,15 @@ + + + + + + + + +