From 35c0f2856d4c99f4d11deca61e9ad8b82a84edfc Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 26 Sep 2022 20:03:05 +0200
Subject: [PATCH] Prima bozza con salvataggio live e storico...

---
 MP.Data/Controllers/MpSpecController.cs  | 11 +++++++++--
 MP.SPEC/Components/ParamsFilter.razor    |  2 +-
 MP.SPEC/Components/ParamsFilter.razor.cs | 11 ++++++++++-
 MP.SPEC/Data/MpDataService.cs            |  7 ++++---
 MP.SPEC/MP.SPEC.csproj                   |  2 +-
 MP.SPEC/Pages/PARAMS.razor.cs            |  2 ++
 MP.SPEC/Resources/ChangeLog.html         |  2 +-
 MP.SPEC/Resources/VersNum.txt            |  2 +-
 MP.SPEC/Resources/manifest.xml           |  2 +-
 9 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index 4172154b..b584d136 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -301,17 +301,24 @@ namespace MP.Data.Controllers
             return dbResult;
         }
 
-        public bool DossiersTakeParamsSnapshot(string idxMacchina, int maxSec)
+        /// <summary>
+        /// Effettua salvataggio snapshot parametri (con stored) + svuota eventuale cache redis
+        /// </summary>
+        /// <param name="idxMacchina">macchina</param>
+        /// <param name="maxSec">Num massimo secondi per recuperare dati correnti</param>
+        /// <param name="dtRif">DataOra riferimento x cui prendere valori antecedenti</param>
+        public bool DossiersTakeParamsSnapshot(string idxMacchina, int maxSec, DateTime dtRif)
         {
             bool answ = false;
             using (var dbCtx = new MoonProContext(_configuration))
             {
                 var pIdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina);
                 var pMaxSec = new SqlParameter("@MaxSec", maxSec);
+                var pDtRif = new SqlParameter("@DtRif", dtRif);
 
                 var dbResult = dbCtx
                     .Database
-                    .ExecuteSqlRaw("EXEC stp_FL_TakeSnapshot @IdxMacchina,@MaxSec", pIdxMacchina, pMaxSec);
+                    .ExecuteSqlRaw("EXEC stp_FL_TakeSnapshot @IdxMacchina,@MaxSec,@DtRif", pIdxMacchina, pMaxSec, pDtRif);
                 answ = true;
             }
             return answ;
diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor
index e936884c..344eaea4 100644
--- a/MP.SPEC/Components/ParamsFilter.razor
+++ b/MP.SPEC/Components/ParamsFilter.razor
@@ -24,7 +24,7 @@
                 {
                     <button class="btn btn-warning" type="button" @onclick="() => takeSnapshot()">
                         <i class="fa-solid fa-camera"></i>
-                        Registra
+                        @snapMode
                     </button>
                 }
             </div>
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs
index 9fbb67ff..ccc5a601 100644
--- a/MP.SPEC/Components/ParamsFilter.razor.cs
+++ b/MP.SPEC/Components/ParamsFilter.razor.cs
@@ -134,7 +134,11 @@ namespace MP.SPEC.Components
         {
             // fermo udpate
             liveUpdate = false;
-            await MDService.DossiersTakeParamsSnapshot(selMacchina, 10);
+            // se non ho data rif uso adesso...
+            DateTime dtRif = SelFilter.dtRif == null ? DateTime.Now : (DateTime)SelFilter.dtRif;
+            // aggiungo 2 sec
+            dtRif = dtRif.AddSeconds(1);
+            await MDService.DossiersTakeParamsSnapshot(selMacchina, 10, dtRif);
             lastUpdate = $"Last Snapshot: {DateTime.Now:yyyy/MM/dd HH:mm:ss}";
         }
 
@@ -162,6 +166,11 @@ namespace MP.SPEC.Components
 
         #endregion Private Fields
 
+        private string snapMode
+        {
+            get => SelFilter.dtRif == null ? "Realtime Rec" : $"Rec {SelFilter.dtRif:yyyy/MM/dd HH:mm:ss}";
+        }
+
         #region Private Properties
 
         private bool showEditPar { get; set; } = false;
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index 64e95ba8..47db791d 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -332,14 +332,15 @@ namespace MP.SPEC.Data
         /// Effettua salvataggio snapshot parametri (con stored) + svuota eventuale cache redis
         /// </summary>
         /// <param name="IdxMacchina">macchina</param>
-        /// <param name="maxSec">NUm massimo secondi per recuperare dati correnti</param>
+        /// <param name="MaxSec">NUm massimo secondi per recuperare dati correnti</param>
+        /// <param name="DtRif">DataOra riferimento x cui prendere valori antecedenti</param>
         /// <returns></returns>
-        public async Task<bool> DossiersTakeParamsSnapshot(string IdxMacchina, int MaxSec)
+        public async Task<bool> DossiersTakeParamsSnapshot(string IdxMacchina, int MaxSec, DateTime DtRif)
         {
             bool answ = false;
             await Task.Delay(1);
             // chiamo stored x salvare parametri
-            dbController.DossiersTakeParamsSnapshot(IdxMacchina, MaxSec);
+            dbController.DossiersTakeParamsSnapshot(IdxMacchina, MaxSec,DtRif);
             // svuoto cache redis x macchina
             string currKey = $"{redisDossByMac}:{IdxMacchina}";
             redisDb.StringSet(currKey, "", TimeSpan.FromSeconds(1));
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 119e0d00..801bd66f 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2209.2619</Version>
+    <Version>6.16.2209.2620</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/PARAMS.razor.cs b/MP.SPEC/Pages/PARAMS.razor.cs
index 853161d0..f908a660 100644
--- a/MP.SPEC/Pages/PARAMS.razor.cs
+++ b/MP.SPEC/Pages/PARAMS.razor.cs
@@ -80,6 +80,8 @@ namespace MP.SPEC.Pages
             if (newRec != null)
             {
                 updFilter.lastUpdate = updFilter.lastUpdate == "-" ? $"Last Snapshot: {adesso:yyyy/MM/dd HH:mm:ss}" : updFilter.lastUpdate;
+                updFilter.IdxMacchina = newRec.IdxMacchina;
+                updFilter.CodFlux = newRec.CodFlux;
             }
             else
             {
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 36e1ac6f..bc62cdf5 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2209.2619</h4>
+    <h4>Versione: 6.16.2209.2620</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 2f73cc59..1bb8d749 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2209.2619
+6.16.2209.2620
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index cefd20f7..73152861 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2209.2619</version>
+  <version>6.16.2209.2620</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>