From 2bfbc205353066b8390fb1f5f74afdc693461900 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Tue, 4 Apr 2023 17:20:08 +0200
Subject: [PATCH] fix gestione aggiunta nuovo hardware

---
 .../Components/Hardware/HardwareList.razor    | 12 +++++----
 .../Components/Hardware/HardwareList.razor.cs | 15 ++++++++++-
 .../Hardware/HardwareNewPanel.razor           | 25 ++++++++++++-------
 .../Hardware/HardwareNewPanel.razor.cs        | 18 +++++++++++++
 .../Data/WebDoorCreatorService.cs             |  6 ++---
 5 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareList.razor b/WebDoorCreator.UI/Components/Hardware/HardwareList.razor
index c6136c0..a176926 100644
--- a/WebDoorCreator.UI/Components/Hardware/HardwareList.razor
+++ b/WebDoorCreator.UI/Components/Hardware/HardwareList.razor
@@ -5,17 +5,19 @@
     {
         <div class="row m-0">
             <div class="text-center">
-                <div class="row col-4" @onclick="()=>hwToAdd()">
+                <div class="row col-4" >
                     <div class="rectangle">
                         @(translate(doorOpToShow.HwCode))
-                        <div class="circle"></div>
+                        <div class="circle" @onclick="()=>hwToAdd()"></div>
                     </div>
                 </div>
             </div>
 
-            <div class="col-4">
-                <HardwareNewPanel DoorId="@DoorId" DoorTypeTypeId="@doorOpToShow.DoorOpTypId"></HardwareNewPanel>
-            </div>
+            <HardwareNewPanel Lingua="@Lingua" HwAdded="@hwAdd" DoorId="@DoorId" DoorTypeTypeId="@doorOpToShow.DoorOpTypId"></HardwareNewPanel>
+        </div>
+
+        <div>
+            <button class="btn btn-info" @onclick="()=>backToList()">BACK TO LIST</button>
         </div>
     }
     else
diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs b/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs
index 27308eb..1ccc032 100644
--- a/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs
+++ b/WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs
@@ -23,6 +23,7 @@ namespace WebDoorCreator.UI.Components.Hardware
         protected List<DoorOpTypeModel>? doorOpType { get; set; } = null;
         protected DoorOpTypeModel? doorOpToShow { get; set; } = null;
         protected List<DoorOpModel>? doorOp { get; set; } = null;
+        protected bool hwAdd { get; set; } = false;
 
         [Inject]
         protected WebDoorCreatorService WDService { get; set; } = null!;
@@ -88,11 +89,23 @@ namespace WebDoorCreator.UI.Components.Hardware
                 };
                 listOp.Add(doorOpToAdd);
                 // salvo Door OP associate
-                await WDService.DoorOpInsert(DoorId, listOp);
+                bool fatto = await WDService.DoorOpInsert(DoorId, listOp);
+
+                if (fatto)
+                {
+                    hwAdd = fatto;
+                    await InvokeAsync(StateHasChanged);
+                }
             }
 
         }
 
+        protected async Task backToList()
+        {
+            await Task.Delay(1);
+            doorOpToShow = null;
+        }
+
         #endregion Protected Methods
     }
 }
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor
index a3cc0a5..ac94497 100644
--- a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor
+++ b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor
@@ -1,16 +1,23 @@
 @if (DoorOp != null)
 {
 
-    @foreach (var item in DoorOp)
-    {
-        @foreach (var graph in getGraphicParams(item))
+    <div class="row">
+        @foreach (var item in DoorOp)
         {
-            @if (graph.graphicParamType == "TextBox")
-            {
-                <input class="form-control" value="@graph.graphicParamDefaultVal" />
-            }
-        }
+            <div class="col-4 mb-2">
+                @foreach (var graph in getGraphicParams(item))
+                {
+                    @if (graph.graphicParamType == "TextBox")
+                    {
+                        <div class="input-group">
+                            <span class="input-group-text" id="@($"p_{graph.GraphicParamId}")">@(translate(graph.graphicParamAlias))</span>
+                            <input type="text" class="form-control" value="@graph.graphicParamDefaultVal" aria-describedby="basic-addon1">
+                        </div>
+                    }
+                }
+            </div>
 
-    }
+        }
+    </div>
 }
 
diff --git a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs
index 8af99bd..065ab86 100644
--- a/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs
+++ b/WebDoorCreator.UI/Components/Hardware/HardwareNewPanel.razor.cs
@@ -14,9 +14,18 @@ namespace WebDoorCreator.UI.Components.Hardware
         [Parameter]
         public int DoorId { get; set; } = 0;
 
+        [Parameter]
+        public bool HwAdded { get; set; } = false;
+
+        [Parameter]
+        public string Lingua { get; set; } = "EN";
+
         [Inject]
         protected WebDoorCreatorService WDCService { get; set; } = null!;
 
+        [Inject]
+        protected WDCVocabularyService WDVService { get; set; } = null!;
+
         protected List<DoorOpModel>? ListRecord { get; set; } = null!;
         protected List<DoorOpModel>? DoorOp { get; set; } = null!;
         //protected DoorOpModel? DoorOp { get; set; } = null!;
@@ -46,5 +55,14 @@ namespace WebDoorCreator.UI.Components.Hardware
 
             return graphicParams;
         }
+
+        protected string translate(string lemma)
+        {
+            string answ = "";
+
+            answ = WDVService.Traduci(Lingua, lemma);
+
+            return answ;
+        }
     }
 }
\ No newline at end of file
diff --git a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs
index 97245e5..1ba1cc6 100644
--- a/WebDoorCreator.UI/Data/WebDoorCreatorService.cs
+++ b/WebDoorCreator.UI/Data/WebDoorCreatorService.cs
@@ -455,10 +455,10 @@ namespace WebDoorCreator.UI.Data
         /// <returns></returns>
         public async Task<bool> DoorOpFlushCache(int DoorId)
         {
-            RedisValue pattern = new RedisValue($"{rKeyDoorOp}:*");
+            RedisValue pattern = new RedisValue($"{rKeyDoorOp}*");
             if (DoorId > 0)
             {
-                pattern = new RedisValue($"{rKeyDoorOp}:{DoorId}:*");
+                pattern = new RedisValue($"{rKeyDoorOp}:{DoorId}*");
             }
             bool answ = await ExecFlushRedisPattern(pattern);
             return answ;
@@ -727,7 +727,7 @@ namespace WebDoorCreator.UI.Data
         }
 
         /// <summary>
-        /// Company list
+        /// List values
         /// </summary>
         public async Task<List<ListValuesModel>?> ListValuesGetAll(string tableName, string fieldName)
         {