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

Merge branch 'release/GestioneSoglie_03'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-12-23 16:04:53 +01:00
parent 9f615a9a82 1a5192d613
commit fa993cea8b
4 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Test.UI/Components/Pages/EditJWD.razor.cs
+2 -2
View File
@@ -93,8 +93,8 @@ namespace Test.UI.Components.Pages
protected Dictionary<string, List<Threshold>> AvailThreshold { get; set; } = new Dictionary<string, List<Threshold>>()
{
{"Profilo78", new List<Threshold>() { new Threshold(1, "Bottom"), new Threshold(3, "Threshold")}},
{"ProfiloSaomad", new List<Threshold>(){ new Threshold(1, "Bottom"), new Threshold(2, "BottomWaterdrip"), new Threshold(3, "Threshold")}}
{"Profilo78", new List<Threshold>() { new Threshold(3, "Bottom"), new Threshold(1, "Threshold")}},
{"ProfiloSaomad", new List<Threshold>(){ new Threshold(3, "Bottom"), new Threshold(2, "BottomWaterdrip"), new Threshold(1, "Threshold")}}
};
[Inject]
WebWindowComplex/Models/Frame.cs
+23 -12
View File
@@ -14,7 +14,7 @@ namespace WebWindowComplex.Models
#region Public Fields
// Lista hardware completa passata dal chiamante del componente
public static Dictionary<string,List<Threshold>> m_AllThresholdList = new Dictionary<string, List<Threshold>>();
public static Dictionary<string, List<Threshold>> m_AllThresholdList = new Dictionary<string, List<Threshold>>();
#endregion Public Fields
@@ -84,7 +84,7 @@ namespace WebWindowComplex.Models
}
set
{
m_SelThreshold = m_ThresholdList.Where(x=>x.Type.Equals(value)).First();
m_SelThreshold = m_ThresholdList.Where(x => x.Type.Equals(value)).First();
}
}
@@ -155,7 +155,7 @@ namespace WebWindowComplex.Models
DimensionList.Add(new FrameDimension(this, 1, "Width", widthVal, true));
DimensionList.Add(new FrameDimension(this, 2, "Height", 1400, true));
foreach (var dim in DimensionList)
SearchAreaList(this, dim.dDimension,dim.sName);
SearchAreaList(this, dim.dDimension, dim.sName);
break;
}
@@ -244,7 +244,7 @@ namespace WebWindowComplex.Models
JointList.Add(new Joint(this, 1, oldJointType[0].SelJointType));
JointList.Add(new Joint(this, 2, oldJointType[1].SelJointType));
JointList.Add(new Joint(this, 3, oldJointType[2].SelJointType));
if(oldJointType.Count > 3)
if (oldJointType.Count > 3)
JointList.Add(new Joint(this, 4, oldJointType[3].SelJointType));
else
JointList.Add(new Joint(this, 4, Joints.FULL_V));
@@ -268,9 +268,9 @@ namespace WebWindowComplex.Models
JointList.Add(new Joint(this, 1, oldJointType[0].SelJointType));
JointList.Add(new Joint(this, 2, oldJointType[1].SelJointType));
JointList.Add(new Joint(this, 3, Joints.ANGLED));
foreach(var s in sashList)
foreach (var s in sashList)
{
foreach(var sashDim in s.SashList)
foreach (var sashDim in s.SashList)
{
sashDim.JointList.RemoveAt(sashDim.JointList.Count - 1);
sashDim.JointList.Last().SelJointType = Joints.ANGLED;
@@ -284,11 +284,11 @@ namespace WebWindowComplex.Models
break;
}
}
if(JointList.Count > 3)
if (JointList.Count > 3)
{
foreach (var s in sashList)
{
foreach(var sashDim in s.SashList)
foreach (var sashDim in s.SashList)
{
if (sashDim.JointList.Count == 3)
sashDim.JointList.Add(new Joint(s, 4, Joints.FULL_V));
@@ -314,7 +314,7 @@ namespace WebWindowComplex.Models
}
}
protected List<Sash> SearchSash(List<Sash> sashList,Area node)
protected List<Sash> SearchSash(List<Sash> sashList, Area node)
{
if (node != null)
{
@@ -379,7 +379,10 @@ namespace WebWindowComplex.Models
newFrame.SetBottomRail(false);
newFrame.SetBottomRailQty(0);
newFrame.RefreshThresholdList();
newFrame.SetSelThresholdFromName(m_AllThresholdList.GetValueOrDefault(Window.sProfilePath).FirstOrDefault().Name);
if (m_AllThresholdList != null && m_AllThresholdList.Any())
{
newFrame.SetSelThresholdFromName(m_AllThresholdList.GetValueOrDefault(Window.sProfilePath)?.FirstOrDefault()?.Name ?? "");
}
//newFrame.FrameArcElem = null;
return newFrame;
}
@@ -528,9 +531,17 @@ namespace WebWindowComplex.Models
m_Shape = Value;
}
internal void SetSelThresholdFromName(string value)
internal void SetSelThresholdFromName(string? value)
{
m_SelThreshold = m_ThresholdList.Where(x=>x.Name.Equals(value)).First();
// verifica ci sia un valore...
if (!string.IsNullOrEmpty(value))
{
m_SelThreshold = m_ThresholdList.Where(x => x.Name.Equals(value)).First();
}
else
{
m_SelThreshold = m_ThresholdList.FirstOrDefault() ?? new Threshold(1, "Bottom");
}
}
#endregion Internal Methods
WebWindowComplex/WebWindowComplex.csproj
+8 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.12.2314</Version>
<Version>2.7.12.2316</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -432,6 +432,13 @@
WebWindowConfigurator/WebWindowConfigurator.csproj
+11 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.12.2314</Version>
<Version>2.7.12.2316</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -553,6 +553,16 @@