Aggiornata grafica

This commit is contained in:
Annamaria Sassi
2025-11-07 16:20:30 +01:00
parent 0e95f51b2b
commit 4edcef86fc
10 changed files with 53 additions and 741 deletions
+20 -18
View File
@@ -13,26 +13,28 @@
{
<button class="btn btn-secondary" type="button" disabled>Loading</button>
}
@if (!hwOptCollapsed || !isLoadingHwOpt)
@if (!hwOptCollapsed)
{
@foreach (var currOpt in CurrSash.HwOptionList)
{
switch (currOpt.Type)
{
case HwOptionTypes.COMBO:
<div class="scrollspy" tabindex="0"
style="position: relative; height: 15rem; overflow-y: auto;">
@foreach (var currOpt in CurrSash.HwOptionList)
{
switch (currOpt.Type)
{
AGBOptionCombo currOptCombo = (AGBOptionCombo)currOpt;
<EditOptionCombo CurrOpt="currOptCombo" EC_Update="RaiseOptCombo"></EditOptionCombo>
break;
case HwOptionTypes.COMBO:
{
AGBOptionCombo currOptCombo = (AGBOptionCombo)currOpt;
<EditOptionCombo CurrOpt="currOptCombo" EC_Update="RaiseOptCombo"></EditOptionCombo>
break;
}
case HwOptionTypes.TEXT:
{
AGBOptionText currOptText = (AGBOptionText)currOpt;
<EditOptionText CurrOpt="currOptText" EC_Update="RaiseOptText"></EditOptionText>
break;
}
}
case HwOptionTypes.TEXT:
{
AGBOptionText currOptText = (AGBOptionText)currOpt;
<EditOptionText CurrOpt="currOptText" EC_Update="RaiseOptText"></EditOptionText>
break;
}
}
}
}
</div>
}
</div>
+5 -5
View File
@@ -27,14 +27,14 @@
@if (!(CurrAnta.AreaList[0] is Split))
{
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2 justify-content-center">
<button class="btn btn-outline-secondary btn-sm" @onclick="() => CurrAnta.AddSplit()">Aggiungi split</button>
<button class="btn btn-outline-secondary btn-sm" @onclick="() => CurrAnta.AddSplit()">Add split</button>
</div>
</div>
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2 justify-content-center">
<button class="btn btn-outline-secondary btn-sm">Aggiungi inglesina</button>
<button class="btn btn-outline-secondary btn-sm">Add inglesina</button>
</div>
</div>
</div>
@@ -46,7 +46,7 @@
{
int IndexCopy = k;
int IndexModify = IndexSash;
<div class="col-sm-6 my-1">
<div class="col-md-12 col-lg-6 my-1">
<div class="input-group justify-content-center">
<button class="btn btn-outline-secondary btn-sm" @onclick="() => RaiseCopyContentSash(CurrSashGroup, IndexCopy, IndexModify)">Copy sash @(k + 1)</button>
</div>
+5 -5
View File
@@ -13,7 +13,7 @@
</div>
<div class="card-body py-2">
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group my-2">
<label class="input-group-text">Shape</label>
<select class="form-select" @bind="@SelShapeIndex">
@@ -35,7 +35,7 @@
</div>
<hr />
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="d-flex justify-content-start align-items-center">
<h6 class="fw-bold">Dimension</h6>
</div>
@@ -44,7 +44,7 @@
<EditDimensions CurrRec="dimension" EC_Update="UpdateDim"></EditDimensions>
}
</div>
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="d-flex justify-content-start align-items-center">
<h6 class="fw-bold">Threshold</h6>
</div>
@@ -59,7 +59,7 @@
</div>
<hr />
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="row justify-content-between align-items-center">
<div class="col d-flex justify-content-start align-items-center">
<h6 class="fw-bold">Joints</h6>
@@ -87,7 +87,7 @@
}
</div>
</div>
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
@if (SashList.Count == 0)
{
<div class="d-flex justify-content-start align-items-center">
+5 -5
View File
@@ -18,7 +18,7 @@
</div>
<div class="card-body py-2">
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">Qty sash</span>
<input type="number" class="form-control" @bind="@CurrItem.nSashQty">
@@ -26,7 +26,7 @@
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<label class="input-group-text">Tipology</label>
<select class="form-select" @bind="@CurrItem.SelOrientationSashTypeIndex">
@@ -39,7 +39,7 @@
</select>
</div>
</div>
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">Qty bottom rail</span>
<input type="number" class="form-control" @bind="@CurrItem.SashBottomRailQty">
@@ -48,7 +48,7 @@
</div>
<hr />
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="row justify-content-between align-items-center">
<div class="col d-flex justify-content-start align-items-center">
<h6 class="fw-bold">Hardware</h6>
@@ -99,7 +99,7 @@
</AreaHwOption>
}
</div>
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="row justify-content-between align-items-center">
<div class="col d-flex justify-content-start align-items-center">
<h6 class="fw-bold">Joints</h6>
+8 -8
View File
@@ -30,7 +30,7 @@
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<label class="input-group-text">Shape</label>
<select class="form-select" @bind="@CurrItem.SelSplitShapeIndex">
@@ -49,7 +49,7 @@
<div class="row">
@if (CurrItem.nSplitQtyVert > 0)
{
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">QtyVert</span>
<input type="number" class="form-control" @bind="@CurrItem.nSplitQtyVert">
@@ -58,7 +58,7 @@
}
@if (CurrItem.nSplitQtyHoriz > 0)
{
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">QtyHoriz</span>
<input type="number" class="form-control" @bind="@CurrItem.nSplitQtyHoriz">
@@ -69,7 +69,7 @@
<div class="row">
@if (CurrItem.SplitVertList.Count > 0 && CurrItem.SplitHorizList.Count > 0)
{
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
@foreach (var dim in CurrItem.SplitVertList)
{
<div class="input-group mb-2">
@@ -79,7 +79,7 @@
</div>
}
</div>
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
@foreach (var dim in CurrItem.SplitHorizList)
{
<div class="input-group mb-2">
@@ -94,7 +94,7 @@
{
@foreach (var dim in CurrItem.SplitHorizList)
{
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">Height</span>
<input type="number" class="form-control" @bind="@dim.dDimension">
@@ -107,7 +107,7 @@
{
@foreach (var dim in CurrItem.SplitVertList)
{
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="input-group mb-2">
<span class="input-group-text">Width</span>
<input type="number" class="form-control" @bind="@dim.dDimension">
@@ -120,7 +120,7 @@
@if (CurrItem.SelSplitShape == Json.WindowConst.SplitShapes.GRID)
{
<div class="row">
<div class="col-sm-6">
<div class="col-md-12 col-lg-6">
<div class="d-flex justify-content-start fs-5 mb-2">
<div class="px-1">
<input class="form-check-input ml-auto" type="checkbox" name="SplitStartVert" checked="@CurrItem.bSplitStartVert" @oninput="(ChangeEventArgs e) => ChangeStartVert(e, CurrItem)">
+3 -3
View File
@@ -12,7 +12,7 @@
</div>
<div class="card-body py-2">
<div class="row">
<div class="col-md-6 d-flex flex-column gap-2 flex-wrap">
<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">
<label class="input-group-text">Material</label>
<select class="form-select @(cssValid("Material"))" @bind="CurrMaterial">
@@ -35,7 +35,7 @@
</div>
<hr />
<div class="row">
<div class="col-md-6 d-flex flex-column gap-2 mr-2 flex-wrap">
<div class="col-md-12 col-lg-6 d-flex flex-column gap-2 mr-2 flex-wrap">
<div class="row">
<h5>Fill type</h5>
</div>
@@ -59,7 +59,7 @@
</div>
</div>
</div>
<div class="col-md-6 d-flex flex-column gap-2 flex-wrap">
<div class="col-md-12 col-lg-6 d-flex flex-column gap-2 flex-wrap">
<div class="row">
<h5 class="card-title">Color</h5>
</div>
+4 -4
View File
@@ -37,11 +37,11 @@
}
else
{
<div class="col-md-6 col-sm-12 d-flex flex-column">
<div class="col-md-12 col-lg-6 d-flex flex-column">
<div class="card text-center table-svg shadow rounded">
<div class="card-header" style="background-color: #d5f1f2;">
<div class="row justify-content-between align-middle flex-wrap">
<div class="col-md-6 col-sm-12 d-grid px-2 d-md-flex justify-content-md-start flex-wrap">
<div class="col-md-12 col-lg-6 d-grid px-2 d-md-flex justify-content-md-start flex-wrap">
<ul class="nav nav-tabs card-header-tabs">
<li class="nav-item m-1">
<button data-target="#Tree" class="@tabNavCss(CompileStep.Tree)" @onclick="() => NextStep(CompileStep.Tree)">Tree</button>
@@ -51,7 +51,7 @@
</li>
</ul>
</div>
<div class="col-md-6 col-sm-12 d-grid gap-1 d-md-flex justify-content-md-end align-items-center flex-wrap">
<div class="col-md-12 col-lg-6 d-grid gap-1 d-md-flex justify-content-md-end align-items-center flex-wrap">
<div class="col d-flex justify-content-md-end">
<button class="btn btn-lg btn-primary" style="font-size: 1rem;" @onclick="DoReset">Reset</button>
</div>
@@ -170,7 +170,7 @@
</div>
</div>
</div>
<div class="col-md-6 col-sm-12 d-flex flex-column">
<div class="col-md-12 col-lg-6 d-flex flex-column">
@outSvg
</div>
if (listWarnings != null && listWarnings.Count > 0)
+1
View File
@@ -717,6 +717,7 @@ namespace WebWindowComplex
}
if (SashList.Count > 0)
currAnta = 0;
isLoadingHwOpt = false;
// Aggiorno window con dati shape e hw option
UpdateDict();
}
+1 -299
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.11.710</Version>
<Version>2.7.11.716</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -32,301 +32,3 @@
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.11.710</Version>
<Version>2.7.11.716</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -39,396 +39,3 @@