diff --git a/WebWindowComplex/Compo/AreaHwOption.razor b/WebWindowComplex/Compo/AreaHwOption.razor
index bc2188d..18130ab 100644
--- a/WebWindowComplex/Compo/AreaHwOption.razor
+++ b/WebWindowComplex/Compo/AreaHwOption.razor
@@ -9,9 +9,6 @@
- @if (!hwOptCollapsed)
- {
- @* @if (IsLoadingHwOpt && CurrSash.HwOptionList.Count == 0) *@
@if (IsLoadingHwOpt)
{
@@ -37,5 +34,7 @@
}
}
- }
+ @* @if (!hwOptCollapsed)
+ {
+ } *@
\ No newline at end of file
diff --git a/WebWindowComplex/Compo/AreaHwOption.razor.cs b/WebWindowComplex/Compo/AreaHwOption.razor.cs
index c303fc4..3fa1a38 100644
--- a/WebWindowComplex/Compo/AreaHwOption.razor.cs
+++ b/WebWindowComplex/Compo/AreaHwOption.razor.cs
@@ -32,22 +32,22 @@ namespace WebWindowComplex.Compo
[Parameter]
public EventCallback EC_FirstHwOptionList { get; set; }
- [Parameter]
- public bool IsLoadingHwOpt { get; set; } = false;
+ [CascadingParameter(Name = "IsLoading")]
+ public List IsLoading { get; set; }
- private bool hwOptCollapsed { get; set; } = true;
+ private bool hwOptCollapsed { get; set; } = false;
- protected override void OnAfterRender(bool firstRender)
- {
- if(firstRender)
- {
- hwOptCollapsed = true;
- }
- }
+ //protected override void OnAfterRender(bool firstRender)
+ //{
+ // if(firstRender)
+ // {
+ // hwOptCollapsed = true;
+ // }
+ //}
private async Task changeCollapsed()
{
- hwOptCollapsed = !hwOptCollapsed;
+ //hwOptCollapsed = !hwOptCollapsed;
if (CurrSash.HwOptionList.Count == 0)
{
//IsLoadingHwOpt = true;
@@ -79,6 +79,9 @@ namespace WebWindowComplex.Compo
{
await EC_UpdateHwOptText.InvokeAsync(updRec);
}
-
+ private bool IsLoadingHwOpt
+ {
+ get => IsLoading != null && IsLoading.Count > 0 && IsLoading.Contains("LoadHwOpt");
+ }
}
}
\ No newline at end of file
diff --git a/WebWindowComplex/Compo/CardSashGroup.razor b/WebWindowComplex/Compo/CardSashGroup.razor
index 6853f7d..5077b35 100644
--- a/WebWindowComplex/Compo/CardSashGroup.razor
+++ b/WebWindowComplex/Compo/CardSashGroup.razor
@@ -92,7 +92,6 @@
diff --git a/WebWindowComplex/Compo/CardSashGroup.razor.cs b/WebWindowComplex/Compo/CardSashGroup.razor.cs
index 9df8d18..534b447 100644
--- a/WebWindowComplex/Compo/CardSashGroup.razor.cs
+++ b/WebWindowComplex/Compo/CardSashGroup.razor.cs
@@ -80,9 +80,6 @@ namespace WebWindowComplex.Compo
[Parameter]
public List SashList { get; set; } = null!;
- [Parameter]
- public bool isLoadingHwOpt { get; set; } = false;
-
#endregion Public Properties
#region Protected Properties
diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor
index 7916012..6158c55 100644
--- a/WebWindowComplex/TableComp.razor
+++ b/WebWindowComplex/TableComp.razor
@@ -118,10 +118,10 @@
}
else
{
-
+
-
+
+
}
}
else if (currStep == CompileStep.Fill)
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 910c244..3d982a4 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -164,6 +164,7 @@ namespace WebWindowComplex
get => m_SashList;
}
+ protected List currLoading = new List();
protected string SelColorMaterial { get; set; } = "";
protected string SelFamilyHardware { get; set; } = "";
protected string SelGlass { get; set; } = "";
@@ -502,7 +503,7 @@ namespace WebWindowComplex
{
if (m_CurrWindow != null)
{
- isLoadingHwOpt = true;
+ currLoading.Add("LoadHwOpt");
#if DEBUG
var CurrJwd = JsonConvert.SerializeObject(m_CurrWindow.Serialize(), Formatting.Indented);
#else
@@ -717,7 +718,6 @@ namespace WebWindowComplex
}
if (SashList.Count > 0)
currAnta = 0;
- isLoadingHwOpt = false;
#if false
_ = InvokeAsync(StateHasChanged);
#endif
@@ -744,6 +744,7 @@ namespace WebWindowComplex
// se ho le opzioni hw le aggiungo
if (LiveData.DictOptionsXml.Count > 0)
{
+ currLoading.Remove("LoadHwOpt");
foreach (var item in SashList)
{
if (LiveData.DictOptionsXml.ContainsKey(item.GroupId))
@@ -806,8 +807,6 @@ namespace WebWindowComplex
private bool isRendered = false;
- private bool isLoadingHwOpt = false;
-
///
/// ELenco errori di coerenza/link dati (vanno risolti per disegnare/procedere)
///
@@ -1088,7 +1087,8 @@ namespace WebWindowComplex
private void M_CurrWindow_OnHwOption(object? sender, OnReqHwOptEventArgs e)
{
- isLoadingHwOpt = true;
+ currLoading.Add("LoadHwOpt");
+ _ = InvokeAsync(StateHasChanged);
Dictionary Args = new Dictionary();
Args.Add("Mode", $"{(int)Enums.QuestionModes.HARDWARE}");
Args.Add("SubMode", $"{(int)Enums.QuestionHwSubModes.HARDWAREOPTIONS}");
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index 7aa8eeb..2bfee79 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.7.11.1016
+ 2.7.11.1109
Annamaria Sassi
Egalware
Componente gestione Configurazioni avanzate Window per LUX
@@ -39,6 +39,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 262c9a6..646b079 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.7.11.1016
+ 2.7.11.1109
Annamaria Sassi
Egalware
Componente gestione JWD per LUX
@@ -60,6 +60,17 @@
+
+
+
+
+
+
+
+
+
+
+