From 7432b5c205ea36c89e17801476f6d4e187d59eaa Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 30 Nov 2023 16:31:47 +0100
Subject: [PATCH] Modifica logica veto + filtro: - contains oltre a endsWith -
 filtro invio come contains o equals

---
 IOB-UT-NEXT/ToMapo.cs                    | 10 ++++++-
 IOB-WIN-NEXT/DATA/CONF/TFT_RAMA_001.json | 37 ++++++++++++++++++++++--
 IOB-WIN-NEXT/IobOpc/OpcUa.cs             |  4 +--
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/IOB-UT-NEXT/ToMapo.cs b/IOB-UT-NEXT/ToMapo.cs
index 8d180c82..e8fd195c 100644
--- a/IOB-UT-NEXT/ToMapo.cs
+++ b/IOB-UT-NEXT/ToMapo.cs
@@ -240,9 +240,13 @@ namespace IOB_UT_NEXT
         public bool emergencyArmedTrue { get; set; } = true;
 
         /// <summary>
-        /// Elenco items FILTRATI da invio come dynData --&gt; FluxLog (events o samples)
+        /// Elenco items FILTRATI da invio come dynData --&gt; FluxLog (events o samples), ricerca SECCA
         /// </summary>
         public List<string> fluxLogVeto { get; set; } = new List<string>();
+        /// <summary>
+        /// Elenco items FILTRATI da invio come dynData --&gt; FluxLog (events o samples), ricerca testo come contains in displayName
+        /// </summary>
+        public List<string> fluxLogVetoContains { get; set; } = new List<string>();
 
         /// <summary>
         /// Indica se il controllo di ping sia OK (x controllo prima della connessione)
@@ -303,6 +307,10 @@ namespace IOB_UT_NEXT
         /// Dictionary dei nomi da cercare come "endsWith" a cui applicare la soglia indicata
         /// </summary>
         public Dictionary<string, int> paramsEndThresh { get; set; } = new Dictionary<string, int>();
+        /// <summary>
+        /// Dictionary dei nomi da cercare come "contains" a cui applicare la soglia indicata
+        /// </summary>
+        public Dictionary<string, int> paramsContainsThresh { get; set; } = new Dictionary<string, int>();
 
         /// <summary>
         /// Indica se il ping sia un criterio valido x determinare powerON impianto
diff --git a/IOB-WIN-NEXT/DATA/CONF/TFT_RAMA_001.json b/IOB-WIN-NEXT/DATA/CONF/TFT_RAMA_001.json
index 7779dc8b..760cb556 100644
--- a/IOB-WIN-NEXT/DATA/CONF/TFT_RAMA_001.json
+++ b/IOB-WIN-NEXT/DATA/CONF/TFT_RAMA_001.json
@@ -122,6 +122,12 @@
     "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Burner 10 Actual Temperature",
     "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Burner 11 Actual Temperature",
     "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Burner 12 Actual Temperature",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore ON 7",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore ON 8",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore ON 9",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore ON 10",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore ON 11",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore ON 12",
     "ns=2;s=RamosaETN21.RamosaCJ2.Recipe.Fabric Humidity Preset",
     "ns=2;s=RamosaETN21.RamosaCJ2.Recipe.Air Humidity Preset Esa 2",
     "ns=2;s=RamosaETN21.RamosaCJ2.Recipe.Load cell 2 Weight",
@@ -132,7 +138,24 @@
     "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Fan 111A Speed",
     "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Fan 107 Speed",
     "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Fan 109 Speed",
-    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Fan 111 Speed"
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Fan 111 Speed",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Fan 107 Start",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Fan 109 Start",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Fan 111 Start",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Exhaust Fan 2 Speed",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 1",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 2",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 3",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 4",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 5",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 6",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 7",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 8",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 9",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 10",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 11",
+    "ns=2;s=RamosaETN21.RamosaCJ2.Present Value.Bruciatore in Blocco 12"
+
   ],
   "fluxLogVeto": [
     "Cooling Roller Overfeeding"
@@ -151,7 +174,17 @@
     "Counter": 9,
     "Temperature": 4,
     "Weight": 4,
-    "Humidity Actual Value": 5
+    "Humidity Actual Value": 5,
+    "Spindle 1": 2,
+    "Spindle 2": 2,
+    "Spindle 3": 2,
+    "Spindle 4": 2,
+    "Spindle 5": 2,
+    "Spindle 6": 2,
+    "Spindle 7": 2,
+    "Spindle 8": 2,
+    "Spindle 9": 2,
+    "Spindle 10": 2
   },
   "mMapWrite": {
     "setPzComm": {
diff --git a/IOB-WIN-NEXT/IobOpc/OpcUa.cs b/IOB-WIN-NEXT/IobOpc/OpcUa.cs
index c0a70f90..7cb11745 100644
--- a/IOB-WIN-NEXT/IobOpc/OpcUa.cs
+++ b/IOB-WIN-NEXT/IobOpc/OpcUa.cs
@@ -1489,7 +1489,7 @@ namespace IOB_WIN_NEXT.IobOpc
                     lgDebug("---------- AVAILABLE FOR SUBSCRIBE ----------");
                     foreach (var item in nodeIdNameList)
                     {
-                        lgDebug(item.Key);
+                        lgDebug($"Avail: {item.Key}");
                     }
                     lgDebug("---------- END LIST ----------");
 
@@ -1528,7 +1528,7 @@ namespace IOB_WIN_NEXT.IobOpc
                     lgInfo("---------- SUBSCRIBED NODES ----------");
                     foreach (var item in selectedItemList)
                     {
-                        lgInfo($"SubscNode: {item.Key}");
+                        lgInfo($"SubNo: {item.Key}");
                     }
                     lgInfo("---------- END LIST ----------");