From d3efe7688a79e541146394c29cce604759abdaaf Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 26 Oct 2021 18:35:52 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Aggiunto=20in=20SDK=20gestione=20unit=C3=A0?=
 =?UTF-8?q?=20di=20misura?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MapoSDK/Objects.cs | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/MapoSDK/Objects.cs b/MapoSDK/Objects.cs
index d38ca404..ad72c8b9 100644
--- a/MapoSDK/Objects.cs
+++ b/MapoSDK/Objects.cs
@@ -310,6 +310,11 @@ namespace MapoSDK
         [JsonConverter(typeof(StringEnumConverter))]
         public plcDataType tipoMem { get; set; } = plcDataType.Int;
 
+        /// <summary>
+        /// Unità di misura del parametro
+        /// </summary>
+        public string unit { get; set; } = "";
+
         /// <summary>
         /// Valore parametro (come stringa, decimali con ",", default VUOTO), poi LETTO da PLC (o appena scritto)
         /// </summary>
@@ -819,6 +824,20 @@ namespace MapoSDK
         #endregion Public Properties
     }
 
+    public class StCheckOverride
+    {
+        #region Public Properties
+
+        public bool CanForce { get; set; } = false;
+        public string CodGruppo { get; set; } = "";
+        public string CodTipo { get; set; } = "";
+        public int IdxST { get; set; } = 0;
+        public int Num { get; set; } = 0;
+        public int Oggetto { get; set; } = 0;
+
+        #endregion Public Properties
+    }
+
     /// <summary>
     /// Classe oggetto base TimeSeries
     /// </summary>
@@ -982,14 +1001,4 @@ namespace MapoSDK
 
         #endregion Public Properties
     }
-
-    public class StCheckOverride
-    {
-        public bool CanForce { get; set; } = false;
-        public string CodGruppo { get; set; } = "";
-        public string CodTipo { get; set; } = "";
-        public int IdxST { get; set; } = 0;
-        public int Num { get; set; } = 0;
-        public int Oggetto { get; set; } = 0;
-    }
 }
\ No newline at end of file

From fde6e72f4fb48d69a063cc40f714728fc76befd3 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Tue, 26 Oct 2021 18:36:34 +0200
Subject: [PATCH 2/2] Compeltamento aggiornamento datalayer

---
 MP-IO/Controllers/IOBController.cs | 10 +++++-----
 MapoDb/DataLayer.cs                |  4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs
index b412ec5c..f169145a 100644
--- a/MP-IO/Controllers/IOBController.cs
+++ b/MP-IO/Controllers/IOBController.cs
@@ -70,7 +70,7 @@ namespace MP_IO.Controllers
                 }
                 else
                 {
-                    logger.lg.scriviLog($"addTask2Exe: impossibile riconoscere il comando {taskName} come uno deitipi ammessi, NON aggiunto", tipoLog.ERROR);
+                    logger.lg.scriviLog($"addTask2Exe: impossibile riconoscere il comando {taskName} come uno dei tipi ammessi, NON aggiunto", tipoLog.ERROR);
                 }
                 answ = getTask2Exe(id);
             }
@@ -685,7 +685,7 @@ namespace MP_IO.Controllers
                 try
                 {
                     DataLayer DataLayerObj = new DataLayer();
-                    // deserializzo.
+                    // deserializzo
                     currParams = DataLayerObj.getCurrObjItems(id);
                     // se != null --> salvo!
                     if (currParams != null)
@@ -695,7 +695,7 @@ namespace MP_IO.Controllers
                 }
                 catch (Exception exc)
                 {
-                    logger.lg.scriviLog($"Errore in getCurrParams{Environment.NewLine}{exc}");
+                    logger.lg.scriviLog($"Errore in getObjItems{Environment.NewLine}{exc}");
                     answ = "NO";
                 }
             }
@@ -722,7 +722,7 @@ namespace MP_IO.Controllers
                 try
                 {
                     DataLayer DataLayerObj = new DataLayer();
-                    // deserializzo.
+                    // deserializzo
                     currParams = DataLayerObj.getCurrObjItemsPendigWrite(id);
                     // se != null --> salvo!
                     if (currParams != null)
@@ -1348,7 +1348,7 @@ namespace MP_IO.Controllers
                 }
                 catch (Exception exc)
                 {
-                    logger.lg.scriviLog($"Errore in setCurrParams{Environment.NewLine}{exc}");
+                    logger.lg.scriviLog($"Errore in upsertObjItems{Environment.NewLine}{exc}");
                     answ = "NO";
                 }
             }
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index 75b89af8..7a4c44ef 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -849,7 +849,6 @@ namespace MapoDb
             }
             catch
             { }
-            // chiamo update come task di scrittura
 
             return answ;
         }
@@ -2084,7 +2083,7 @@ namespace MapoDb
             }
             catch (Exception exc)
             {
-                logger.lg.scriviLog(string.Format("Errore in recupero dati SAVED TASK x Redis mSavedTaskMacchina - idxMacchina {2}:{0}{1}", Environment.NewLine, exc, idxMacchina));
+                logger.lg.scriviLog($"Errore in recupero dati SAVED TASK x Redis mSavedTaskMacchina | idxMacchina {idxMacchina}{Environment.NewLine}{exc}");
             }
             return answ;
         }
@@ -3491,7 +3490,6 @@ namespace MapoDb
             {
                 string serVal = JsonConvert.SerializeObject(currValues);
                 memLayer.ML.setRSV(currParametersHash(idxMacchina), serVal);
-
                 // controllo se ha valori write...
                 foreach (var item in currValues)
                 {