From add4fe13faa706635841a3eec4184a57753f3619 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 26 Sep 2022 19:31:55 +0200
Subject: [PATCH] Inizio update selezione parametri

---
 MP.SPEC/Components/ListPARAMS.razor    |  6 ++--
 MP.SPEC/Components/ListPARAMS.razor.cs | 39 ++++++++++++++++++++++----
 MP.SPEC/Data/SelectFluxParams.cs       |  1 +
 MP.SPEC/MP.SPEC.csproj                 |  2 +-
 MP.SPEC/Pages/PARAMS.razor             |  2 +-
 MP.SPEC/Pages/PARAMS.razor.cs          | 29 +++++++++++++++++--
 MP.SPEC/Resources/ChangeLog.html       |  2 +-
 MP.SPEC/Resources/VersNum.txt          |  2 +-
 MP.SPEC/Resources/manifest.xml         |  2 +-
 9 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/MP.SPEC/Components/ListPARAMS.razor b/MP.SPEC/Components/ListPARAMS.razor
index 9efdc64e..9c77dbc2 100644
--- a/MP.SPEC/Components/ListPARAMS.razor
+++ b/MP.SPEC/Components/ListPARAMS.razor
@@ -17,7 +17,7 @@ else
                 <thead>
                     <tr>
                         <th>
-                            @*<button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>*@
+                            <button @onclick="() => resetSel()" class="btn btn-primary btn-sm"><i class="bi bi-arrow-counterclockwise"></i></button>
                         </th>
                         <th><i class="fa-regular fa-calendar-days"></i> Data</th>
                         <th><i class="fa-solid fa-hard-drive"></i> Macchina</th>
