Egalware/webwindowconfigurator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/etis/webwindowconfigurator into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2026-03-30 16:52:08 +02:00
parent 8b1d39663c 1eb79fd20d
commit 2c2e314797
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Test.UI/Data/PortafineestraTreAnte.jwd
+1 -1
View File
@@ -1,6 +1,6 @@
{
"ProfilePath": "Profilo78",
"Material": "Pino",
"Wood": "Pino",
"ColorMaterial": "Wood",
"Glass": "Vetro BE 2S 4T/16/4T",
"AreaList": [
WebWindowComplex/TableComp.razor.cs
+3 -1
View File
@@ -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)
WebWindowComplex/WebWindowComplex.csproj
+10 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.3.3015</Version>
<Version>3.1.3.3016</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -106,6 +106,15 @@
WebWindowConfigurator/WebWindowConfigurator.csproj
+10 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.3.3015</Version>
<Version>3.1.3.3016</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -143,6 +143,15 @@