From 9a144a95ffcf536cf2bb072501747a885852b072 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Tue, 2 May 2023 09:20:20 +0200
Subject: [PATCH] prova fix bottone

---
 .../Components/Buttons/ButtonsDoorDef.razor   |  4 +--
 .../Buttons/ButtonsDoorDef.razor.cs           | 15 +++--------
 .../Hardware/HardwareNewPanel.razor.cs        |  2 +-
 .../Hardware/HwSingleInstance.razor.cs        | 27 +++++++++----------
 WebDoorCreator.UI/Pages/DoorDefinition.razor  |  2 +-
 .../Pages/DoorDefinition.razor.cs             | 12 +++++++++
 6 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor
index 3c73dae..dbcc3e1 100644
--- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor
+++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor
@@ -1,6 +1,6 @@
 <div>
-    @B_doorOpUpd
-    @if (B_doorOpUpd)
+    @change
+    @if (change)
     {
         <button class="btn btn-success" @onclick="() => doSave()"><i class="fa-solid fa-floppy-disk fa-bounce"></i></button>
     }
diff --git a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
index a371fd9..9cc7bca 100644
--- a/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
+++ b/WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
@@ -80,18 +80,11 @@ namespace WebDoorCreator.UI.Components.Buttons
             var headRows = config.GetSection("ConfDDF:Header").Get<List<string>>();
             var footRows = config.GetSection("ConfDDF:Footer").Get<List<string>>();
             currDdfConv = new WebDoorCreator.Data.DDF.Converter(vers, remDoorOp, headRows, footRows);
-            WDCRService.EA_UpdDoorOp += WDService_EA_DoorOpUpdated;
+            
         }
-        [Inject]
-        protected WDCRefreshService WDCRService { get; set; } = null!;
+        
 
-        protected bool B_doorOpUpd { get; set; } = false;
-
-        private void WDService_EA_DoorOpUpdated()
-        {
-            B_doorOpUpd = WDCRService.isDoorOpUpd;
-            StateHasChanged();
-        }
+        
 
         /// <summary>
         /// Effettua salvataggio record e generazione DDF
@@ -113,8 +106,6 @@ namespace WebDoorCreator.UI.Components.Buttons
                     int currVers = await QDataServ.SendCalcReq(DoorId, currDdf);
                 }
             }
-
-            B_doorOpUpd = false;
         }
 
         protected WebDoorCreator.Data.DDF.Converter currDdfConv { get; set; } = null!;
diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs
index 82bad79..9a19ab6 100644
--- a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs
+++ b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs
@@ -67,9 +67,9 @@ namespace WebDoorCreator.UI.Components.Hardware
                     DoorOpList.Remove(item2rem);
                 }
                 await Task.Delay(1);
+                B_doorOpUpd = true;
                 DoorOpList.Add(currItem);
 
-                B_doorOpUpd = true;
             }
         }
 
diff --git a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
index e2d764a..fd2d7a3 100644
--- a/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
+++ b/WebDoorCreator.UI/Components/Hardware/HwSingleInstance.razor.cs
@@ -137,20 +137,6 @@ namespace WebDoorCreator.UI.Components.Hardware
             await FullReloadData();
         }
 
-        protected bool isChangedVal()
-        {
-            bool answ = !DoorOpInst.JsoncActValEquals(currVal);
-            if (answ)
-            {
-                DoorOpInst.JsoncActVal = JsonConvert.SerializeObject(currVal);
-                Task.Run(async () =>
-                {
-                    await E_recordUpdate.InvokeAsync(DoorOpInst);
-                });
-            }
-            return answ;
-        }
-
         protected async Task doClone()
         {
             var doorOpToAdd = DoorOpInst.ObjClone(userId);
@@ -196,6 +182,19 @@ namespace WebDoorCreator.UI.Components.Hardware
             await FullReloadData();
         }
 
+        protected bool isChangedVal()
+        {
+            bool answ = !DoorOpInst.JsoncActValEquals(currVal);
+            if (answ)
+            {
+                DoorOpInst.JsoncActVal = JsonConvert.SerializeObject(currVal);
+                Task.Run(async () =>
+                {
+                    await E_recordUpdate.InvokeAsync(DoorOpInst);
+                });
+            }
+            return answ;
+        }
         protected bool isCombo(string pKey)
         {
             bool answ = false;
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor b/WebDoorCreator.UI/Pages/DoorDefinition.razor
index 1c83fc2..dc8242f 100644
--- a/WebDoorCreator.UI/Pages/DoorDefinition.razor
+++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor
@@ -4,7 +4,7 @@
     <div>
         <h3>Door Definition</h3>
     </div>
-    <ButtonsDoorDef idOrd="@idOrd" paramsChanged="@paramChanged" DoorId="@idDoor"></ButtonsDoorDef>
+    <ButtonsDoorDef idOrd="@idOrd" paramsChanged="@B_doorOpUpd" DoorId="@idDoor"></ButtonsDoorDef>
 </div>
 <div class="row">
     <div class="col-7">
diff --git a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
index 291ac3b..3c64d7e 100644
--- a/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
+++ b/WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
@@ -79,6 +79,18 @@ namespace WebDoorCreator.UI.Pages
             userLang = WDCUService.currLanguage ?? "EN";
             WDCUService.EA_CurrLanguage += WDUService_EA_CurrLanguage;
             QDataServ.CalcDonePipe.EA_NewMessage += CalcDonePipe_EA_NewMessage;
+            WDCRService.EA_UpdDoorOp += WDService_EA_DoorOpUpdated;
+        }
+
+        [Inject]
+        protected WDCRefreshService WDCRService { get; set; } = null!;
+
+        protected bool B_doorOpUpd { get; set; } = false;
+
+        private void WDService_EA_DoorOpUpdated()
+        {
+            B_doorOpUpd = WDCRService.isDoorOpUpd;
+            StateHasChanged();
         }
 
         protected async Task ReloadData()