From 6bf82f661525cefca14ebda9fe1c461b846fcfe6 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 3 Oct 2022 14:48:42 +0200
Subject: [PATCH] Update struttura dati x DataLog - modifica modello dati -
 aggiunto enum parametri/tools/all - aggiunte migrations

---
 MP.MONO.Core/Enums.cs                      | 14 ++++++++++++--
 MP.MONO.Data/Controllers/MpDbController.cs | 12 +++++++-----
 MP.MONO.Data/DbModels/DataLogModel.cs      | 18 +++++++++++++-----
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/MP.MONO.Core/Enums.cs b/MP.MONO.Core/Enums.cs
index 5b51e30..91b9b31 100644
--- a/MP.MONO.Core/Enums.cs
+++ b/MP.MONO.Core/Enums.cs
@@ -20,6 +20,16 @@
             OR
         }
 
+        /// <summary>
+        /// Tipo di dati salvato in DataLog
+        /// </summary>
+        public enum DataLogType
+        {
+            ND = 0,
+            Parameter = 1,
+            Tools
+        }
+
         /// <summary>
         /// Categoria dataItem
         /// </summary>
@@ -35,8 +45,8 @@
         /// </summary>
         public enum AlarmReportingMode
         {
-            ND=0,
-            
+            ND = 0,
+
             /// <summary>
             /// MOdalità report per bank di memoria + bitmap degli allarmi attivi nel bank
             /// </summary>
diff --git a/MP.MONO.Data/Controllers/MpDbController.cs b/MP.MONO.Data/Controllers/MpDbController.cs
index 510890c..9e1a151 100644
--- a/MP.MONO.Data/Controllers/MpDbController.cs
+++ b/MP.MONO.Data/Controllers/MpDbController.cs
@@ -4,6 +4,7 @@ using MP.MONO.Data.DbModels;
 using MP.MONO.Data.DTO;
 using NLog;
 using System.Diagnostics;
+using static MP.MONO.Core.Enums;
 
 namespace MP.MONO.Data.Controllers
 {
@@ -523,12 +524,13 @@ namespace MP.MONO.Data.Controllers
         /// <summary>
         /// Recupero DataLogDTO data condizione filtro
         /// </summary>
-        /// <param name="machineId"></param>
-        /// <param name="fluxType"></param>
-        /// <param name="inizio"></param>
-        /// <param name="fine"></param>
+        /// <param name="machineId">ID macchina</param>
+        /// <param name="dataType">Tipologia di dato richiesto da enum</param>
+        /// <param name="fluxType">Tipo di Flusso</param>
+        /// <param name="inizio">DT Inizio estrazione</param>
+        /// <param name="fine">DT Fine estrazione</param>
         /// <returns></returns>
-        public List<DataLogDTO> DataLogDtoGetFilt(int machineId, string fluxType, DateTime inizio, DateTime fine)
+        public List<DataLogDTO> DataLogDtoGetFilt(int machineId, DataLogType dataType, string fluxType, DateTime inizio, DateTime fine)
         {
             List<DataLogDTO> dbResult = new List<DataLogDTO>();
             using (MapoMonoContext localDbCtx = new MapoMonoContext())
diff --git a/MP.MONO.Data/DbModels/DataLogModel.cs b/MP.MONO.Data/DbModels/DataLogModel.cs
index 6a9291f..4520324 100644
--- a/MP.MONO.Data/DbModels/DataLogModel.cs
+++ b/MP.MONO.Data/DbModels/DataLogModel.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using static MP.MONO.Core.Enums;
 
 
 // <Auto-Generated>
@@ -19,6 +20,18 @@ namespace MP.MONO.Data.DbModels
         [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int DataLogId { get; set; }
 
+        /// <summary>
+        /// Macchina cui è riferito il valore
+        /// </summary>
+        public int MachineId { get; set; }
+
+
+        /// <summary>
+        /// Tipologia del dato cui è riferito il valore
+        /// </summary>
+        public DataLogType DataType { get; set; } = DataLogType.Parameter;
+
+
         /// <summary>
         /// DataOra evento registrato
         /// </summary>
@@ -30,11 +43,6 @@ namespace MP.MONO.Data.DbModels
         [MaxLength(250)]
         public string FluxType { get; set; } = "ND";
 
-        /// <summary>
-        /// Macchina cui è riferito il valore
-        /// </summary>
-        public int MachineId { get; set; }
-
         /// <summary>
         /// Valore formato numerico (0 se non numerico)
         /// </summary>