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

- Correzione per eliminazione inglesina

Browse Source 
- Correzione associazione famiglia hardware
This commit is contained in:
Annamaria Sassi
2026-04-29 10:19:54 +02:00
parent 8f0b54e30f
commit 396cecf492
4 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/Models/Inglesina.cs
+5 -14
View File
@@ -123,13 +123,10 @@ namespace WebWindowComplex.Models
if (nSplitQtyVert == 0)
{
ParentArea.AreaList.Remove(this);
Fill newFill = Fill.CreateFill(ParentArea, FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
ParentArea.AreaList.Add(newFill);
}
else
{
ElemDimHorizList.RemoveAt(0);
ElemDimHorizList.Clear();
SetSplitShape(SplitShapes.VERTICAL);
SetSplitStartVert(true);
// Controllo quanti split orizzontali ci sono
@@ -228,11 +225,8 @@ namespace WebWindowComplex.Models
List<SplitElementDimension> elemDimList = ElemDimHorizList.Where(x => x.nSubArea == subArea).OrderByDescending(x => x.nIndex).ToList();
for (var SplitIndex = elemDimList.Count - 1; SplitIndex >= value; SplitIndex += -1)
{
elemDimList.RemoveAt(elemDimList.Count - 1);
ElemDimHorizList.Remove(elemDimList.ElementAt(elemDimList.Count - 1));
}
//SplitElementDimension? removeElem = ElemDimHorizList.Where(x => x.nSubArea == subArea).OrderByDescending(x => x.nIndex).FirstOrDefault();
//if (removeElem != null)
// ElemDimHorizList.Remove(removeElem);
}
}
else
@@ -269,13 +263,10 @@ namespace WebWindowComplex.Models
if (nSplitQtyHoriz == 0)
{
ParentArea.AreaList.Remove(this);
Fill newFill = Fill.CreateFill(ParentArea, FillTypes.GLASS);
newFill.SetAreaType(AreaTypes.FILL);
ParentArea.AreaList.Add(newFill);
}
else
{
ElemDimVertList.RemoveAt(0);
ElemDimVertList.Clear();
SetSplitShape(SplitShapes.HORIZONTAL);
SetSplitStartVert(false);
// Controllo quanti split orizzontali ci sono
@@ -386,8 +377,8 @@ namespace WebWindowComplex.Models
// Rimuovo da tutte le sottoaree degli element l'ultimo elemento
for (int subArea = 1; subArea <= ElemDimVertList.Max(x => x.nSubArea); subArea++)
{
SplitElementDimension removeElem = ElemDimVertList.Where(x => x.nSubArea == subArea).OrderByDescending(x => x.nIndex).FirstOrDefault();
ElemDimVertList.Remove(removeElem);
List<SplitElementDimension> elemDimList = ElemDimVertList.Where(x => x.nSubArea == subArea).OrderByDescending(x => x.nIndex).ToList();
ElemDimVertList.Remove(elemDimList.ElementAt(elemDimList.Count - 1));
}
}
}
WebWindowComplex/TableComp.razor.cs
+9 -3
View File
@@ -1351,10 +1351,16 @@ 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)
prevHardware != null && prevHardware.Count > 0)
{
SashGroupList.ElementAt(i).SetSelFamilyHardwareFromIndex(prevHardware.ElementAt(i).Id);
if(i >= prevHardware.Count)
{
SashGroupList.ElementAt(i).SetSelFamilyHardwareFromIndex(prevHardware.FirstOrDefault()!.Id);
}
else if(SashGroupList.ElementAt(i).nSashQty == prevHardware.ElementAt(i).SashQty)
{
SashGroupList.ElementAt(i).SetSelFamilyHardwareFromIndex(prevHardware.ElementAt(i).Id);
}
}
else if (prevHardware != null &&
(!string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware) || SashGroupList.ElementAt(i).SelHardware != null || SashGroupList.ElementAt(i).SelHardware.Id != "000000"))
WebWindowComplex/WebWindowComplex.csproj
+17 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.4.2316</Version>
<Version>3.1.4.2910</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -166,6 +166,22 @@
WebWindowConfigurator/WebWindowConfigurator.csproj
+4 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.4.2316</Version>
<Version>3.1.4.2910</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -284,6 +284,9 @@