- corretti titoli delle tabs

- aggiunti combobox per joint del telaio
This commit is contained in:
Annamaria Sassi
2025-07-15 14:32:48 +02:00
parent cd5a701222
commit 14aa91637a
3 changed files with 45 additions and 16 deletions
+40 -10
View File
@@ -13,23 +13,33 @@
}
</li>
<li class="nav-item">
@if (currStep == CompileStep.Shape)
@if (currStep == CompileStep.Sash)
{
<a href="#" data-target="#Shape" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Shape)">Shape</a>
<a href="#" data-target="#Sash" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Sash)">Sash</a>
}
else
{
<a href="#" data-target="#Shape" class="nav-link" @onclick="() => AdvStep(CompileStep.Shape)">Shape</a>
<a href="#" data-target="#Sash" class="nav-link" @onclick="() => AdvStep(CompileStep.Sash)">Sash</a>
}
</li>
<li class="nav-item">
@if (currStep == CompileStep.Dimension)
@if (currStep == CompileStep.Split)
{
<a href="#" data-target="#Dimension" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Dimension)">Dimension</a>
<a href="#" data-target="#Split" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Split)">Split</a>
}
else
{
<a href="#" data-target="#Dimension" class="nav-link" @onclick="() => AdvStep(CompileStep.Dimension)">Dimension</a>
<a href="#" data-target="#Split" class="nav-link" @onclick="() => AdvStep(CompileStep.Split)">Split</a>
}
</li>
<li class="nav-item">
@if (currStep == CompileStep.Fill)
{
<a href="#" data-target="#Fill" class="nav-link active" aria-current="true" @onclick="() => AdvStep(CompileStep.Fill)">Fill</a>
}
else
{
<a href="#" data-target="#Fill" class="nav-link" @onclick="() => AdvStep(CompileStep.Fill)">Fill</a>
}
</li>
</ul>
@@ -59,6 +69,19 @@
<option value="7">Triangle</option>
</select>
</div>
<div class="input-group w-50">
@foreach (Joint joint in m_frame.JointList)
{
<div class="input-group mb-3 w-50">
<label class="input-group-text" for="inputGroupSelect02">Giunzioni telaio @joint.nIndex</label>
<select class="form-select" @bind="@joint.SelJointTypeIndex">
<option value="0">Angled</option>
<option value="1">Full H</option>
<option value="2">Full V</option>
</select>
</div>
}
</div>
<div class="d-flex justify-content-start fs-5 mb-3 w-25">
<div class="p-2">
<input class="form-check-input ml-auto" type="checkbox" name="BottomRail" id="BottomRail" @bind="@m_frame.BottomRail">
@@ -73,17 +96,24 @@
</div>
@*<button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button> *@
}
else if (currStep == CompileStep.Shape)
else if (currStep == CompileStep.Sash)
{
<div class="alert alert-light text-center display-4">
aggiungi
aggiungi finestre
@* <button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button> *@
</div>
}
else if (currStep == CompileStep.Dimension)
else if (currStep == CompileStep.Split)
{
<div class="alert alert-info text-center display-4">
aggiungi dimensioni
aggiungi montanti
@* <button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button> *@
</div>
}
else if (currStep == CompileStep.Fill)
{
<div class="alert alert-info text-center display-4">
aggiungi riempimento
@* <button class="btn btn-sm btn-primary" title="Reset selezione" @onclick="DoReset"><i class="fa-solid fa-arrow-rotate-right"></i></button> *@
</div>
}
@@ -14,9 +14,9 @@ namespace WebWindowConfigurator
{
Draft = 0,
General = 1,
Shape,
Dimension,
Open
Sash,
Split,
Fill
}
private CompileStep currStep = CompileStep.Draft;
@@ -65,7 +65,6 @@ namespace WebWindowConfigurator
Frame NewFrame = (Frame)Frame.CreateFrame(m_CurrWindow);
m_CurrWindow.AreaList.Add(NewFrame);
m_SelArea = NewFrame;
var cc= m_frame.Shape;
}
private Window m_CurrWindow { get; set; } = new Window();
+2 -2
View File
@@ -1408,8 +1408,8 @@ namespace WebWindowConfigurator
private List<IdNameStruct> m_JointTypeList = new List<IdNameStruct>
{
new IdNameStruct((int)Joints.ANGLED, "Angled"),
new IdNameStruct((int)Joints.FULL_H, "Full H"),
new IdNameStruct((int)Joints.FULL_V, "Full V")
new IdNameStruct((int)Joints.FULL_H, "Full H"),
new IdNameStruct((int)Joints.FULL_V, "Full V")
};
public List<IdNameStruct> JointTypeList
{