diff --git a/Test.UI/Components/Pages/EditJWD.razor b/Test.UI/Components/Pages/EditJWD.razor index 4b6c9cb..3fdf510 100644 --- a/Test.UI/Components/Pages/EditJWD.razor +++ b/Test.UI/Components/Pages/EditJWD.razor @@ -23,6 +23,8 @@ else if (!string.IsNullOrEmpty(outSave)) @outSave } -

- @currJwd -

+
+
+ @JsonSer +
+
diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index 1643672..18e7367 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -1,4 +1,5 @@ -using EgwCoreLib.Lux.Core; +using Egw.Window.Data; +using EgwCoreLib.Lux.Core; using EgwCoreLib.Lux.Core.RestPayload; using EgwCoreLib.Lux.Data.Services; using Microsoft.AspNetCore.Components; @@ -6,7 +7,6 @@ using Newtonsoft.Json; using NLog; using System.Diagnostics; using System.Security.AccessControl; -using Egw.Window.Data; using WebWindowComplex; using WebWindowComplex.DTO; diff --git a/WebWindowComplex/AreaSplit.razor b/WebWindowComplex/AreaSplit.razor index 0b6adf0..2d36571 100644 --- a/WebWindowComplex/AreaSplit.razor +++ b/WebWindowComplex/AreaSplit.razor @@ -13,7 +13,7 @@
- +
@for (int j = 0; j < CurrSashList.Count; j++) @@ -21,7 +21,7 @@ int Index = j;
- +
} diff --git a/WebWindowComplex/General.razor b/WebWindowComplex/General.razor index b8264d3..d041093 100644 --- a/WebWindowComplex/General.razor +++ b/WebWindowComplex/General.razor @@ -1,92 +1,87 @@  -
-
-
-
-
-
-
-
-
-
General
-
-
-
-
-
- - -
-
- - -
-
-
-
-
-
-
-
Fill type
-
-
-
- - -
-
- - -
-
-
-
-
-
Color
-
-
-
- - -
-
- - -
-
-
-
-
+
+
+
+
+
General
+
+
+ +
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+
Fill type
+
+
+
+ + +
+
+ + +
+
+
+
+
+
Color
+
+
+
+ + +
+
+ +
-
\ No newline at end of file +
diff --git a/WebWindowComplex/General.razor.cs b/WebWindowComplex/General.razor.cs index 4eb2303..d6ef2ff 100644 --- a/WebWindowComplex/General.razor.cs +++ b/WebWindowComplex/General.razor.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Components; +using Newtonsoft.Json.Linq; using WebWindowComplex.DTO; namespace WebWindowComplex @@ -22,6 +23,9 @@ namespace WebWindowComplex [Parameter] public EventCallback EC_SelWindMat { get; set; } + [Parameter] + public EventCallback EC_ReqClose { get; set; } + /// /// Elenco anagrafiche di base /// @@ -98,5 +102,10 @@ namespace WebWindowComplex private string currMaterial = ""; #endregion Private Fields + + private void ReqClose() + { + _ = EC_ReqClose.InvokeAsync(true); + } } } \ No newline at end of file diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 22b82f9..f47ea48 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -84,7 +84,7 @@
-
+
@if (string.IsNullOrEmpty(LiveData.CurrJwd)) { @if (currStep == CompileStep.Template && ListPayload.TemplateDTO != null) @@ -769,7 +769,8 @@
*@ - + + @* *@ } }
@@ -781,7 +782,7 @@ } else if (currStep == CompileStep.General) { - + }
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 4c9fc90..2d45657 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -427,6 +427,16 @@ namespace WebWindowComplex } } + /// + /// Calcola CSS warning + /// + /// + /// + protected string cssValid(string fKey) + { + return listWarnings.ContainsKey(fKey) ? "border border-danger" : ""; + } + /// /// Metodo per determinare la descrizione del parent dello split corrente /// @@ -662,74 +672,6 @@ namespace WebWindowComplex } } - /// - /// Verifica errori prelimionari per mostrare dove sia il problema - /// - private void checkErrorPre() - { - // verifico 1:1 le liste e indico cosa manca - if (ListPayload.Hardware == null || ListPayload.Hardware.Count == 0) - { - listErrPre.Add("Hardware", "Missing Hardware List!"); - } - else - { - if (ListPayload.FamilyHardware == null || ListPayload.FamilyHardware.Count == 0) - { - listErrPre.Add("FamilyHardware", "Missing Family HW List!"); - } - } - if (ListPayload.Glass == null || ListPayload.Glass.Count == 0) - { - listErrPre.Add("Glass", "Missing Glass List!"); - } - if (ListPayload.Material == null || ListPayload.Material.Count == 0) - { - listErrPre.Add("Material", "Missing Material List!"); - } - if (ListPayload.ColorMaterial == null || ListPayload.ColorMaterial.Count == 0) - { - listErrPre.Add("ColorMaterial", "Missing ColorMaterial List!"); - } - } - - /// - /// Verifica warning minori (es coerenza colori...) - /// - private void checkWarnings() - { - // verifico 1:1 le liste e i valori siano coerenti... - if (ListPayload.ColorMaterial != null && ListPayload.ColorMaterial.Count > 0) - { - // verifico colore attuale sia consistente... - if (m_CurrWindow != null) - { - if (!ListPayload.ColorMaterial.Contains(m_CurrWindow.sColorMaterial)) - { - listWarnings.Add("ColorMaterial", $"Missing Color: {m_CurrWindow.sColorMaterial}"); - } - if (!ListPayload.Glass.Contains(m_CurrWindow.sGlass)) - { - listWarnings.Add("Glass", $"Missing Glass: {m_CurrWindow.sGlass}"); - } - if (!ListPayload.Material.Contains(m_CurrWindow.sMaterial)) - { - listWarnings.Add("Material", $"Missing Material: {m_CurrWindow.sMaterial}"); - } - } - } - } - - /// - /// Calcola CSS warning - /// - /// - /// - protected string cssValid(string fKey) - { - return listWarnings.ContainsKey(fKey) ? "border border-danger" : ""; - } - protected void setCurrWindow(JsonWindow WindowFromJson) { if (m_CurrWindow != null) @@ -953,6 +895,64 @@ namespace WebWindowComplex await DoPreviewSvg(); } + /// + /// Verifica errori prelimionari per mostrare dove sia il problema + /// + private void checkErrorPre() + { + // verifico 1:1 le liste e indico cosa manca + if (ListPayload.Hardware == null || ListPayload.Hardware.Count == 0) + { + listErrPre.Add("Hardware", "Missing Hardware List!"); + } + else + { + if (ListPayload.FamilyHardware == null || ListPayload.FamilyHardware.Count == 0) + { + listErrPre.Add("FamilyHardware", "Missing Family HW List!"); + } + } + if (ListPayload.Glass == null || ListPayload.Glass.Count == 0) + { + listErrPre.Add("Glass", "Missing Glass List!"); + } + if (ListPayload.Material == null || ListPayload.Material.Count == 0) + { + listErrPre.Add("Material", "Missing Material List!"); + } + if (ListPayload.ColorMaterial == null || ListPayload.ColorMaterial.Count == 0) + { + listErrPre.Add("ColorMaterial", "Missing ColorMaterial List!"); + } + } + + /// + /// Verifica warning minori (es coerenza colori...) + /// + private void checkWarnings() + { + // verifico 1:1 le liste e i valori siano coerenti... + if (ListPayload.ColorMaterial != null && ListPayload.ColorMaterial.Count > 0) + { + // verifico colore attuale sia consistente... + if (m_CurrWindow != null) + { + if (!ListPayload.ColorMaterial.Contains(m_CurrWindow.sColorMaterial)) + { + listWarnings.Add("ColorMaterial", $"Missing Color: {m_CurrWindow.sColorMaterial}"); + } + if (!ListPayload.Glass.Contains(m_CurrWindow.sGlass)) + { + listWarnings.Add("Glass", $"Missing Glass: {m_CurrWindow.sGlass}"); + } + if (!ListPayload.Material.Contains(m_CurrWindow.sMaterial)) + { + listWarnings.Add("Material", $"Missing Material: {m_CurrWindow.sMaterial}"); + } + } + } + } + /// /// Metodo per copiare contenuto di un'anta in un'altra anta /// @@ -1156,6 +1156,39 @@ namespace WebWindowComplex currStep = CompileStep.Tree; } + /// + /// Ritorno step Tree + /// + /// + private void ReturnTree(bool args) + { + AdvStep(CompileStep.Tree); + } + + private void SelectColor(string newVal) + { + if (m_CurrWindow != null) + { + m_CurrWindow.sColorMaterial = newVal; + } + } + + private void SelectGlass(string newVal) + { + if (m_CurrWindow != null) + { + m_CurrWindow.sGlass = newVal; + } + } + + private void SelectMat(string newVal) + { + if (m_CurrWindow != null) + { + m_CurrWindow.sMaterial = newVal; + } + } + /// /// Metodo per scambiare due aree di uno split /// @@ -1199,26 +1232,5 @@ namespace WebWindowComplex } #endregion Private Methods - private void SelectColor(string newVal) - { - if (m_CurrWindow != null) - { - m_CurrWindow.sColorMaterial = newVal; - } - } - private void SelectMat(string newVal) - { - if (m_CurrWindow != null) - { - m_CurrWindow.sMaterial = newVal; - } - } - private void SelectGlass(string newVal) - { - if (m_CurrWindow != null) - { - m_CurrWindow.sGlass = newVal; - } - } } } \ No newline at end of file diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 04c8025..e8aec1a 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.1013 + 2.7.10.1016 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -24,6 +24,11 @@ + + + + + @@ -31,3 +36,18 @@ + + + + + + + + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 27945d8..df94faa 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.10.1015 + 2.7.10.1016 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -52,3 +52,23 @@ + + + + + + + + + + + + + + + + + + + +