@@ -29,9 +29,9 @@ else
                 <tbody>
                     @foreach (var record in ListRecords)
                     {
-                        <tr class="@checkSelect(@record.IdxMacchina)">
+                        <tr class="@checkSelect(@record)">
                             <td>
-                                @*<button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm"><i class="bi bi-pencil-square"></i></button>*@
+                                <button @onclick="() => selRecord(record)" class="btn btn-primary btn-sm"><i class="bi bi-search"></i></button>
                             </td>
                             <td>
                                 @record.dtEvento
diff --git a/MP.SPEC/Components/ListPARAMS.razor.cs b/MP.SPEC/Components/ListPARAMS.razor.cs
index 6b0b346b..8d2084b1 100644
--- a/MP.SPEC/Components/ListPARAMS.razor.cs
+++ b/MP.SPEC/Components/ListPARAMS.razor.cs
@@ -13,6 +13,9 @@ namespace MP.SPEC.Components
         [Parameter]
         public EventCallback<bool> PagerResetReq { get; set; }
 
+        [Parameter]
+        public EventCallback<FluxLog> RecordSel { get; set; }
+
         [Parameter]
         public SelectFluxParams SelFilter { get; set; } = null!;
 
@@ -23,14 +26,14 @@ namespace MP.SPEC.Components
 
         #region Public Methods
 
-        public string checkSelect(string IdxMacchina)
+        public string checkSelect(FluxLog selRecord)
         {
             string answ = "";
             if (currRecord != null)
             {
                 try
                 {
-                    answ = (currRecord.IdxMacchina == IdxMacchina) ? "table-info" : "";
+                    answ = (currRecord.IdxMacchina == selRecord.IdxMacchina && currRecord.dtEvento == selRecord.dtEvento && currRecord.CodFlux == selRecord.CodFlux) ? "table-info" : "";
                 }
                 catch
                 { }
@@ -38,6 +41,21 @@ namespace MP.SPEC.Components
             return answ;
         }
 
+        protected override async Task OnParametersSetAsync()
+        {
+            await Task.Delay(1);
+            // se sono live + parametri cambiati --> rileggo...
+            if (SelFilter.LiveUpdate)
+            {
+                await reloadData(false);
+            }
+            // se sono live --> elimino record selezionato
+            //if (SelFilter.LiveUpdate)
+            //{
+            //    currRecord = null;
+            //}
+        }
+
         public void Dispose()
         {
             aTimer.Elapsed -= ElapsedTimer;
@@ -86,11 +104,9 @@ namespace MP.SPEC.Components
 
         public void StartTimer()
         {
-            //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
             aTimer = new System.Timers.Timer(RefreshPeriod);
             aTimer.Elapsed += ElapsedTimer;
             aTimer.Enabled = true;
-            //aTimer.AutoReset = true;
             aTimer.Start();
         }
 
@@ -114,8 +130,6 @@ namespace MP.SPEC.Components
 
         #endregion Protected Properties
 
-        //protected int RefreshPeriod { get; set; } = 5000;
-
         #region Protected Methods
 
         protected override async Task OnInitializedAsync()
@@ -127,6 +141,7 @@ namespace MP.SPEC.Components
             await reloadData(true);
         }
 
+        //protected int RefreshPeriod { get; set; } = 5000;
         protected async void OnSeachUpdated()
         {
             await InvokeAsync(() =>
@@ -138,6 +153,18 @@ namespace MP.SPEC.Components
             });
         }
 
+        protected async Task resetSel()
+        {
+            currRecord = null;
+            await RecordSel.InvokeAsync(null);
+        }
+
+        protected async Task selRecord(FluxLog selRec)
+        {
+            currRecord = selRec;
+            await RecordSel.InvokeAsync(selRec);
+        }
+
         protected async Task UpdateData()
         {
             currRecord = null;
diff --git a/MP.SPEC/Data/SelectFluxParams.cs b/MP.SPEC/Data/SelectFluxParams.cs
index 39660b9f..f89ffdf6 100644
--- a/MP.SPEC/Data/SelectFluxParams.cs
+++ b/MP.SPEC/Data/SelectFluxParams.cs
@@ -13,6 +13,7 @@
 
         public string CodFlux { get; set; } = "*";
         public int CurrPage { get; set; } = 1;
+        public DateTime? dtRif { get; set; } = null;
         public string IdxMacchina { get; set; } = "*";
         public string lastUpdate { get; set; } = "-";
         public bool LiveUpdate { get; set; } = true;
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index d495b20d..119e0d00 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.2209</Version>
+    <Version>6.16.2209.2619</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/PARAMS.razor b/MP.SPEC/Pages/PARAMS.razor
index 2e62bc74..70ddf38a 100644
--- a/MP.SPEC/Pages/PARAMS.razor
+++ b/MP.SPEC/Pages/PARAMS.razor
@@ -25,7 +25,7 @@
         }
         else
         {
-            <ListPARAMS SelFilter="@currFilter" TotRecordChanged="@updateTotal"></ListPARAMS>
+            <ListPARAMS SelFilter="@currFilter" TotRecordChanged="@updateTotal" RecordSel="@detailSel"></ListPARAMS>
         }
     </div>
     <div class="card-footer py-1">
diff --git a/MP.SPEC/Pages/PARAMS.razor.cs b/MP.SPEC/Pages/PARAMS.razor.cs
index 16ba0000..853161d0 100644
--- a/MP.SPEC/Pages/PARAMS.razor.cs
+++ b/MP.SPEC/Pages/PARAMS.razor.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using MP.Data.DatabaseModels;
 using MP.SPEC.Components;
 using MP.SPEC.Data;
 
@@ -29,8 +30,12 @@ namespace MP.SPEC.Pages
         protected void ForceReloadPage(int newNum)
         {
             currPage = newNum;
-            currFilter.lastUpdate = $"Last Snapshot: {DateTime.Now:yyyy/MM/dd HH:mm:ss}";
-            currFilter.LiveUpdate = (currPage == 1);
+            DateTime adesso = DateTime.Now.AddSeconds(1);
+            var updFilter = currFilter;
+            updFilter.LiveUpdate = (currPage == 1);
+            updFilter.lastUpdate = updFilter.LiveUpdate ? "-" : $"Last Snapshot: {adesso:yyyy/MM/dd HH:mm:ss}";
+            // salvo filtro
+            currFilter = updFilter;
             StateHasChanged();
         }
 
@@ -64,6 +69,26 @@ namespace MP.SPEC.Pages
             totalCount = newTotCount;
         }
 
+
+        protected void detailSel(FluxLog newRec)
+        {
+            var updFilter = currFilter;
+            DateTime adesso = DateTime.Now.AddSeconds(1);
+            updFilter.LiveUpdate = (newRec == null);
+            // sistemo la data di riferimento x eventuale snapshot nel passato
+            updFilter.dtRif = newRec != null ? newRec.dtEvento : null;
+            if (newRec != null)
+            {
+                updFilter.lastUpdate = updFilter.lastUpdate == "-" ? $"Last Snapshot: {adesso:yyyy/MM/dd HH:mm:ss}" : updFilter.lastUpdate;
+            }
+            else
+            {
+                updFilter.lastUpdate = "-";
+            }
+            // salvo filtro
+            currFilter = updFilter;
+        }
+
         #endregion Protected Methods
 
         #region Private Properties
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 2f25c3eb..36e1ac6f 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.2209</h4>
+    <h4>Versione: 6.16.2209.2619</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index b1c2d29f..2f73cc59 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2209.2209
+6.16.2209.2619
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 154069b0..cefd20f7 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.2209</version>
+  <version>6.16.2209.2619</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>