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

Aggiornamento

Browse Source
This commit is contained in:
Annamaria Sassi
2026-08-13 14:48:23 +02:00
parent c0b8bc752c
commit 809ff5a237
33 changed files with 183 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Test.UI/Components/Pages/EditJWD.razor
+1 -64
View File
@@ -4,75 +4,12 @@
<PageTitle>EditJWD</PageTitle>
@* <div class="row mb-2">
<div class="col-6">
<div class="input-group mb-2 justify-content-center">
<span class="input-group-text">FamilyHw</span>
<select class="form-select" @bind="familyHWMassUpdate">
@foreach (var item in AvailFamilyHardwareList)
{
<option value="@item">@item</option>
}
</select>
</div>
</div>
<div class="col-6">
<div class="input-group mb-2 justify-content-center">
<span class="input-group-text">Color</span>
<select class="form-select" @bind="colorMassUpdate">
@foreach (var item in AvailColorMaterialList)
{
<option value="@item">@item</option>
}
</select>
</div>
</div>
<div class="col-6">
<div class="input-group mb-2 justify-content-center">
<span class="input-group-text">Wood</span>
<select class="form-select" @bind="woodMassUpdate">
@foreach (var item in AvailWoodList)
{
<option value="@item">@item</option>
}
</select>
</div>
</div>
<div class="col-6">
<div class="input-group mb-2 justify-content-center">
<span class="input-group-text">Glass</span>
<select class="form-select" @bind="glassMassUpdate">
@foreach (var item in AvailGlassList)
{
<option value="@item">@item</option>
}
</select>
</div>
</div>
<div class="col-6">
<div class="input-group mb-2 justify-content-center">
<span class="input-group-text">Profile</span>
<select class="form-select" @bind="profileMassUpdate">
@foreach (var item in DescriptionProfileList)
{
<option value="@item">@item</option>
}
</select>
</div>
</div>
</div>
<div class="row mb-2">
<div class="col-2">
<button class="btn btn-outline-secondary btn-sm" @onclick="() => UpdateInfoJwdAsync(CurrData.CurrJwd, familyHWMassUpdate, colorMassUpdate, woodMassUpdate, glassMassUpdate, profileMassUpdate)">Save</button>
</div>
</div> *@
@if (doEdit)
{
<WebWindowComplex.TableComp ListPayload="SetupList"
LiveData="CurrData"
PendReq="DictPendReq"
BaseUser="true"
BaseUser="User"
Vocabulary="TradVocabulary"
EC_ActionReq="DoAction"
EC_DoUpdate="ExecRequest"
WebWindowComplex/Compo/AreaSash.razor
+16 -16
View File
@@ -7,7 +7,7 @@
<h6 class="fw-bold text-nowrap">Sash @(CurrSashGroup.SashList.Count == 1 ? "" : (IndexSash + 1))</h6>
</div>
<div class="col-md-12 col-lg-3 px-0">
@if(!User && CurrSashGroup.SashList.Count > 1)
@if(!BaseUser && CurrSashGroup.SashList.Count > 1)
{
<div class="dropdown px-4 w-100">
<button class="btn btn-outline-secondary dropdown-toggle btn-sm w-100"
@@ -44,7 +44,7 @@
<div class="row align-items-center justify-content-start">
<div class="col-lg-2 col-md-12 my-2">
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<button class="btn btn-outline-secondary d-flex align-items-center gap-2"
type="button"
@@ -90,24 +90,24 @@
<div class="col-lg-5 col-md-12 my-2">
<div class="input-group mb-2">
<span class="input-group-text">Dimension</span>
@if(User)
@if(BaseUser)
{
<input type="number" readonly class="form-control" value="@Dimension">
@switch (CurrSashDim.SelMeasureType.ToString())
{
case "ABSOLUTE":
{
<span class="input-group-text">mm</span>
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">mm</span>
break;
}
case "PROPORTIONAL":
{
<span class="input-group-text">*</span>
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">*</span>
break;
}
case "PERCENTAGE":
{
<span class="input-group-text">%</span>
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">%</span>
break;
}
}
@@ -145,7 +145,7 @@
</div>
<div class="col-lg-2 col-md-12 my-2">
<div class="d-flex justify-content-start fs-5 mb-2">
@if (User)
@if (BaseUser)
{
<div class="px-1">
<input class="form-check-input ml-auto" disabled="disabled" type="checkbox" name="Handle" checked="@CurrSashDim.bHasHandle">
@@ -171,7 +171,7 @@
<h6 class="fw-bold text-nowrap">Sash @(CurrSashGroup.SashList.Count == 1 ? "" : (IndexSash + 1))</h6>
</div>
<div class="col-md-12 col-lg-2 px-0">
@if (!User && !(CurrAnta.AreaList[0] is Split))
@if (!BaseUser && !(CurrAnta.AreaList[0] is Split))
{
<div class="col-md-4">
<button class="btn btn-outline-secondary btn-sm" @onclick="() => AddSplitToSash()">Split</button>
@@ -179,7 +179,7 @@
}
</div>
<div class="col-md-12 col-lg-2 px-0">
@if (!User && CurrAnta.AreaList[0].AreaList.Count == 0)
@if (!BaseUser && CurrAnta.AreaList[0].AreaList.Count == 0)
{
<div class="col-md-4 px-2">
<button class="btn btn-outline-secondary btn-sm" @onclick="() => AddInglesinaToSash()">Inglesina</button>
@@ -193,7 +193,7 @@
<div class="row align-items-center justify-content-start">
<div class="col-lg-2 col-md-12 my-2">
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<button class="btn btn-outline-secondary d-flex align-items-center gap-2"
type="button"
@@ -237,24 +237,24 @@
<div class="col-lg-5 col-md-12 my-2">
<div class="input-group mb-2">
<span class="input-group-text">Dimension</span>
@if(User)
@if(BaseUser)
{
<input type="number" readonly class="form-control" value="@Dimension">
@switch (CurrSashDim.SelMeasureType.ToString())
{
case "ABSOLUTE":
{
<span class="input-group-text">mm</span>
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">mm</span>
break;
}
case "PROPORTIONAL":
{
<span class="input-group-text">*</span>
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">*</span>
break;
}
case "PERCENTAGE":
{
<span class="input-group-text">%</span>
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">%</span>
break;
}
}
@@ -292,7 +292,7 @@
</div>
<div class="col-lg-2 col-md-12 my-2">
<div class="d-flex justify-content-start fs-5 mb-2">
@if(User)
@if(BaseUser)
{
<div class="px-1">
<input class="form-check-input ml-auto" disabled="disabled" type="checkbox" name="Handle" checked="@CurrSashDim.bHasHandle">
@@ -316,7 +316,7 @@
<div class="col-md-4 d-flex justify-content-start align-items-center">
<h6>Joints</h6>
</div>
@if (User)
@if (BaseUser)
{
<div class="col-md-8 d-flex justify-content-end align-items-center">
<button type="button" class="btn-icone @ButtonJointCss(Json.WindowConst.Joints.ANGLED) mx-1 px-1 py-1">
WebWindowComplex/Compo/AreaSash.razor.cs
+1 -1
View File
@@ -45,7 +45,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
/// <summary>
/// Lista di sash dimension in stato edit
WebWindowComplex/Compo/CardFill.razor
+2 -2
View File
@@ -17,7 +17,7 @@
</div>
<div class="col d-flex">
<div class="input-group mb-2 justify-content-center">
@if (User)
@if (BaseUser)
{
<button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.GLASS)">Glass</button>
}
@@ -29,7 +29,7 @@
</div>
<div class="col d-flex">
<div class="input-group mb-2 justify-content-center">
@if (User)
@if (BaseUser)
{
<button class="@buttonFillCss(WebWindowComplex.Json.WindowConst.FillTypes.WOOD)">Wood</button>
}
WebWindowComplex/Compo/CardFill.razor.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[Parameter]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
/// <summary>
/// Evento per cambiare tutti i fill
WebWindowComplex/Compo/CardFrame.razor
+5 -5
View File
@@ -14,7 +14,7 @@
<div class="card-body py-2">
<div class="row">
<div class="col-md-12 col-lg-12">
@if (User)
@if (BaseUser)
{
<div class="row">
<div class="d-flex justify-content-start align-items-center" style="min-height: 2.5rem;">
@@ -73,7 +73,7 @@
<h6 class="fw-bold">@Traduci("ConfWind_Threshold")</h6>
</div>
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">@Traduci("ConfWind_Tipology")</span>
<input type="text" readonly class="form-control" value="@(CurrFrameWindow.ThresholdList.FirstOrDefault(x => x.Type == SelThreshold)?.Name)">
@@ -98,7 +98,7 @@
</div>
<div class="input-group mb-2">
<span class="input-group-text">@Traduci("ConfWind_Quantity")</span>
@if (User)
@if (BaseUser)
{
<input type="number" readonly class="form-control" value="@FrameBottomRailQty">
}
@@ -121,7 +121,7 @@
<div class="col-md-4 d-flex justify-content-start align-items-center">
<h6 class="fw-bold">@Traduci("ConfWind_Joints")</h6>
</div>
@if (User)
@if (BaseUser)
{
<div class="col-md-8 d-flex justify-content-end align-items-center">
<button type="button" class="btn-iconeOff @ButtonJointCss(Json.WindowConst.Joints.ANGLED) mx-1 px-1 py-1">
@@ -195,7 +195,7 @@
</div>
</div>
@if (!User)
@if (!BaseUser)
{
@if (!(CurrFrameWindow.AreaList[0] is Split) || (SashGroupList.Count == 0 && SplitList.Count == 0))
{
WebWindowComplex/Compo/CardFrame.razor.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
/// <summary>
/// Evento per richiesta traduzioni
WebWindowComplex/Compo/CardInglesina.razor
+6 -6
View File
@@ -30,7 +30,7 @@
<div class="col-lg-2 justify-content-start">
<h5>Inglesina</h5>
</div>
@if (!User)
@if (!BaseUser)
{
<div class="col-lg-10 justify-content-start">
<div class="input-group">
@@ -42,7 +42,7 @@
<div class="row">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">Shape</span>
<input type="text" readonly class="form-control" value="@(CurrInglesina.SplitShapeList.FirstOrDefault(x => x.Id == InglesinaShapeIndex))">
@@ -61,7 +61,7 @@
</div>
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">Side</span>
<input type="text" readonly class="form-control" value="@(CurrInglesina.SideList.FirstOrDefault(x => x.Id == SideIndex))">
@@ -85,7 +85,7 @@
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">QtyVert</span>
@if (User)
@if (BaseUser)
{
<input type="number" readonly class="form-control" value="@InglesinaQtyVert">
}
@@ -101,7 +101,7 @@
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">QtyHoriz</span>
@if (User)
@if (BaseUser)
{
<input type="number" readonly class="form-control" value="@InglesinaQtyHoriz">
}
@@ -166,7 +166,7 @@
<div class="col-md-12 col-lg-6">
<div class="d-flex justify-content-start fs-5 mb-2">
<div class="px-1">
@if (User)
@if (BaseUser)
{
<input class="form-check-input ml-auto" disabled="disabled" type="checkbox" name="SplitStartVert" checked="@CurrInglesina.bSplitStartVert">
}
WebWindowComplex/Compo/CardInglesina.razor.cs
+1 -1
View File
@@ -37,7 +37,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
/// <summary>
/// Evento per richiedere reset dizionario
WebWindowComplex/Compo/CardSashGroup.razor
+5 -5
View File
@@ -7,7 +7,7 @@
<div class="px-2">
<h5>Sash group @(SashGroupList.Count > 1 ? (SashGroupList.IndexOf(CurrSashGroup) + 1) : "")</h5>
</div>
@if (!User)
@if (!BaseUser)
{
<div class="px-2">
<div class="input-group mb-2 justify-content-center">
@@ -26,7 +26,7 @@
<div class="d-flex justify-content-start align-items-center" style="min-height: 2.5rem;">
<h6 class="fw-bold">Tipology</h6>
</div>
@if (User)
@if (BaseUser)
{
<div class="row">
@foreach (var i in CurrSashGroup.OrientationSashTypeList)
@@ -60,7 +60,7 @@
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">Qty sash</span>
@if (User)
@if (BaseUser)
{
<input type="number" readonly class="form-control" value="@SashQty">
}
@@ -73,7 +73,7 @@
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">Qty bottom rail</span>
@if (User)
@if (BaseUser)
{
<input type="number" readonly class="form-control" value="@SashBottomRailQty">
}
@@ -96,7 +96,7 @@
<h6 class="fw-bold">Hardware</h6>
</div>
</div>
@if (User)
@if (BaseUser)
{
<div class="input-group mb-2">
<span class="input-group-text">Family</span>
WebWindowComplex/Compo/CardSashGroup.razor.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
/// <summary>
/// Evento per cambiare tutti i fill
WebWindowComplex/Compo/CardTree.razor.cs
+1 -106
View File
@@ -199,7 +199,7 @@ namespace WebWindowComplex.Compo
if (item.AreaList.FirstOrDefault() is Fill)
isOpenFill.Add(false);
}
_ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem });
await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem });
var args = new DataUpdateFrame()
{
currFrame = FrameWindow,
@@ -272,111 +272,6 @@ namespace WebWindowComplex.Compo
return EC_UpdateSplitted.InvokeAsync(currSplitted);
}
/// <summary>
/// Metodo per riempire tabella con contenuto vuoto o con i simboli per rappresentare la struttura
/// </summary>
/// <param name="row"> riga della cella </param>
/// <param name="col"> colonna della cella </param>
/// <returns></returns>
private string FillTable(int row, int col)
{
List<ItemTable> itemSameCol = new List<ItemTable>();
for (int k = 0; k < row; k++)
{
if (ItemTableList[k].Col == col + 1)
{
itemSameCol.Add(ItemTableList[k]);
}
continue;
}
int numItemNextCol = 0;
for (int k = 0; k < row; k++)
{
if (ItemTableList[k].Row <= row && ItemTableList[k].Col == col + 2)
{
numItemNextCol++;
}
continue;
}
if (itemSameCol.Count > 1)
{
for (int i = 0; i <= itemSameCol.Count - 2; i++)
{
if (itemSameCol[i].NumChild > 0)
numItemNextCol = numItemNextCol - itemSameCol[i].NumChild;
}
}
if (itemSameCol.Count > 0)
{
// Sono alla riga successiva di un elemento e nella stessa colonna
if (itemSameCol.Last().Row == row)
{
// se ha un solo figlio
if (itemSameCol.Last().NumChild == 1)
{
return "└";
}
else if (itemSameCol.Last().NumChild == 0)
{
return " ";
}
else
{
return "├";
}
}
// Non sono alla riga successiva
else
{
// se ha un solo figlio
if (itemSameCol.Last().NumChild == 1)
{
return " ";
}
else if (col + 2 <= maxCol && ItemTableList[row].Col == col + 2)
{
if (numItemNextCol < itemSameCol.Last().NumChild && numItemNextCol != (itemSameCol.Last().NumChild - 1))
{
return "├";
}
return "└";
}
else if (numItemNextCol < itemSameCol.Last().NumChild)
{
return "│";
}
else
{
return " ";
}
}
}
else
{
return " ";
}
}
private bool HideRow(int row, int col)
{
List<ItemTable> itemSameCol = new List<ItemTable>();
for (int k = 0; k < row; k++)
{
if (ItemTableList[k].Col == col + 1)
{
itemSameCol.Add(ItemTableList[k]);
}
continue;
}
if(itemSameCol.Count > 0)
{
ItemTable? firstItem = itemSameCol.FirstOrDefault();
if (firstItem != null)
return RowCollapsedDict.GetValueOrDefault(firstItem.Row - 1);
}
return false;
}
private bool isOpenFrame = false;
private void ToggleDropdownFrame()
WebWindowComplex/Compo/EditElement.razor
+1 -1
View File
@@ -4,7 +4,7 @@
<label class="input-group-text px-2 py-1">
<img class="img-fluid" src="@GetImageElementPath(name())" title="@(name())" width="52" />
</label>
@if (User)
@if (BaseUser)
{
<input type="text" readonly class="form-control" title="@Title()" value="@(CurrRec.dDimension)">
}
WebWindowComplex/Compo/EditElement.razor.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
#endregion Public Properties
WebWindowComplex/Compo/EditFrameDimensions.razor
+1 -1
View File
@@ -17,7 +17,7 @@
{
<span class="input-group-text">@CurrRec.sName</span>
}
@if (User)
@if (BaseUser)
{
<input type="number" readonly class="form-control" value="@CurrVal">
}
WebWindowComplex/Compo/EditFrameDimensions.razor.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
#endregion Public Properties
WebWindowComplex/Compo/EditJoint.razor
+1 -1
View File
@@ -3,7 +3,7 @@
<label class="input-group-text px-2 py-1">
<img class="img-fluid" src="@GetImageJointPosPath(CurrPosJointName)" title="@(CurrPosJointName)" width="50" />
</label>
@if (User)
@if (BaseUser)
{
<button class="btn btn-outline-secondary d-flex align-items-center gap-2"
type="button"
WebWindowComplex/Compo/EditJoint.razor.cs
+1 -1
View File
@@ -24,7 +24,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
#endregion Public Properties
WebWindowComplex/Compo/EditOptionCombo.razor
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">@(CurrOpt.sName)</span>
@if (CurrValue is String)
WebWindowComplex/Compo/EditOptionCombo.razor.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
[Parameter]
public EventCallback<AGBOptionCombo> EC_Update { get; set; }
WebWindowComplex/Compo/EditOptionText.razor
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">@(CurrOpt.sName)</span>
@if (CurrOpt.sName.Equals("HMan"))
WebWindowComplex/Compo/EditOptionText.razor.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
[Parameter]
public EventCallback<AGBOptionText> EC_Update { get; set; }
WebWindowComplex/Compo/EditSplitDimensions.razor
+47 -24
View File
@@ -1,35 +1,58 @@
@using EgwCoreLib.Razor
@* <div class="@SplitDimCss()"> *@
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">@(Name + " " + (Index+ 1))</span>
<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)
@if(BaseUser)
{
<input type="number" readonly class="form-control" value="@CurrVal">
@switch (CurrRec.SelMeasureType.ToString())
{
<option value=@(mType.Id)>
@switch (mType.Name)
case "ABSOLUTE":
{
case "Absolute":
{
<span class="input-group-text">mm</span>
break;
}
case "Proportional":
{
<span class="input-group-text">*</span>
break;
}
case "Percentage":
{
<span class="input-group-text">%</span>
break;
}
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">mm</span>
break;
}
case "PROPORTIONAL":
{
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">*</span>
break;
}
case "PERCENTAGE":
{
<span class="input-group-text" style="width:6rem; background-color:#e9ecef">%</span>
break;
}
</option>
}
</select>
}
else
{
<input type="number" class="form-control" @bind="@CurrVal">
<select class="form-select" style="max-width:6rem; background-color:#e9ecef" @bind="@CurrType">
@foreach (var mType in CurrRec.MeasureTypeList)
{
<option value=@(mType.Id)>
@switch (mType.Name)
{
case "Absolute":
{
<span class="input-group-text">mm</span>
break;
}
case "Proportional":
{
<span class="input-group-text">*</span>
break;
}
case "Percentage":
{
<span class="input-group-text">%</span>
break;
}
}
</option>
}
</select>
}
</div>
</div>
WebWindowComplex/Compo/EditSplitDimensions.razor.cs
+6
View File
@@ -25,6 +25,12 @@ namespace WebWindowComplex.Compo
[Parameter]
public int Index { get; set; } = -1;
/// <summary>
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool BaseUser { get; set; } = false!;
[Parameter]
public EventCallback<DataUpdateSplitDimension> EC_Update { get; set; }
WebWindowComplex/Compo/EditSplitElement.razor
+1 -1
View File
@@ -1,7 +1,7 @@
@using static WebWindowComplex.LayoutConst
<div class="input-group mb-2">
<span class="input-group-text">@CurrRec.nIndex</span>
@if (User)
@if (BaseUser)
{
<input type="text" readonly class="form-control" title="@Title()" value="@(CurrRec.dDimension)">
}
WebWindowComplex/Compo/EditSplitElement.razor.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace WebWindowComplex.Compo
/// Livello di accesso (utente base)
/// </summary>
[CascadingParameter(Name = "User")]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
#endregion Public Properties
WebWindowComplex/Compo/General.razor
+4 -4
View File
@@ -14,7 +14,7 @@
<div class="row">
<div class="col-md-12 col-lg-6 d-flex flex-column gap-2 flex-wrap">
<div class="input-group mb-2 justify-content-center">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">Wood</span>
<input type="text" readonly class="form-control" value="@(CurrWood)">
@@ -31,7 +31,7 @@
}
</div>
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">Profile</span>
<input type="text" readonly class="form-control" value="@(CurrProfile)">
@@ -60,7 +60,7 @@
</div>
<div class="row">
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">Glass</span>
<input type="text" readonly class="form-control" value="@(CurrGlass)">
@@ -92,7 +92,7 @@
</div>
<div class="row">
<div class="input-group mb-2">
@if (User)
@if (BaseUser)
{
<span class="input-group-text">Window</span>
<input type="text" readonly class="form-control" value="@(CurrColor)">
WebWindowComplex/Compo/General.razor.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace WebWindowComplex.Compo
public Window CurrWindow { get; set; } = null!;
[Parameter]
public bool User { get; set; } = false!;
public bool BaseUser { get; set; } = false!;
[Parameter]
public EventCallback<DataUpdateGeneral> EC_UpdateGeneral { get; set; }
WebWindowComplex/Models/Area.cs
+1 -1
View File
@@ -191,7 +191,7 @@ namespace WebWindowComplex.Models
foreach(var anta in sash.SashList)
{
foreach (var j in anta.JointList)
j.SelJointType = anta.JointList.FirstOrDefault().SelJointType;
j.SelJointType = anta.JointList.FirstOrDefault()!.SelJointType;
}
}
// Aggiorno altezza sotto aree
WebWindowComplex/TableComp.razor
+1 -1
View File
@@ -288,7 +288,7 @@
ListPayload="ListPayload"
ListWarnings="listWarnings"
DictPendReq="PendReq"
User="BaseUser"
BaseUser="BaseUser"
EC_UpdateGeneral="UpdatePreviewGeneral"
EC_ReqClose="ReturnTree">
</General>
WebWindowComplex/TableComp.razor.cs
+23 -21
View File
@@ -241,8 +241,6 @@ namespace WebWindowComplex
if (m_CurrWindow != null && m_CurrWindow.AreaList != null && m_CurrWindow.AreaList.Count > 0)
{
checkWarnings();
//if (SashGroupList.Count > 0)
// currAntaIndex = 0;
if (updRequested)
{
// se mancasse dizionario forme chiamo quello
@@ -314,8 +312,6 @@ namespace WebWindowComplex
private static Logger Log = LogManager.GetCurrentClassLogger();
//private int currAntaIndex = 0;
private int currFillIndex = -1;
private List<string> currLoading = new List<string>();
@@ -1361,16 +1357,16 @@ namespace WebWindowComplex
if (m_PreviousWindow != null)
{
for (int i = 0; i < 2; i++)
m_CurrWindow.AreaList.First().DimensionList[i].dDimension = m_PreviousWindow.AreaList.First().DimensionList[i].dDimension;
FrameWindow.DimensionList[i].dDimension = m_PreviousWindow.AreaList.First().DimensionList[i].dDimension;
if (m_CurrWindow.AreaList.First().Shape == Shapes.TRIANGLE)
{
for (int i = 0; i < 2; i++)
m_CurrWindow.AreaList.First().JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType;
FrameWindow.JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType;
}
else
{
for (int i = 0; i < 4; i++)
m_CurrWindow.AreaList.First().JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType;
FrameWindow.JointList[i].SelJointType = m_PreviousWindow.AreaList.First().JointList[i].SelJointType;
}
}
if (m_CurrWindow != null)
@@ -1404,8 +1400,6 @@ namespace WebWindowComplex
prevHardware[i] = SashGroupList.ElementAt(i).SelHardware;
}
}
//if (SashGroupList.Count > 0)
// currAntaIndex = 0;
// Aggiorno window con dati shape e hw option
UpdateDict();
}
@@ -2215,24 +2209,32 @@ namespace WebWindowComplex
SpElemList.ElementAt(i).SetNameElement(profileNameList.ElementAt(i));
SpElemList.ElementAt(i).SetMinDimension(Window.m_ParameterList.GetValueOrDefault(SpElemList.ElementAt(i).sName + "_DimMin"));
SpElemList.ElementAt(i).SetMaxDimension(Window.m_ParameterList.GetValueOrDefault(SpElemList.ElementAt(i).sName + "_DimMax"));
if (SpElemList.ElementAt(i).dDimension > SpElemList.ElementAt(i).dMaxDim)
if (SpElemList.ElementAt(i).dDimension > SpElemList.ElementAt(i).dMaxDim || SpElemList.ElementAt(i).dDimension < SpElemList.ElementAt(i).dMinDim)
{
SpElemList.ElementAt(i).SetDimension(SpElemList.ElementAt(i).dMaxDim);
Frame frame = split.ParentWindow.AreaList.First();
if (frame != null)
if (SpElemList.ElementAt(i).dDimension > SpElemList.ElementAt(i).dMaxDim)
{
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
SpElemList.ElementAt(i).SetDimension(SpElemList.ElementAt(i).dMaxDim);
}
else if (SpElemList.ElementAt(i).dDimension < SpElemList.ElementAt(i).dMinDim)
{
SpElemList.ElementAt(i).SetDimension(SpElemList.ElementAt(i).dMinDim);
}
}
else if (SpElemList.ElementAt(i).dDimension < SpElemList.ElementAt(i).dMinDim)
{
SpElemList.ElementAt(i).SetDimension(SpElemList.ElementAt(i).dMinDim);
Frame frame = split.ParentWindow.AreaList.First();
if (frame != null)
{
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
switch (split.SelSplitShape)
{
case SplitShapes.VERTICAL:
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
break;
case SplitShapes.HORIZONTAL:
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
break;
default:
frame.SearchAreaList(frame, frame.AvailWidthArea(), "Width");
frame.SearchAreaList(frame, frame.AvailHeightArea(), "Height");
break;
}
}
}
string overlapName = string.Join("_", SpElemList.ElementAt(i).sName.Split('_').Skip(1));
WebWindowComplex/WebWindowComplex.csproj
+23 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.8.1311</Version>
<Version>3.1.8.1314</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -172,6 +172,28 @@
WebWindowConfigurator/WebWindowConfigurator.csproj
+24 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>3.1.8.1311</Version>
<Version>3.1.8.1314</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -485,6 +485,29 @@