diff --git a/Test.UI.sln b/Test.UI.sln index 0c4f942..eb5cb29 100644 --- a/Test.UI.sln +++ b/Test.UI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 18 -VisualStudioVersion = 18.2.11408.102 d18.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36915.13 d17.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.UI", "Test.UI\Test.UI.csproj", "{8F1D6298-C1E6-44E6-82BD-4128AE17C0C7}" EndProject diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor index 89ee7ca..0dcce3a 100644 --- a/WebWindowComplex/Compo/CardFrame.razor +++ b/WebWindowComplex/Compo/CardFrame.razor @@ -81,6 +81,10 @@ else { + @if (CurrFrameWindow.BottomRailQty > 0) + { + + } } diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs index eb8b167..c5c4dfd 100644 --- a/WebWindowComplex/Compo/CardFrame.razor.cs +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -279,6 +279,25 @@ namespace WebWindowComplex.Compo } } + /// + /// Aggiornamento Bottom Rail + /// + /// + private async Task UpdateFrame(Frame updRec) + { + // lo aggiorno + if (updRec != null) + { + CurrFrameWindow = updRec; + var args = new DataUpdateFrame() + { + currFrame = CurrFrameWindow, + svgNoHw = true + }; + await EC_UpdateFrame.InvokeAsync(args); + } + } + /// /// Metodo per la visualizzazione dei pulsanti joint /// diff --git a/WebWindowComplex/Compo/CardSashGroup.razor b/WebWindowComplex/Compo/CardSashGroup.razor index f1e33df..b1025c6 100644 --- a/WebWindowComplex/Compo/CardSashGroup.razor +++ b/WebWindowComplex/Compo/CardSashGroup.razor @@ -66,6 +66,10 @@ else { + @if (CurrSashGroup.SashBottomRailQty > 0) + { + + } } diff --git a/WebWindowComplex/Compo/CardSashGroup.razor.cs b/WebWindowComplex/Compo/CardSashGroup.razor.cs index 7bf630b..9e51a7f 100644 --- a/WebWindowComplex/Compo/CardSashGroup.razor.cs +++ b/WebWindowComplex/Compo/CardSashGroup.razor.cs @@ -268,6 +268,7 @@ namespace WebWindowComplex.Compo { currSash = CurrSashGroup }; + await EC_UpdateSashGroup.InvokeAsync(args); if (updateS.reqProfile) await EC_ReqElement.InvokeAsync(CurrSashGroup); diff --git a/WebWindowComplex/Compo/FrameBottomRail.razor b/WebWindowComplex/Compo/FrameBottomRail.razor new file mode 100644 index 0000000..41ea75c --- /dev/null +++ b/WebWindowComplex/Compo/FrameBottomRail.razor @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/WebWindowComplex/Compo/FrameBottomRail.razor.cs b/WebWindowComplex/Compo/FrameBottomRail.razor.cs new file mode 100644 index 0000000..bf3abbe --- /dev/null +++ b/WebWindowComplex/Compo/FrameBottomRail.razor.cs @@ -0,0 +1,42 @@ +using Microsoft.AspNetCore.Components; +using WebWindowComplex.Models; + +namespace WebWindowComplex.Compo +{ + public partial class FrameBottomRail + { + #region Public Properties + + /// + /// Frame corrente + /// + [CascadingParameter(Name = "CurrFrameWindow")] + public Frame CurrFrame { get; set; } = null!; + + [Parameter] + public EventCallback EC_UpdateFrame { get; set; } + + #endregion Public Properties + + #region Private Properties + + /// + /// Aggiornamento element + /// + /// + /// + private async Task UpdateElement(ElementDimension updRec) + { + // cerco il record + var currRec = CurrFrame.BottomRailElemDimList.FirstOrDefault(x => x.ParentArea == updRec.ParentArea && x.nIndex == updRec.nIndex); + // lo aggiorno + if (updRec != null) + { + currRec = updRec; + await EC_UpdateFrame.InvokeAsync(CurrFrame); + } + } + + #endregion Private Properties + } +} \ No newline at end of file diff --git a/WebWindowComplex/Compo/SashBottomRail.razor b/WebWindowComplex/Compo/SashBottomRail.razor new file mode 100644 index 0000000..de9ca4f --- /dev/null +++ b/WebWindowComplex/Compo/SashBottomRail.razor @@ -0,0 +1,20 @@ + + + \ No newline at end of file diff --git a/WebWindowComplex/Compo/SashBottomRail.razor.cs b/WebWindowComplex/Compo/SashBottomRail.razor.cs new file mode 100644 index 0000000..37a7306 --- /dev/null +++ b/WebWindowComplex/Compo/SashBottomRail.razor.cs @@ -0,0 +1,47 @@ +using Microsoft.AspNetCore.Components; +using WebWindowComplex.Models; + +namespace WebWindowComplex.Compo +{ + public partial class SashBottomRail + { + #region Public Properties + + /// + /// Sash corrente rispetto alla lista Sash + /// + [CascadingParameter(Name = "CurrSashGroup")] + public Sash SashGroup { get; set; } = null!; + + [Parameter] + public EventCallback EC_UpdateSash { get; set; } + + #endregion Public Properties + + #region Private Properties + + /// + /// Aggiornamento element + /// + /// + /// + private async Task UpdateElement(ElementDimension updRec) + { + // cerco il record + var currRec = SashGroup.BottomRailElemDimList.FirstOrDefault(x => x.ParentArea == updRec.ParentArea && x.nIndex == updRec.nIndex); + // lo aggiorno + if (updRec != null) + { + currRec = updRec; + DataUpdateProfile ans = new DataUpdateProfile + { + sash = SashGroup, + reqProfile = false + }; + await EC_UpdateSash.InvokeAsync(ans); + } + } + + #endregion Private Properties + } +} \ No newline at end of file diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 44858fd..7fb984e 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.8.1.2917 + 2.8.1.3010 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -148,6 +148,17 @@ + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index ec49acd..d49fee1 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.8.1.2917 + 2.8.1.3010 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -184,6 +184,23 @@ + + + + + + + + + + + + + + + + +