diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index 10bbe9d..0bae3ae 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -263,7 +263,7 @@ namespace Test.UI.Components.Pages CurrData.CurrJwd = currJwd; } // se il SSE variato --> invio - if (!currJwd.Equals(prevJwd) || !EgwCoreLib.Lux.Core.DictUtils.DictAreEqual(m_CurrArgs, CurrArgs)) + if (!currJwd.Equals(prevJwd) || !EgwCoreLib.Utils.DictUtils.DictAreEqual(m_CurrArgs, CurrArgs)) { m_CurrArgs = CurrArgs; prevJwd = currJwd; diff --git a/Test.UI/Test.UI.csproj b/Test.UI/Test.UI.csproj index f4e6014..bd45e8e 100644 --- a/Test.UI/Test.UI.csproj +++ b/Test.UI/Test.UI.csproj @@ -34,10 +34,10 @@ - - - - + + + + diff --git a/WebWindowComplex/Compo/AreaHwOption.razor b/WebWindowComplex/Compo/AreaHwOption.razor index c8ac6e7..bc2188d 100644 --- a/WebWindowComplex/Compo/AreaHwOption.razor +++ b/WebWindowComplex/Compo/AreaHwOption.razor @@ -5,36 +5,37 @@
Hardware option
- +
- @if (isLoadingHwOpt && CurrSash.HwOptionList.Count == 0) - { - - } @if (!hwOptCollapsed) { + @* @if (IsLoadingHwOpt && CurrSash.HwOptionList.Count == 0) *@ + @if (IsLoadingHwOpt) + { + + }
- @foreach (var currOpt in CurrSash.HwOptionList) + @foreach (var currOpt in CurrSash.HwOptionList) + { + switch (currOpt.Type) { - switch (currOpt.Type) - { - case HwOptionTypes.COMBO: - { - AGBOptionCombo currOptCombo = (AGBOptionCombo)currOpt; - - break; - } - case HwOptionTypes.TEXT: - { - AGBOptionText currOptText = (AGBOptionText)currOpt; - - break; - } - } + case HwOptionTypes.COMBO: + { + AGBOptionCombo currOptCombo = (AGBOptionCombo)currOpt; + + break; + } + case HwOptionTypes.TEXT: + { + AGBOptionText currOptText = (AGBOptionText)currOpt; + + break; + } } + }
}
\ No newline at end of file diff --git a/WebWindowComplex/Compo/AreaHwOption.razor.cs b/WebWindowComplex/Compo/AreaHwOption.razor.cs index cf626ef..c303fc4 100644 --- a/WebWindowComplex/Compo/AreaHwOption.razor.cs +++ b/WebWindowComplex/Compo/AreaHwOption.razor.cs @@ -33,20 +33,33 @@ namespace WebWindowComplex.Compo public EventCallback EC_FirstHwOptionList { get; set; } [Parameter] - public bool isLoadingHwOpt { get; set; } = false; + public bool IsLoadingHwOpt { get; set; } = false; private bool hwOptCollapsed { get; set; } = true; + protected override void OnAfterRender(bool firstRender) + { + if(firstRender) + { + hwOptCollapsed = true; + } + } + private async Task changeCollapsed() { hwOptCollapsed = !hwOptCollapsed; - if(CurrSash.HwOptionList.Count == 0) + if (CurrSash.HwOptionList.Count == 0) { - //isLoadingHwOpt = true; + //IsLoadingHwOpt = true; await EC_FirstHwOptionList.InvokeAsync(CurrSash.GroupId); } } + private string hwIcon + { + get => hwOptCollapsed ? "↓" : "↑"; + } + /// /// Report aggiornamento Option Combo /// diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 13611d1..3bd936f 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -110,7 +110,7 @@ namespace WebWindowComplex.Models } set { - if (value >= 0 && value <= 3) + if (value > 0 && value <= 3) { if (value > m_SashList.Count) { diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 66a8a1e..910c244 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -190,7 +190,7 @@ namespace WebWindowComplex Sash currSash = Args.currItem; // Cerco la Sash che si sta considerando nella lista Sash var s = SashList.Where(x => x.GroupId == currSash.GroupId).FirstOrDefault(); - if(s != null) + if (s != null) { // Setto la presenza o meno della maniglia per ogni anta foreach (SashDimension item in s.SashList) @@ -543,7 +543,7 @@ namespace WebWindowComplex //if (!prevLiveData.CurrJwd.Equals(CurrJwd)) { prevJwd = CurrJwd; - prevReq= (int)DataReq.ReqShape; + prevReq = (int)DataReq.ReqShape; Dictionary Args = new Dictionary(); Args.Add("Mode", $"{(int)Enums.QuestionModes.HARDWARE}"); Args.Add("SubMode", $"{(int)Enums.QuestionHwSubModes.SASHSHAPE}"); @@ -718,6 +718,9 @@ namespace WebWindowComplex if (SashList.Count > 0) currAnta = 0; isLoadingHwOpt = false; +#if false + _ = InvokeAsync(StateHasChanged); +#endif // Aggiorno window con dati shape e hw option UpdateDict(); } @@ -1276,10 +1279,10 @@ namespace WebWindowComplex { currArea.SwapAree(); await DoPreviewSvg(true, true); - if(currArea is Split) + if (currArea is Split) { List reqShape = new List(); - if(currArea.AreaList[0].AreaList.Where(x => x.AreaType == AreaTypes.SASH).ToList().Count() > 0) + if (currArea.AreaList[0].AreaList.Where(x => x.AreaType == AreaTypes.SASH).ToList().Count() > 0) reqShape.Add(currArea.AreaList[0].AreaList.Where(x => x.AreaType == AreaTypes.SASH).Select(x => x.GroupId).FirstOrDefault()); if (currArea.AreaList[1].AreaList.Where(x => x.AreaType == AreaTypes.SASH).ToList().Count() > 0) reqShape.Add(currArea.AreaList[1].AreaList.Where(x => x.AreaType == AreaTypes.SASH).Select(x => x.GroupId).FirstOrDefault()); diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 331d6ca..ae1d671 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.11.716 + 2.7.11.717 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -19,8 +19,8 @@ - - + + @@ -32,3 +32,12 @@ + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 9eafa28..0c5b2ff 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.11.716 + 2.7.11.717 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -27,8 +27,8 @@ - - + + @@ -39,3 +39,12 @@ + + + + + + + + + diff --git a/WebWindowTest/WebWindowTest.csproj b/WebWindowTest/WebWindowTest.csproj index e549dc0..3493714 100644 --- a/WebWindowTest/WebWindowTest.csproj +++ b/WebWindowTest/WebWindowTest.csproj @@ -13,8 +13,8 @@ - - + +