From 809ff5a237ad741170d44156440f5dbea906e294 Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Thu, 13 Aug 2026 14:48:23 +0200 Subject: [PATCH] Aggiornamento --- Test.UI/Components/Pages/EditJWD.razor | 65 +---------- WebWindowComplex/Compo/AreaSash.razor | 32 +++--- WebWindowComplex/Compo/AreaSash.razor.cs | 2 +- WebWindowComplex/Compo/CardFill.razor | 4 +- WebWindowComplex/Compo/CardFill.razor.cs | 2 +- WebWindowComplex/Compo/CardFrame.razor | 10 +- WebWindowComplex/Compo/CardFrame.razor.cs | 2 +- WebWindowComplex/Compo/CardInglesina.razor | 12 +- WebWindowComplex/Compo/CardInglesina.razor.cs | 2 +- WebWindowComplex/Compo/CardSashGroup.razor | 10 +- WebWindowComplex/Compo/CardSashGroup.razor.cs | 2 +- WebWindowComplex/Compo/CardTree.razor.cs | 107 +----------------- WebWindowComplex/Compo/EditElement.razor | 2 +- WebWindowComplex/Compo/EditElement.razor.cs | 2 +- .../Compo/EditFrameDimensions.razor | 2 +- .../Compo/EditFrameDimensions.razor.cs | 2 +- WebWindowComplex/Compo/EditJoint.razor | 2 +- WebWindowComplex/Compo/EditJoint.razor.cs | 2 +- WebWindowComplex/Compo/EditOptionCombo.razor | 2 +- .../Compo/EditOptionCombo.razor.cs | 2 +- WebWindowComplex/Compo/EditOptionText.razor | 2 +- .../Compo/EditOptionText.razor.cs | 2 +- .../Compo/EditSplitDimensions.razor | 71 ++++++++---- .../Compo/EditSplitDimensions.razor.cs | 6 + WebWindowComplex/Compo/EditSplitElement.razor | 2 +- .../Compo/EditSplitElement.razor.cs | 2 +- WebWindowComplex/Compo/General.razor | 8 +- WebWindowComplex/Compo/General.razor.cs | 2 +- WebWindowComplex/Models/Area.cs | 2 +- WebWindowComplex/TableComp.razor | 2 +- WebWindowComplex/TableComp.razor.cs | 44 +++---- WebWindowComplex/WebWindowComplex.csproj | 24 +++- .../WebWindowConfigurator.csproj | 25 +++- 33 files changed, 183 insertions(+), 275 deletions(-) diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor index 1532049..efeac3b 100644 --- a/Test.UI/Components/Pages/EditJWD.razor +++ b/Test.UI/Components/Pages/EditJWD.razor @@ -4,75 +4,12 @@ EditJWD -@*
-
-
- FamilyHw - -
-
-
-
- Color - -
-
-
-
- Wood - -
-
-
-
- Glass - -
-
-
-
- Profile - -
-
-
-
-
- -
-
*@ - @if (doEdit) { Sash @(CurrSashGroup.SashList.Count == 1 ? "" : (IndexSash + 1))
- @if(!User && CurrSashGroup.SashList.Count > 1) + @if(!BaseUser && CurrSashGroup.SashList.Count > 1) {
- @if (!User && CurrAnta.AreaList[0].AreaList.Count == 0) + @if (!BaseUser && CurrAnta.AreaList[0].AreaList.Count == 0) {
@@ -193,7 +193,7 @@
- @if (User) + @if (BaseUser) {
- @if (User) + @if (BaseUser) { } @@ -29,7 +29,7 @@
- @if (User) + @if (BaseUser) { } diff --git a/WebWindowComplex/Compo/CardFill.razor.cs b/WebWindowComplex/Compo/CardFill.razor.cs index 473968e..a3d71ee 100644 --- a/WebWindowComplex/Compo/CardFill.razor.cs +++ b/WebWindowComplex/Compo/CardFill.razor.cs @@ -24,7 +24,7 @@ namespace WebWindowComplex.Compo /// Livello di accesso (utente base) /// [Parameter] - public bool User { get; set; } = false!; + public bool BaseUser { get; set; } = false!; /// /// Evento per cambiare tutti i fill diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor index 87ebf6a..d61f867 100644 --- a/WebWindowComplex/Compo/CardFrame.razor +++ b/WebWindowComplex/Compo/CardFrame.razor @@ -14,7 +14,7 @@
- @if (User) + @if (BaseUser) {
@@ -73,7 +73,7 @@
@Traduci("ConfWind_Threshold")
- @if (User) + @if (BaseUser) { @Traduci("ConfWind_Tipology") @@ -98,7 +98,7 @@
@Traduci("ConfWind_Quantity") - @if (User) + @if (BaseUser) { } @@ -121,7 +121,7 @@
@Traduci("ConfWind_Joints")
- @if (User) + @if (BaseUser) {
-@if (!User) +@if (!BaseUser) { @if (!(CurrFrameWindow.AreaList[0] is Split) || (SashGroupList.Count == 0 && SplitList.Count == 0)) { diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs index 1a49f52..3225223 100644 --- a/WebWindowComplex/Compo/CardFrame.razor.cs +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -66,7 +66,7 @@ namespace WebWindowComplex.Compo /// Livello di accesso (utente base) ///
[CascadingParameter(Name = "User")] - public bool User { get; set; } = false!; + public bool BaseUser { get; set; } = false!; /// /// Evento per richiesta traduzioni diff --git a/WebWindowComplex/Compo/CardInglesina.razor b/WebWindowComplex/Compo/CardInglesina.razor index b9c72ac..84ca2c1 100644 --- a/WebWindowComplex/Compo/CardInglesina.razor +++ b/WebWindowComplex/Compo/CardInglesina.razor @@ -30,7 +30,7 @@
Inglesina
- @if (!User) + @if (!BaseUser) {
@@ -42,7 +42,7 @@
- @if (User) + @if (BaseUser) { Shape @@ -61,7 +61,7 @@
- @if (User) + @if (BaseUser) { Side @@ -85,7 +85,7 @@
QtyVert - @if (User) + @if (BaseUser) { } @@ -101,7 +101,7 @@
QtyHoriz - @if (User) + @if (BaseUser) { } @@ -166,7 +166,7 @@
- @if (User) + @if (BaseUser) { } diff --git a/WebWindowComplex/Compo/CardInglesina.razor.cs b/WebWindowComplex/Compo/CardInglesina.razor.cs index 57070fd..9552fc7 100644 --- a/WebWindowComplex/Compo/CardInglesina.razor.cs +++ b/WebWindowComplex/Compo/CardInglesina.razor.cs @@ -37,7 +37,7 @@ namespace WebWindowComplex.Compo /// Livello di accesso (utente base) ///
[CascadingParameter(Name = "User")] - public bool User { get; set; } = false!; + public bool BaseUser { get; set; } = false!; /// /// Evento per richiedere reset dizionario diff --git a/WebWindowComplex/Compo/CardSashGroup.razor b/WebWindowComplex/Compo/CardSashGroup.razor index 36344e8..b55475a 100644 --- a/WebWindowComplex/Compo/CardSashGroup.razor +++ b/WebWindowComplex/Compo/CardSashGroup.razor @@ -7,7 +7,7 @@
Sash group @(SashGroupList.Count > 1 ? (SashGroupList.IndexOf(CurrSashGroup) + 1) : "")
- @if (!User) + @if (!BaseUser) {
@@ -26,7 +26,7 @@
Tipology
- @if (User) + @if (BaseUser) {
@foreach (var i in CurrSashGroup.OrientationSashTypeList) @@ -60,7 +60,7 @@
Qty sash - @if (User) + @if (BaseUser) { } @@ -73,7 +73,7 @@
Qty bottom rail - @if (User) + @if (BaseUser) { } @@ -96,7 +96,7 @@
Hardware
- @if (User) + @if (BaseUser) {
Family diff --git a/WebWindowComplex/Compo/CardSashGroup.razor.cs b/WebWindowComplex/Compo/CardSashGroup.razor.cs index 8395d8a..7a0fdd5 100644 --- a/WebWindowComplex/Compo/CardSashGroup.razor.cs +++ b/WebWindowComplex/Compo/CardSashGroup.razor.cs @@ -20,7 +20,7 @@ namespace WebWindowComplex.Compo /// Livello di accesso (utente base) ///
[CascadingParameter(Name = "User")] - public bool User { get; set; } = false!; + public bool BaseUser { get; set; } = false!; /// /// Evento per cambiare tutti i fill diff --git a/WebWindowComplex/Compo/CardTree.razor.cs b/WebWindowComplex/Compo/CardTree.razor.cs index 369c591..5ba7528 100644 --- a/WebWindowComplex/Compo/CardTree.razor.cs +++ b/WebWindowComplex/Compo/CardTree.razor.cs @@ -199,7 +199,7 @@ namespace WebWindowComplex.Compo if (item.AreaList.FirstOrDefault() is Fill) isOpenFill.Add(false); } - _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); + await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); var args = new DataUpdateFrame() { currFrame = FrameWindow, @@ -272,111 +272,6 @@ namespace WebWindowComplex.Compo return EC_UpdateSplitted.InvokeAsync(currSplitted); } - /// - /// Metodo per riempire tabella con contenuto vuoto o con i simboli per rappresentare la struttura - /// - /// riga della cella - /// colonna della cella - /// - private string FillTable(int row, int col) - { - List itemSameCol = new List(); - for (int k = 0; k < row; k++) - { - if (ItemTableList[k].Col == col + 1) - { - itemSameCol.Add(ItemTableList[k]); - } - continue; - } - int numItemNextCol = 0; - for (int k = 0; k < row; k++) - { - if (ItemTableList[k].Row <= row && ItemTableList[k].Col == col + 2) - { - numItemNextCol++; - } - continue; - } - if (itemSameCol.Count > 1) - { - for (int i = 0; i <= itemSameCol.Count - 2; i++) - { - if (itemSameCol[i].NumChild > 0) - numItemNextCol = numItemNextCol - itemSameCol[i].NumChild; - } - } - if (itemSameCol.Count > 0) - { - // Sono alla riga successiva di un elemento e nella stessa colonna - if (itemSameCol.Last().Row == row) - { - // se ha un solo figlio - if (itemSameCol.Last().NumChild == 1) - { - return "└"; - } - else if (itemSameCol.Last().NumChild == 0) - { - return " "; - } - else - { - return "├"; - } - } - // Non sono alla riga successiva - else - { - // se ha un solo figlio - if (itemSameCol.Last().NumChild == 1) - { - return " "; - } - else if (col + 2 <= maxCol && ItemTableList[row].Col == col + 2) - { - if (numItemNextCol < itemSameCol.Last().NumChild && numItemNextCol != (itemSameCol.Last().NumChild - 1)) - { - return "├"; - } - return "└"; - } - else if (numItemNextCol < itemSameCol.Last().NumChild) - { - return "│"; - } - else - { - return " "; - } - } - } - else - { - return " "; - } - } - - private bool HideRow(int row, int col) - { - List itemSameCol = new List(); - for (int k = 0; k < row; k++) - { - if (ItemTableList[k].Col == col + 1) - { - itemSameCol.Add(ItemTableList[k]); - } - continue; - } - if(itemSameCol.Count > 0) - { - ItemTable? firstItem = itemSameCol.FirstOrDefault(); - if (firstItem != null) - return RowCollapsedDict.GetValueOrDefault(firstItem.Row - 1); - } - return false; - } - private bool isOpenFrame = false; private void ToggleDropdownFrame() diff --git a/WebWindowComplex/Compo/EditElement.razor b/WebWindowComplex/Compo/EditElement.razor index 6d2fba2..14d8dcc 100644 --- a/WebWindowComplex/Compo/EditElement.razor +++ b/WebWindowComplex/Compo/EditElement.razor @@ -4,7 +4,7 @@ - @if (User) + @if (BaseUser) { } diff --git a/WebWindowComplex/Compo/EditElement.razor.cs b/WebWindowComplex/Compo/EditElement.razor.cs index 7a49e84..e615080 100644 --- a/WebWindowComplex/Compo/EditElement.razor.cs +++ b/WebWindowComplex/Compo/EditElement.razor.cs @@ -24,7 +24,7 @@ namespace WebWindowComplex.Compo /// Livello di accesso (utente base) /// [CascadingParameter(Name = "User")] - public bool User { get; set; } = false!; + public bool BaseUser { get; set; } = false!; #endregion Public Properties diff --git a/WebWindowComplex/Compo/EditFrameDimensions.razor b/WebWindowComplex/Compo/EditFrameDimensions.razor index 4e276bf..1ffa933 100644 --- a/WebWindowComplex/Compo/EditFrameDimensions.razor +++ b/WebWindowComplex/Compo/EditFrameDimensions.razor @@ -17,7 +17,7 @@ { @CurrRec.sName } - @if (User) + @if (BaseUser) { } diff --git a/WebWindowComplex/Compo/EditFrameDimensions.razor.cs b/WebWindowComplex/Compo/EditFrameDimensions.razor.cs index 1c24d5f..ce27d50 100644 --- a/WebWindowComplex/Compo/EditFrameDimensions.razor.cs +++ b/WebWindowComplex/Compo/EditFrameDimensions.razor.cs @@ -20,7 +20,7 @@ namespace WebWindowComplex.Compo /// Livello di accesso (utente base) /// [CascadingParameter(Name = "User")] - public bool User { get; set; } = false!; + public bool BaseUser { get; set; } = false!; #endregion Public Properties diff --git a/WebWindowComplex/Compo/EditJoint.razor b/WebWindowComplex/Compo/EditJoint.razor index 536b8e9..15da100 100644 --- a/WebWindowComplex/Compo/EditJoint.razor +++ b/WebWindowComplex/Compo/EditJoint.razor @@ -3,7 +3,7 @@ - @if (User) + @if (BaseUser) {