diff --git a/Test.UI/Components/Pages/BaseEdit.razor b/Test.UI/Components/Pages/BaseEdit.razor index ab48ae9..863f402 100644 --- a/Test.UI/Components/Pages/BaseEdit.razor +++ b/Test.UI/Components/Pages/BaseEdit.razor @@ -5,7 +5,7 @@ diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor index faabf65..1532049 100644 --- a/Test.UI/Components/Pages/EditJWD.razor +++ b/Test.UI/Components/Pages/EditJWD.razor @@ -72,7 +72,7 @@ diff --git a/WebWindowComplex/Compo/AreaFrame.razor.cs b/WebWindowComplex/Compo/AreaFrame.razor.cs index 258b4da..f5719c8 100644 --- a/WebWindowComplex/Compo/AreaFrame.razor.cs +++ b/WebWindowComplex/Compo/AreaFrame.razor.cs @@ -71,6 +71,11 @@ namespace WebWindowComplex.Compo return EC_AddInglesina.InvokeAsync(true); } + /// + /// Metodo per traduzione in lingua corrente + /// + /// + /// private string Traduci(string lemma) { string ans = lemma; diff --git a/WebWindowComplex/Compo/AreaSash.razor b/WebWindowComplex/Compo/AreaSash.razor index 0e2a80d..43b6495 100644 --- a/WebWindowComplex/Compo/AreaSash.razor +++ b/WebWindowComplex/Compo/AreaSash.razor @@ -46,8 +46,13 @@
@if (User) { - Tipology - + } else { @@ -85,40 +90,73 @@
Dimension - - @* *@ - + @switch (CurrSashDim.SelMeasureType.ToString()) { - } - + } + else + { + + + }
-
- -
+ @if (User) + { +
+ +
+ } + else + { +
+ +
+ }
@@ -157,8 +195,13 @@
@if (User) { - Tipology - + } else { @@ -194,40 +237,73 @@
Dimension - - @* *@ - + @switch (CurrSashDim.SelMeasureType.ToString()) { - } - + } + else + { + + + }
-
- -
+ @if(User) + { +
+ +
+ } + else + { +
+ +
+ }
@@ -240,7 +316,21 @@
Joints
- @if (!User) + @if (User) + { +
+ + + +
+ } + else {
+
+ } +
} else @@ -109,7 +121,21 @@
@Traduci("ConfWind_Joints")
- @if (!User) + @if (User) + { +
+ + + +
+ } + else {
+
+ }
} else { -
-
Tipology
-
@foreach (var i in CurrSashGroup.OrientationSashTypeList) { - @*
- -
*@
- @if (!User) + @if (!BaseUser) { @if ((CurrSplit.nSplitQtyVert == 1 && CurrSplit.nSplitQtyHoriz == 0) || (CurrSplit.nSplitQtyVert == 0 && CurrSplit.nSplitQtyHoriz == 1)) { @@ -16,7 +16,7 @@ }
- @if (!User) + @if (!BaseUser) { } @@ -43,30 +43,36 @@
- @if (User) +
+
Shape
+
+ @if (BaseUser) {
- Shape - + @foreach (var i in CurrSplit.SplitShapeList) + { +
+ +
+ } +
+ @if (CurrSplit.SelSplitShape == Json.WindowConst.SplitShapes.GRID) + { +
+ + +
+ } +
} else { -
-
Shape
-
@foreach (var i in CurrSplit.SplitShapeList) { - @*
- -
*@
@@ -104,7 +102,7 @@
QtyHoriz - @if (User) + @if (BaseUser) { } @@ -148,7 +146,7 @@
QtyVert - @if (User) + @if (BaseUser) { } diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs index 9841cb2..db2caea 100644 --- a/WebWindowComplex/Compo/CardSplit.razor.cs +++ b/WebWindowComplex/Compo/CardSplit.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/CardTree.razor b/WebWindowComplex/Compo/CardTree.razor index e0c1fad..316490e 100644 --- a/WebWindowComplex/Compo/CardTree.razor +++ b/WebWindowComplex/Compo/CardTree.razor @@ -57,7 +57,6 @@ s = s + cs.ToString() + ((ind + 1) > 0 ? (ind + 1) : ""); } - @*
*@
} - @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.SASH || - ItemTableList[i].Type is Json.WindowConst.AreaTypes.SPLIT || - ItemTableList[i].Type is Json.WindowConst.AreaTypes.INGLESINA) + @if(!BaseUser) { - - } - @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME && - ((SashGroupList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split))) - { -
- -
    - @if(SashGroupList.Count == 0 && SplitList.Count == 0) - { -
    • - } - @if (!(FrameWindow.AreaList.First() is Split)) - { -
    • - } -
-
- } - @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL) - { - int currIndexFill = ItemTableList[i].IndexItem; - if (FillList.ElementAt(currIndexFill).ParentArea is Frame) + } + @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FRAME && + ((SashGroupList.Count == 0 && SplitList.Count == 0) || !(FrameWindow.AreaList.First() is Split))) {
- -
    -
    • +
      + @if (SashGroupList.Count == 0 && SplitList.Count == 0) + { +
      • + } + @if (!(FrameWindow.AreaList.First() is Split)) + { +
      • + }
} - else if (SplittedList != null && SplittedList.Count > 0) + @if (ItemTableList[i].Type is Json.WindowConst.AreaTypes.FILL) { - Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault(); - @if (currSplitted != null) + int currIndexFill = ItemTableList[i].IndexItem; + if (FillList.ElementAt(currIndexFill).ParentArea is Frame) { - @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null - && currSplitted.AreaList.FirstOrDefault() != null && currSplitted.AreaList.First()!.AreaList.Count == 0) +
+ +
    +
    • +
+
+ } + else if (SplittedList != null && SplittedList.Count > 0) + { + Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currIndexFill])).FirstOrDefault(); + @if (currSplitted != null) { -
- -
    -
    • -
    • - @for (int k = 0; k < SashGroupList.Count; k++) - { - int Index = k; -
    • - } -
-
+ @if (currSplitted.ParentArea != null && currSplitted.ParentWindow != null + && currSplitted.AreaList.FirstOrDefault() != null && currSplitted.AreaList.First()!.AreaList.Count == 0) + { +
+ +
    +
    • +
    • + @for (int k = 0; k < SashGroupList.Count; k++) + { + int Index = k; +
    • + } +
+
+ } } } } }
- @*
- -
*@ - @*
*@ } else { - @* @FillTable(i, j) *@ } } diff --git a/WebWindowComplex/Compo/CardTree.razor.cs b/WebWindowComplex/Compo/CardTree.razor.cs index d5e0392..369c591 100644 --- a/WebWindowComplex/Compo/CardTree.razor.cs +++ b/WebWindowComplex/Compo/CardTree.razor.cs @@ -60,6 +60,12 @@ namespace WebWindowComplex.Compo [Parameter] public Frame FrameWindow { get; set; } = null!; + /// + /// Utente + /// + [Parameter] + public bool BaseUser { get; set; } = false; + /// /// Evento richiesta prossimo step /// diff --git a/WebWindowComplex/Compo/EditFrameDimensions.razor b/WebWindowComplex/Compo/EditFrameDimensions.razor index b3c1d42..4e276bf 100644 --- a/WebWindowComplex/Compo/EditFrameDimensions.razor +++ b/WebWindowComplex/Compo/EditFrameDimensions.razor @@ -16,8 +16,15 @@ else { @CurrRec.sName - } - + } + @if (User) + { + + } + else + { + + } mm
diff --git a/WebWindowComplex/Compo/EditFrameDimensions.razor.cs b/WebWindowComplex/Compo/EditFrameDimensions.razor.cs index dcc4728..1c24d5f 100644 --- a/WebWindowComplex/Compo/EditFrameDimensions.razor.cs +++ b/WebWindowComplex/Compo/EditFrameDimensions.razor.cs @@ -16,6 +16,12 @@ namespace WebWindowComplex.Compo [Parameter] public EventCallback EC_Update { get; set; } + /// + /// Livello di accesso (utente base) + /// + [CascadingParameter(Name = "User")] + public bool User { get; set; } = false!; + #endregion Public Properties #region Protected Methods diff --git a/WebWindowComplex/Compo/EditJoint.razor b/WebWindowComplex/Compo/EditJoint.razor index 5a90024..536b8e9 100644 --- a/WebWindowComplex/Compo/EditJoint.razor +++ b/WebWindowComplex/Compo/EditJoint.razor @@ -1,44 +1,33 @@ @using static WebWindowComplex.LayoutConst
+ @if (User) { - @(CurrPosJointName) - + } else { - @if (CurrRec.ParentArea is Frame && (CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.DOUBLEARC || CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.ARC_FULL || CurrRec.ParentArea.ParentWindow.AreaList.First().SelShapeIndex == (int)Json.WindowConst.Shapes.THREECENTERARC) && (CurrRec.nIndex == 3 || CurrRec.nIndex == 4)) { -
- -
    -
    - -
    -
-
+ } else { diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 0b23485..de251b5 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -3,17 +3,17 @@
@if (isLoading) { - + } else if (!okParams) {
- +
-
Parametri Mancanti!
+
@Traduci("ConfWind_MissingParam")
@@ -23,10 +23,10 @@
- +
-
JWD Mancante!
+
@Traduci("ConfWind_MissingJWD")
@@ -38,7 +38,7 @@ {
-
Errori validazione!
+
@Traduci("ConfWind_ValidError")
    @@ -55,7 +55,7 @@ {
    -
    Errore configurazione:
    +
    @Traduci("ConfWind_ConfigError")
      @foreach (var item in listErrLink) @@ -76,10 +76,10 @@
      • - +
      • - +
        • @* @if (FrameWindow.Shape == Json.WindowConst.Shapes.ARC || FrameWindow.Shape == Json.WindowConst.Shapes.ARC_FULL || @@ -93,9 +93,9 @@
      - - - + + +
    @@ -113,6 +113,7 @@ SplittedList="SplittedList" FillList="FillList" FrameWindow="FrameWindow" + BaseUser="BaseUser" EC_NextStep="NextStepArgs" EC_Remove="RemoveArea" EC_Collapsed="CollapsedRowTree" @@ -129,7 +130,7 @@ { m_PreviousWindow = m_CurrWindow; } - + @@ -155,7 +156,7 @@ } else { - + + @@ -207,7 +208,7 @@ } else { - + @@ -239,32 +240,32 @@
    -
    All fill
    +
    @Traduci("ConfWind_AllFill")
    - @if (baseUser) + @if (BaseUser) { - + } else { - + }
    - @if (baseUser) + @if (BaseUser) { - + } else { - + }
    - @if (!baseUser && SplittedList != null && SplittedList.Count > 0) + @if (!BaseUser && SplittedList != null && SplittedList.Count > 0) { Splitted? currSplitted = SplittedList.Where(x => x.AreaList.First().Equals(FillList[currFillIndex])).FirstOrDefault(); @if (currSplitted != null) @@ -287,7 +288,7 @@ ListPayload="ListPayload" ListWarnings="listWarnings" DictPendReq="PendReq" - User="baseUser" + User="BaseUser" EC_UpdateGeneral="UpdatePreviewGeneral" EC_ReqClose="ReturnTree"> @@ -304,7 +305,7 @@
    @if (string.IsNullOrWhiteSpace(LiveData.SvgPreview)) { - + } else { diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 2458a3d..263d0db 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -56,7 +56,7 @@ namespace WebWindowComplex /// Livello di accesso (utente base) /// [Parameter] - public bool baseUser { get; set; } = false!; + public bool BaseUser { get; set; } = false!; /// /// Classe override css x SVG (x rescale) @@ -241,8 +241,8 @@ namespace WebWindowComplex if (m_CurrWindow != null && m_CurrWindow.AreaList != null && m_CurrWindow.AreaList.Count > 0) { checkWarnings(); - if (SashGroupList.Count > 0) - currAntaIndex = 0; + //if (SashGroupList.Count > 0) + // currAntaIndex = 0; if (updRequested) { // se mancasse dizionario forme chiamo quello @@ -314,7 +314,7 @@ namespace WebWindowComplex private static Logger Log = LogManager.GetCurrentClassLogger(); - private int currAntaIndex = 0; + //private int currAntaIndex = 0; private int currFillIndex = -1; @@ -1404,8 +1404,8 @@ namespace WebWindowComplex prevHardware[i] = SashGroupList.ElementAt(i).SelHardware; } } - if (SashGroupList.Count > 0) - currAntaIndex = 0; + //if (SashGroupList.Count > 0) + // currAntaIndex = 0; // Aggiorno window con dati shape e hw option UpdateDict(); } @@ -2290,6 +2290,21 @@ namespace WebWindowComplex } } + /// + /// Metodo per traduzione in lingua corrente + /// + /// + /// + private string Traduci(string lemma) + { + string ans = lemma; + if (Vocabulary != null && Vocabulary.ContainsKey(lemma)) + { + ans = Vocabulary.GetValueOrDefault(lemma) ?? ""; + } + return ans; + } + #endregion Private Methods } } \ No newline at end of file diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index f990ee7..1d3fc59 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.8.1217 + 3.1.8.1311 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -150,6 +150,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index db6574d..3c08a2e 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.8.1217 + 3.1.8.1311 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -461,6 +461,30 @@ + + + + + + + + + + + + + + + + + + + + + + + +