- Correzione aggiunta prima anta

- Inizio inserimento icone

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);

WebWindowComplex/Compo/CardFrame.razor

@@ -31,6 +31,9 @@
                         </select>
                     }
                 </div>
+                <div class="text-start">
+                    <img class="img-fluid" src="icone/Rectangle.png" width="12" />
+                </div>
             </div>
         </div>
         <hr />

WebWindowComplex/Compo/CardFrame.razor.cs

@@ -66,6 +66,8 @@ namespace WebWindowComplex.Compo
 
         #region Protected Properties
 
+        private string GetImagePath(string fileName) => $"/Icone/Shape/{fileName}.png";
+
         /// <summary>
         /// Metodo per selezionare shape
         /// </summary>
@@ -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);

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<int> currSashDimEdit = new List<int>();
 
         #endregion Private Fields

WebWindowComplex/Compo/General.razor

@@ -12,6 +12,9 @@
     </div>
     <div class="card-body py-2">
         <div class="row">
+            <div class="text-start">
+                <img class="img-fluid" src="icone/Rectangle.png" width="12" />
+            </div>
             <div class="col-md-12 col-lg-6 d-flex flex-column gap-2 flex-wrap">
                 <div class="input-group mb-2 justify-content-center">
                     @if (User)

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"))
                     {

WebWindowComplex/WebWindowComplex.csproj

@@ -6,7 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>3.1.5.1116</Version>
+    <Version>3.1.8.413</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -211,5 +211,6 @@
 
 
 
+
 
 

WebWindowConfigurator/WebWindowConfigurator.csproj

@@ -6,7 +6,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>3.1.5.1116</Version>
+        <Version>3.1.8.413</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -291,6 +291,19 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+