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

- Disabilitata scelta dei joint del frame per Arc full, Double Arc, Three center arc

Browse Source 
- Aggiunto InputDouble per le dimensioni
This commit is contained in:
Annamaria Sassi
2025-12-09 12:46:31 +01:00
parent 8e7bdb235f
commit dae7ee80d9
11 changed files with 166 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/Compo/AreaHwOption.razor
+1 -1
View File
@@ -5,7 +5,7 @@
<h6 class="fw-bold">Hardware option</h6>
</div>
<div class="col d-flex justify-content-md-end align-items-center">
<button class="btn btn-primary btn-sm" type="button" @onclick="() => changeCollapsed()">@((MarkupString)hwIcon)</button>
<button class="btn btn-primary btn-sm" type="button" @onclick="() => changeCollapsed()"><i class="@hwIcon"></i></button>
</div>
</div>
<div class="row mt-2">
WebWindowComplex/Compo/AreaHwOption.razor.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace WebWindowComplex.Compo
private string hwIcon
{
get => hwOptCollapsed ? "&darr;" : "&uarr;";
get => hwOptCollapsed ? "fa-solid fa-chevron-down" : "fa-solid fa-chevron-up";
}
/// <summary>
WebWindowComplex/Compo/AreaSash.razor
+4 -5
View File
@@ -25,7 +25,7 @@
}
}
</ul>
</div>
</div>
}
<button class="btn btn-outline-secondary btn-sm" type="button" @onclick="() => doEdit(IndexSash)">Edit</button>
</div>
@@ -40,8 +40,7 @@
</div>
<div class="input-group mb-2">
<span class="input-group-text">Dimension</span>
<InputDouble CssClass="form-control form-control text-end" Decimals="@CssDecimals()" @bind-Value="@Dimension"></InputDouble>
@* <input type="number" class="form-control" @bind="@CurrSashDim.dDimension"> *@
<InputDouble CssClass="form-control form-control text-end" Decimals="@CssDecimals()" Step="@CssStepNumber()" @bind-Value="@Dimension"></InputDouble>
<select class="form-select" style="max-width:6rem; background-color:#e9ecef" @bind="@MeasureTypeIndex">
@foreach (var mType in CurrSashDim.MeasureTypeList)
{
@@ -92,7 +91,7 @@ else
<button class="btn btn-outline-secondary btn-sm">Add inglesina</button>
</div>
}
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="() => ClosePopup(IndexSash)"></button>
<button type="button" class="btn-close" aria-label="Close" @onclick="() => ClosePopup(IndexSash)"></button>
</div>
<div class="row">
<div class="col-lg-6 col-md-12 my-2">
@@ -107,7 +106,7 @@ else
</div>
<div class="input-group mb-2">
<span class="input-group-text">Dimension</span>
<InputDouble CssClass="form-control form-control text-end" Decimals="@CssDecimals()" @bind-Value="@Dimension"></InputDouble>
<InputDouble CssClass="form-control form-control text-end" Decimals="@CssDecimals()" Step="@CssStepNumber()" @bind-Value="@Dimension"></InputDouble>
<select class="form-select" style="max-width:6rem; background-color:#e9ecef" @bind="@MeasureTypeIndex">
@foreach (var mType in CurrSashDim.MeasureTypeList)
{
WebWindowComplex/Compo/AreaSash.razor.cs
+24
View File
@@ -104,6 +104,30 @@ namespace WebWindowComplex.Compo
return 0;
}
/// <summary>
/// Metodo per avere il lo step da usare nella form-input
/// </summary>
/// <returns></returns>
public double CssStepNumber()
{
switch (CurrSashDim.MeasureType)
{
case Json.WindowConst.MeasureTypes.ABSOLUTE:
{
return 0.5;
}
case Json.WindowConst.MeasureTypes.PROPORTIONAL:
{
return 1;
}
case Json.WindowConst.MeasureTypes.PERCENTAGE:
{
return 0.5;
}
}
return 0;
}
/// <summary>
/// Selezione tipo di apertura anta
/// </summary>
WebWindowComplex/Compo/CardFrame.razor
-6
View File
@@ -102,10 +102,4 @@
<AreaFrame EC_AddSash="AddSash"
EC_AddSplit="AddSplit">
</AreaFrame>
@* <Arame CurrFrameWindow="CurrFrameWindow"
CurrSashList="SashList"
CurrSplitList="SplitList"
EC_AddSash="AddSash"
EC_AddSplit="AddSplit">
</AreaFrame> *@
}
WebWindowComplex/Compo/EditJoint.razor
+19 -6
View File
@@ -1,10 +1,23 @@
@using static WebWindowComplex.LayoutConst
<div class="input-group mb-2">
<label class="input-group-text">@((PositionJoints)(CurrRec.nIndex - 1))</label>
<select class="form-select" @bind="@CurrJoint">
@foreach (var typeJoint in CurrRec.JointTypeList)
{
<option value="@(typeJoint.Id)">@(typeJoint.Name)</option>
}
</select>
@if (CurrRec.ParentArea is Frame &&
(CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.DOUBLEARC ||
CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.ARC_FULL ||
CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.THREECENTERARC) &&
(CurrRec.nIndex == 3 || CurrRec.nIndex == 4))
{
<select class="form-select" @bind="@CurrJoint">
<option value="@(CurrJoint)">@(CurrRec.JointTypeList.First(x => x.Id == CurrJoint).Name)</option>
</select>
}
else
{
<select class="form-select" @bind="@CurrJoint">
@foreach (var typeJoint in CurrRec.JointTypeList)
{
<option value="@(typeJoint.Id)">@(typeJoint.Name)</option>
}
</select>
}
</div>
WebWindowComplex/Compo/EditSplitDimensions.razor
+4 -2
View File
@@ -1,8 +1,10 @@
@using EgwCoreLib.Razor
<div class="@SplitDimCss()">
<div class="input-group mb-2">
<span class="input-group-text">@Name</span>
<input type="number" class="form-control" @bind="@CurrVal">
@* <input type="number" class="form-control" @bind="@CurrVal"> *@
<InputDouble CssClass="form-control form-control text-end" Decimals="@CssDecimals()" Step="@CssStepNumber()" @bind-Value="@CurrVal"></InputDouble>
<select class="form-select" style="max-width:6rem; background-color:#e9ecef" @bind="@CurrType">
@foreach (var mType in CurrRec.MeasureTypeList)
{
WebWindowComplex/Compo/EditSplitDimensions.razor.cs
+48
View File
@@ -82,6 +82,54 @@ namespace WebWindowComplex.Compo
return "col-md-12 col-lg-6";
}
/// <summary>
/// Metodo per avere il numero di decimali da usare nella form-input
/// </summary>
/// <returns></returns>
public int CssDecimals()
{
switch (CurrRec.MeasureType)
{
case Json.WindowConst.MeasureTypes.ABSOLUTE:
{
return 2;
}
case Json.WindowConst.MeasureTypes.PROPORTIONAL:
{
return 0;
}
case Json.WindowConst.MeasureTypes.PERCENTAGE:
{
return 1;
}
}
return 0;
}
/// <summary>
/// Metodo per avere il lo step da usare nella form-input
/// </summary>
/// <returns></returns>
public double CssStepNumber()
{
switch (CurrRec.MeasureType)
{
case Json.WindowConst.MeasureTypes.ABSOLUTE:
{
return 0.5;
}
case Json.WindowConst.MeasureTypes.PROPORTIONAL:
{
return 1;
}
case Json.WindowConst.MeasureTypes.PERCENTAGE:
{
return 0.5;
}
}
return 0;
}
#endregion Private Properties
}
WebWindowComplex/Models/Frame.cs
+3 -10
View File
@@ -181,8 +181,6 @@ namespace WebWindowComplex.Models
case Shapes.RIGHTCHAMFER:
case Shapes.LEFTCHAMFER:
case Shapes.DOUBLECHAMFER:
case Shapes.ARC:
case Shapes.DOUBLEARC:
{
JointList.Add(new Joint(this, 1, oldJointType[0].SelJointType));
JointList.Add(new Joint(this, 2, oldJointType[1].SelJointType));
@@ -194,15 +192,9 @@ namespace WebWindowComplex.Models
break;
}
case Shapes.ARC:
case Shapes.ARC_FULL:
{
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));
JointList.Add(new Joint(this, 4, Joints.ANGLED));
break;
}
case Shapes.DOUBLEARC:
case Shapes.THREECENTERARC:
{
JointList.Add(new Joint(this, 1, oldJointType[0].SelJointType));
@@ -211,6 +203,7 @@ namespace WebWindowComplex.Models
JointList.Add(new Joint(this, 4, Joints.ANGLED));
break;
}
case Shapes.TRIANGLE:
{
JointList.Add(new Joint(this, 1, oldJointType[0].SelJointType));
WebWindowComplex/WebWindowComplex.csproj
+52 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.12.516</Version>
<Version>2.7.12.912</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -256,6 +256,57 @@
WebWindowConfigurator/WebWindowConfigurator.csproj
+10 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.12.516</Version>
<Version>2.7.12.912</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -418,6 +418,15 @@