diff --git a/Test.UI/Program.cs b/Test.UI/Program.cs index 50b6016..aa5e725 100644 --- a/Test.UI/Program.cs +++ b/Test.UI/Program.cs @@ -1,12 +1,10 @@ using EgwCoreLib.Lux.Data; using EgwCoreLib.Lux.Data.Services; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; using NLog; using NLog.Web; using StackExchange.Redis; using System.Reflection; -using Test.UI.Client.Pages; using Test.UI.Components; var builder = WebApplication.CreateBuilder(args); diff --git a/WebWindowComplex/Compo/CardFrame.razor b/WebWindowComplex/Compo/CardFrame.razor index 949407b..f4f94ee 100644 --- a/WebWindowComplex/Compo/CardFrame.razor +++ b/WebWindowComplex/Compo/CardFrame.razor @@ -31,6 +31,9 @@ } +
+ +

diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs index 451ca38..7af249d 100644 --- a/WebWindowComplex/Compo/CardFrame.razor.cs +++ b/WebWindowComplex/Compo/CardFrame.razor.cs @@ -66,6 +66,8 @@ namespace WebWindowComplex.Compo #region Protected Properties + private string GetImagePath(string fileName) => $"/Icone/Shape/{fileName}.png"; + /// /// Metodo per selezionare shape /// @@ -188,11 +190,13 @@ namespace WebWindowComplex.Compo private async Task AddSash() { CurrFrameWindow.AddFirstSash(); - _ = EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); + await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDimElem }); + await EC_ReqResetDict.InvokeAsync(new DataUpdateRes { req = LayoutConst.DataAction.ResetDictShape }); var args = new DataUpdateFrame() { currFrame = CurrFrameWindow, - svgNoHw = true + svgNoHw = true, + reqShape = true }; await EC_ReqElement.InvokeAsync(CurrFrameWindow); await EC_UpdateFrame.InvokeAsync(args); diff --git a/WebWindowComplex/Compo/CardSashGroup.razor.cs b/WebWindowComplex/Compo/CardSashGroup.razor.cs index 3b4db61..c8ae59a 100644 --- a/WebWindowComplex/Compo/CardSashGroup.razor.cs +++ b/WebWindowComplex/Compo/CardSashGroup.razor.cs @@ -101,7 +101,7 @@ namespace WebWindowComplex.Compo #region Private Fields - private bool editMode = false; + //private bool editMode = false; private List currSashDimEdit = new List(); #endregion Private Fields diff --git a/WebWindowComplex/Compo/General.razor b/WebWindowComplex/Compo/General.razor index 6533afc..7edc1f2 100644 --- a/WebWindowComplex/Compo/General.razor +++ b/WebWindowComplex/Compo/General.razor @@ -12,6 +12,9 @@
+
+ +
@if (User) diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 8e11d34..288af5b 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -1358,6 +1358,7 @@ namespace WebWindowComplex } for (int i = 0; i < SashGroupList.Count; i++) { + // Anta non ha famiglia hw, ma รจ stato salvato il valore precedente if ((string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware)) && prevHardware != null && prevHardware.Count > 0) { @@ -1370,6 +1371,7 @@ namespace WebWindowComplex SashGroupList.ElementAt(i).SetSelFamilyHardwareFromIndex(prevHardware.ElementAt(i).Id); } } + // salvo il valore di hw nel precedente else if (prevHardware != null && (!string.IsNullOrEmpty(SashGroupList.ElementAt(i).SelFamilyHardware) || SashGroupList.ElementAt(i).SelHardware != null || SashGroupList.ElementAt(i).SelHardware.Id != "000000")) { diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 113b809..f9c58bf 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.5.1116 + 3.1.8.413 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -211,5 +211,6 @@ + diff --git a/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.png b/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.png new file mode 100644 index 0000000..e299569 Binary files /dev/null and b/WebWindowComplex/wwwroot/icone/shape/Double Chamfer.png differ diff --git a/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.png b/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.png new file mode 100644 index 0000000..ab547d7 Binary files /dev/null and b/WebWindowComplex/wwwroot/icone/shape/Left Chamfer.png differ diff --git a/WebWindowComplex/wwwroot/icone/shape/Rectangle.png b/WebWindowComplex/wwwroot/icone/shape/Rectangle.png new file mode 100644 index 0000000..18ce29d Binary files /dev/null and b/WebWindowComplex/wwwroot/icone/shape/Rectangle.png differ diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 3222ccb..b40a6d8 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 3.1.5.1116 + 3.1.8.413 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -291,6 +291,19 @@ + + + + + + + + + + + + +