diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor index 3078e20..8ab33d3 100644 --- a/WebWindowComplex/Compo/CardFrame.razor +++ b/WebWindowComplex/Compo/CardFrame.razor @@ -41,7 +41,7 @@ mm *@ - + }
@@ -81,14 +81,15 @@
@foreach (Joint joint in FrameWindow.JointList) { -
+ @*
-
+
*@ + }
diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs index 1166177..2b82d25 100644 --- a/WebWindowComplex/Compo/CardFrame.razor.cs +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -5,6 +5,38 @@ namespace WebWindowComplex.Compo { public partial class CardFrame { + #region Public Properties + + /// + /// Evento per aggiungere sash + /// + [Parameter] + public EventCallback EC_AddSash { get; set; } + + /// + /// Evento per aggiungere split + /// + [Parameter] + public EventCallback EC_AddSplit { get; set; } + + /// + /// Evento per cambiare tutti i Joints + /// + [Parameter] + public EventCallback EC_ChangeAllJoints { get; set; } + + /// + /// Evento per tornare nella pagine Tree + /// + [Parameter] + public EventCallback EC_ReqClose { get; set; } + + /// + /// Evento per cambiare tutti i Joints + /// + [Parameter] + public EventCallback EC_UpdateFrame { get; set; } + /// /// Frame corrente /// @@ -23,50 +55,9 @@ namespace WebWindowComplex.Compo [Parameter] public List SplitList { get; set; } = null!; - /// - /// Evento per cambiare tutti i Joints - /// - [Parameter] - public EventCallback EC_ChangeAllJoints { get; set; } + #endregion Public Properties - /// - /// 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; } - - - /// - /// Evento per cambiare tutti i Joints - /// - [Parameter] - public EventCallback> EC_UpdateFrameDim{ 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); - } + #region Private Methods /// /// Sollevo evento richiesta aggiunta sash @@ -86,6 +77,20 @@ namespace WebWindowComplex.Compo await EC_AddSplit.InvokeAsync(true); } + /// + /// 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 per tornare alla pagina Tree /// @@ -98,7 +103,7 @@ namespace WebWindowComplex.Compo /// Aggiornamento dimensione editata /// /// - private void UpdateDim(FrameDimension updRec) + private async Task UpdateDim(FrameDimension updRec) { // cerco il record var currRec = FrameWindow.DimensionList.FirstOrDefault(x => x.ParentFrame == updRec.ParentFrame && x.nIndex == updRec.nIndex); @@ -106,9 +111,28 @@ namespace WebWindowComplex.Compo if (updRec != null) { currRec = updRec; - _ = EC_UpdateFrameDim.InvokeAsync(FrameWindow.DimensionList); + await EC_UpdateFrame.InvokeAsync(FrameWindow); } } + + /// + /// Report aggiornamento joint + /// + /// + /// + private async Task UpdateJoint(Joint updRec) + { + // cerco il record + var currRec = FrameWindow.JointList.FirstOrDefault(x => x.ParentArea == updRec.ParentArea && x.nIndex == updRec.nIndex); + // lo aggiorno + if (updRec != null) + { + currRec = updRec; + await EC_UpdateFrame.InvokeAsync(FrameWindow); + } + } + + #endregion Private Methods } /// @@ -116,7 +140,11 @@ namespace WebWindowComplex.Compo /// public class DataChangeJoints { - public Json.WindowConst.Joints currJointType { get; set; } + #region Public Properties + public Area currArea { get; set; } + public Json.WindowConst.Joints currJointType { get; set; } + + #endregion Public Properties } } \ No newline at end of file diff --git a/WebWindowComplex/Compo/EditDimensions.razor b/WebWindowComplex/Compo/EditDimensions.razor index d2bc0b1..9ac6cfe 100644 --- a/WebWindowComplex/Compo/EditDimensions.razor +++ b/WebWindowComplex/Compo/EditDimensions.razor @@ -1,6 +1,6 @@ 
- @Dimenson.sName + @CurrRec.sName mm
diff --git a/WebWindowComplex/Compo/EditDimensions.razor.cs b/WebWindowComplex/Compo/EditDimensions.razor.cs index f678e0e..d94acb8 100644 --- a/WebWindowComplex/Compo/EditDimensions.razor.cs +++ b/WebWindowComplex/Compo/EditDimensions.razor.cs @@ -5,24 +5,31 @@ namespace WebWindowComplex.Compo { public partial class EditDimensions { + #region Public Properties + [Parameter] - public FrameDimension Dimenson { get; set; } = null!; + public FrameDimension CurrRec { get; set; } = null!; [Parameter] public EventCallback EC_Update { get; set; } + #endregion Public Properties + + #region Private Properties private double CurrVal { - get => Dimenson.dValue; + get => CurrRec.dValue; set { - if (Dimenson.dValue != value) + if (CurrRec.dValue != value) { - Dimenson.dValue = value; - _ = EC_Update.InvokeAsync(Dimenson); + CurrRec.dValue = value; + _ = EC_Update.InvokeAsync(CurrRec); } } } + + #endregion Private Properties } } \ No newline at end of file diff --git a/WebWindowComplex/Compo/EditJoint.razor b/WebWindowComplex/Compo/EditJoint.razor new file mode 100644 index 0000000..1ffcd67 --- /dev/null +++ b/WebWindowComplex/Compo/EditJoint.razor @@ -0,0 +1,9 @@ +@using static WebWindowComplex.LayoutConst +
+ + +
\ No newline at end of file diff --git a/WebWindowComplex/Compo/EditJoint.razor.cs b/WebWindowComplex/Compo/EditJoint.razor.cs new file mode 100644 index 0000000..2835920 --- /dev/null +++ b/WebWindowComplex/Compo/EditJoint.razor.cs @@ -0,0 +1,35 @@ +using Microsoft.AspNetCore.Components; +using WebWindowComplex.Models; + +namespace WebWindowComplex.Compo +{ + public partial class EditJoint + { + #region Public Properties + + [Parameter] + public Joint CurrRec { get; set; } = null!; + + [Parameter] + public EventCallback EC_Update { get; set; } + + #endregion Public Properties + + #region Private Properties + + private int CurrVal + { + get => CurrRec.SelJointTypeIndex; + set + { + if (CurrRec.SelJointTypeIndex != value) + { + CurrRec.SelJointTypeIndex = value; + _ = EC_Update.InvokeAsync(CurrRec); + } + } + } + + #endregion Private Properties + } +} \ No newline at end of file diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 1a14219..1b52248 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -126,7 +126,7 @@ { m_PreviousWindow = m_CurrWindow; } - + } else if (currStep == CompileStep.Split) { diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 5afc1c1..1b87074 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -1109,17 +1109,6 @@ namespace WebWindowComplex return (currStep == CompileStep.Template) ? "col-12" : "col-6"; } - /// - /// Metodo per cambiare step - /// - /// argomenti passati dal componente - private void NextStepArgs(DataNextStep Args) - { - CompileStep newStep = Args.currCompileStep; - int Index = Args.index; - NextStep(newStep, Index); - } - /// /// Metodo per cambiare step /// @@ -1154,6 +1143,17 @@ namespace WebWindowComplex } } + /// + /// Metodo per cambiare step + /// + /// argomenti passati dal componente + private void NextStepArgs(DataNextStep Args) + { + CompileStep newStep = Args.currCompileStep; + int Index = Args.index; + NextStep(newStep, Index); + } + /// /// Metodo per eliminare Split o Sash /// @@ -1245,13 +1245,17 @@ namespace WebWindowComplex return (testStep == currStep) ? "nav-link active fw-bold" : "nav-link text-secondary"; } - #endregion Private Methods - - // Aggiornamento record frame dimensions - private async Task UpdateFrameDim(List newList) + /// + /// Aggiornamento Frame + /// + /// + /// + private async Task UpdateFrame(Frame newFrame) { - FrameWindow.DimensionList = newList; + FrameWindow = newFrame; await DoPreviewSvg(); } + + #endregion Private Methods } } \ No newline at end of file diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index c338398..7394983 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -104,6 +104,12 @@ + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 80e8ec9..c42c5d7 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -135,6 +135,12 @@ + + + + + +