diff --git a/WebWindowComplex/Compo/AreaSplit.razor b/WebWindowComplex/Compo/AreaSplit.razor index dcd0424..4b2664d 100644 --- a/WebWindowComplex/Compo/AreaSplit.razor +++ b/WebWindowComplex/Compo/AreaSplit.razor @@ -6,7 +6,7 @@
- +
diff --git a/WebWindowComplex/Compo/AreaSplit.razor.cs b/WebWindowComplex/Compo/AreaSplit.razor.cs index c7c87b4..61e8cac 100644 --- a/WebWindowComplex/Compo/AreaSplit.razor.cs +++ b/WebWindowComplex/Compo/AreaSplit.razor.cs @@ -32,6 +32,12 @@ namespace WebWindowComplex.Compo [Parameter] public EventCallback EC_CopySash { get; set; } + /// + /// Evento per aggiungere Sash + /// + [Parameter] + public EventCallback EC_AddSash { get; set; } + #endregion Public Properties #region Private Methods @@ -50,6 +56,18 @@ namespace WebWindowComplex.Compo await EC_CopySash.InvokeAsync(Args); } + /// + /// Sollevo evento richiesta copia sash + /// + /// + private async Task RaiseAddSash(Splitted item) + { + var Args = new DataAreaSplitted + { + splitted = item + }; + await EC_AddSash.InvokeAsync(Args); + } #endregion Private Methods } @@ -62,4 +80,12 @@ namespace WebWindowComplex.Compo public Splitted splitted { get; set; } public int index { get; set; } } + + /// + /// Classe per raggruppare oggetti che servono per aggiungere Sash + /// + public class DataAreaSplitted + { + public Splitted splitted { get; set; } + } } \ No newline at end of file diff --git a/WebWindowComplex/Compo/CardFill.razor b/WebWindowComplex/Compo/CardFill.razor index f09bdec..5d40cd8 100644 --- a/WebWindowComplex/Compo/CardFill.razor +++ b/WebWindowComplex/Compo/CardFill.razor @@ -47,7 +47,12 @@ { @if (currSplitted.AreaList.First().Equals(CurrItem)) { - + + } } diff --git a/WebWindowComplex/Compo/CardFill.razor.cs b/WebWindowComplex/Compo/CardFill.razor.cs index 36e4f4f..1ec78ca 100644 --- a/WebWindowComplex/Compo/CardFill.razor.cs +++ b/WebWindowComplex/Compo/CardFill.razor.cs @@ -38,6 +38,12 @@ namespace WebWindowComplex.Compo [Parameter] public EventCallback EC_CopySash { get; set; } + /// + /// Evento per aggiungere sash + /// + [Parameter] + public EventCallback EC_AddSash { get; set; } + /// /// Evento per tornare nella pagine Tree /// @@ -97,6 +103,16 @@ namespace WebWindowComplex.Compo await EC_CopySash.InvokeAsync(Args); } + /// + /// Sollevo evento per aggiungere sash + /// + /// + /// + protected async Task AddSash(DataAreaSplitted Args) + { + await EC_AddSash.InvokeAsync(Args); + } + #endregion Protected Methods #region Private Methods diff --git a/WebWindowComplex/Compo/CardSashGroup.razor b/WebWindowComplex/Compo/CardSashGroup.razor index 82a0e57..21edcb5 100644 --- a/WebWindowComplex/Compo/CardSashGroup.razor +++ b/WebWindowComplex/Compo/CardSashGroup.razor @@ -92,22 +92,34 @@ }
-
- - + + +
+ } + else + { +
+ + -
+ else + { + @foreach (var hlItem in CurrItem.HardwareList) + { + + } + } + + + } diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index 2d5de4e..006f067 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -114,11 +114,10 @@ namespace WebWindowComplex.Models if (listHwValid != null) { // seleziono la famiglia del primo hw trovato... - SashArea.SelFamilyHardware = listHwValid.FamilyName; + SashArea.SetSelFamilyHardware(listHwValid.FamilyName); SashArea.ReqRefreshShape(); if (SashArea.HardwareList.Count == 0) { - SashArea.Remove(); answ = true; } else diff --git a/WebWindowComplex/Models/Fill.cs b/WebWindowComplex/Models/Fill.cs index be23281..49d4def 100644 --- a/WebWindowComplex/Models/Fill.cs +++ b/WebWindowComplex/Models/Fill.cs @@ -94,10 +94,14 @@ namespace WebWindowComplex.Models return JsonFill; } + internal void SetSelFillType(FillTypes value) + { + m_SelFillType = value; + //m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized()); + } internal void SetFillType(FillTypes value) { m_SelFillType = value; - m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized()); } #endregion Internal Methods diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 219bb2c..4d4a4fb 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -44,6 +44,10 @@ namespace WebWindowComplex.Models #region Public Properties + public string sSashShape + { + get => m_CurrShape; + } public bool bIsMeasureGlass { get @@ -316,10 +320,7 @@ namespace WebWindowComplex.Models } set { - m_SelFamilyHardware = value; - ReqRefreshShape(); - RefreshHardwareOptionList(); - SetFirstHardware(); + SetSelFamilyHardware(value); m_ParentWindow.OnUpdatePreview(m_ParentWindow.sSerialized()); } } @@ -569,7 +570,7 @@ namespace WebWindowComplex.Models newSash.JointList.Add(new Joint(newSash, JointIndex + 1, Joints.FULL_H)); newSash.SetSashBottomRail(false); newSash.SetSashBottomRailQty(0); - newSash.SelFamilyHardware = Sash.s_FamilyHardwareList.First(); + newSash.SetSelFamilyHardware(Sash.s_FamilyHardwareList.First()); newSash.ReqRefreshShape(); newSash.RefreshHardwareOptionList(); newSash.SetFirstHardware(); @@ -750,6 +751,13 @@ namespace WebWindowComplex.Models m_SashType = SashType; } + public void SetSelFamilyHardware(string sFamilyHw) + { + m_SelFamilyHardware = sFamilyHw; + ReqRefreshShape(); + RefreshHardwareOptionList(); + SetFirstHardware(); + } internal string SetSelFamilyHardwareFromIndex(string codHardware) { if (string.IsNullOrEmpty(m_SelFamilyHardware)) diff --git a/WebWindowComplex/Models/Split.cs b/WebWindowComplex/Models/Split.cs index 9a4f779..dd96fde 100644 --- a/WebWindowComplex/Models/Split.cs +++ b/WebWindowComplex/Models/Split.cs @@ -445,7 +445,7 @@ namespace WebWindowComplex.Models internal void SetSplitStartVert(bool SplitStartVert) { - bSplitStartVert = SplitStartVert; + m_bSplitStartVert = SplitStartVert; } #endregion Internal Methods diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 1689d5c..659575c 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -166,12 +166,30 @@ } else { - + + } } else if (currStep == CompileStep.General) { - + + } diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 2494eea..46d20f0 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -831,7 +831,7 @@ namespace WebWindowComplex { foreach (Fill currFill in FillList) { - currFill.SetFillType(type); + currFill.SetSelFillType(type); } await DoPreviewSvg(); } @@ -871,7 +871,7 @@ namespace WebWindowComplex private async Task ChangeOneFill(FillTypes type) { Fill fillChange = FillList.ElementAt(currFill); - fillChange.SetFillType(type); + fillChange.SetSelFillType(type); await DoPreviewSvg(); } @@ -961,6 +961,18 @@ namespace WebWindowComplex await DoPreviewSvg(); } + /// + /// Metodo per aggiungere una Sash + /// + /// + /// + private async Task AddSash(DataAreaSplitted Args) + { + Splitted currSplitted = Args.splitted; + bError = currSplitted.AddFirstSash(); + await DoPreviewSvg(); + } + /// /// Metodo per copiare una Sash intera /// diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 1ec8c7d..03f83b0 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.2212 + 2.7.10.2216 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -37,6 +37,18 @@ + + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index f28acee..97cee3d 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.2212 + 2.7.10.2216 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -104,6 +104,27 @@ + + + + + + + + + + + + + + + + + + + + +