diff --git a/WebWindowComplex/Compo/AreaFrame.razor b/WebWindowComplex/Compo/AreaFrame.razor index 1b068c2..1b1de08 100644 --- a/WebWindowComplex/Compo/AreaFrame.razor +++ b/WebWindowComplex/Compo/AreaFrame.razor @@ -1,19 +1,18 @@ -
-
-
-
-

Area frame

+
+
+
+
+
Area frame
-
+
@if (CurrSashList.Count == 0 && CurrSplitList.Count == 0) { -
}
-
+
@if (!(CurrFrameWindow.AreaList[0] is Split)) {
diff --git a/WebWindowComplex/Compo/AreaFrame.razor.cs b/WebWindowComplex/Compo/AreaFrame.razor.cs index 67790d5..b74d237 100644 --- a/WebWindowComplex/Compo/AreaFrame.razor.cs +++ b/WebWindowComplex/Compo/AreaFrame.razor.cs @@ -20,7 +20,7 @@ namespace WebWindowComplex.Compo public EventCallback EC_AddSash { get; set; } [Parameter] - public EventCallback EC_AddWindow { get; set; } + public EventCallback EC_AddSplit { get; set; } #endregion Public Properties @@ -41,7 +41,7 @@ namespace WebWindowComplex.Compo /// private async Task RaiseAddSplit() { - await EC_AddWindow.InvokeAsync(true); + await EC_AddSplit.InvokeAsync(true); } #endregion Private Methods diff --git a/WebWindowComplex/Compo/CardFill.razor b/WebWindowComplex/Compo/CardFill.razor index 346943b..f09bdec 100644 --- a/WebWindowComplex/Compo/CardFill.razor +++ b/WebWindowComplex/Compo/CardFill.razor @@ -47,35 +47,6 @@ { @if (currSplitted.AreaList.First().Equals(CurrItem)) { - @*
-
-
-
- @if (SplittedList.Count > 1) - { -

Area split @(SplittedList.IndexOf(currSplitted) + 1)

- } - else - { -

Area split

- } -
-
-
- -
-
- @foreach (var Index in SashList) - { -
-
- -
-
- } -
-
-
*@ } } diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor new file mode 100644 index 0000000..6a1c1ca --- /dev/null +++ b/WebWindowComplex/Compo/CardFrame.razor @@ -0,0 +1,115 @@ +@using static WebWindowComplex.LayoutConst + +
+
+
+
+
Frame
+
+
+ +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
Dimension
+ @foreach (FrameDimension dimension in FrameWindow.DimensionList) + { +
+ @dimension.sName + + mm +
+ } +
+
+
Threshold
+
+ + +
+
+
+
+
+
+
+
+
Joints
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ @foreach (Joint joint in FrameWindow.JointList) + { +
+ + +
+ } +
+
+
+ @if (SashList.Count == 0) + { +
+
Bottom rail
+
+
+
+ Quantity + +
+
+ } +
+
+
+
+ +@if (!(FrameWindow.AreaList[0] is Split) || (SashList.Count == 0 && SplitList.Count == 0)) +{ + +} + \ No newline at end of file diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs new file mode 100644 index 0000000..7380261 --- /dev/null +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -0,0 +1,99 @@ +using Microsoft.AspNetCore.Components; +using WebWindowComplex.Models; + +namespace WebWindowComplex.Compo +{ + public partial class CardFrame + { + /// + /// Frame corrente + /// + [Parameter] + public Frame FrameWindow { get; set; } = null!; + + /// + /// Lista di sash + /// + [Parameter] + public List SashList { get; set; } = null!; + + /// + /// Lista di split + /// + [Parameter] + public List SplitList { get; set; } = null!; + + /// + /// Evento per cambiare tutti i Joints + /// + [Parameter] + public EventCallback EC_ChangeAllJoints { get; set; } + + /// + /// Evento per aggiungere sash + /// + [Parameter] + public EventCallback EC_AddSash { get; set; } + + /// + /// Evento per aggiungere split + /// + [Parameter] + public EventCallback EC_AddSplit { get; set; } + + /// + /// Evento per tornare nella pagine Tree + /// + [Parameter] + public EventCallback EC_ReqClose { get; set; } + + /// + /// Sollevo evento richiesta copia sash + /// + /// + private async Task ChangeAllJoints(Json.WindowConst.Joints JointType, Area a) + { + var Args = new DataChangeJoints + { + currJointType = JointType, + currArea = a, + }; + await EC_ChangeAllJoints.InvokeAsync(Args); + } + + /// + /// Sollevo evento richiesta aggiunta sash + /// + /// + private async Task AddSash() + { + await EC_AddSash.InvokeAsync(true); + } + + /// + /// Sollevo evento richiesta aggiunta window + /// + /// + private async Task AddSplit() + { + await EC_AddSplit.InvokeAsync(true); + } + + /// + /// Sollevo evento per tornare alla pagina Tree + /// + private void ReqClose() + { + _ = EC_ReqClose.InvokeAsync(true); + } + } + + /// + /// Classe per raggruppare oggetti che servono per copiare Sash + /// + public class DataChangeJoints + { + public Json.WindowConst.Joints currJointType { get; set; } + public Area currArea { get; set; } + } +} \ No newline at end of file diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 31f2207..08714e1 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -126,124 +126,7 @@ { m_PreviousWindow = m_CurrWindow; } -
-
-
-
-
-
-
-
-
-

Frame

-
-
-
-
-
- - -
-
-
-
-
-
-
Dimension
- @foreach (FrameDimension dimension in FrameWindow.DimensionList) - { -
- @dimension.sName - - mm -
- } -
-
-
Threshold
-
- - -
-
-
-
-
-
-
-
-
Joints
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- @foreach (Joint joint in FrameWindow.JointList) - { -
- - -
- } -
-
-
- @if (m_SashList.Count == 0) - { -
-
Bottom rail
-
-
-
- Quantity - -
-
- } -
- -
-
-
- @if (!(FrameWindow.AreaList[0] is Split) || (SashList.Count == 0 && SplitList.Count == 0)) - { - - - } -
-
-
-
-
+ } else if (currStep == CompileStep.Split) { @@ -466,17 +349,17 @@
- + @* *@
- + @* *@
- + @* *@
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index ef36db4..f5adec2 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -8,7 +8,6 @@ using WebWindowComplex.Json; using WebWindowComplex.Models; using static WebWindowComplex.LayoutConst; using static WebWindowComplex.Json.WindowConst; -//using static WebWindowComplex.Compo.CardTree; namespace WebWindowComplex { @@ -839,8 +838,36 @@ namespace WebWindowComplex /// tipo di giunzione (ANGLED o FULL_H o FULL_V) /// area su cui eseguire la funzione (Frame o Sash) /// - private async Task ChangeAllJoints(WindowConst.Joints type, Area area) + //private async Task ChangeAllJoints(WindowConst.Joints type, Area area) + //{ + // if (area is Frame) + // { + // foreach (Joint joint in FrameWindow.JointList) + // { + // joint.SetSelJointType(type); + // } + // } + // else + // { + // Sash a = (Sash)area; + // foreach (Joint joint in a.JointList) + // { + // joint.SetSelJointType(type); + // } + // } + // await DoPreviewSvg(); + //} + + /// + /// Metodo per settare tutti i Joints di Frame o Sash come ANGLED o FULL_H o FULL_V + /// + /// tipo di giunzione (ANGLED o FULL_H o FULL_V) + /// area su cui eseguire la funzione (Frame o Sash) + /// + private async Task ChangeAllJoints(DataChangeJoints Args) { + WindowConst.Joints type = Args.currJointType; + Area area = Args.currArea; if (area is Frame) { foreach (Joint joint in FrameWindow.JointList) diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 856e81f..ef00d29 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.1312 + 2.7.10.1313 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -66,6 +66,19 @@ + + + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 3368837..d83b7fc 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.1312 + 2.7.10.1313 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -110,6 +110,11 @@ + + + + +