From 460eb769dc59e333815780a534f4fe554ea41e68 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Mon, 17 Oct 2022 17:27:39 +0200
Subject: [PATCH] inizio gestione currRecord dopo chiusura modal

---
 MP.SPEC/Components/ListODL.razor    |  7 ++++---
 MP.SPEC/Components/ListODL.razor.cs | 31 +++++++++++++++++++++++++---
 MP.SPEC/MP.SPEC.csproj              |  2 +-
 MP.SPEC/Pages/ODL.razor             |  1 -
 MP.SPEC/Pages/_Layout.cshtml        |  2 +-
 MP.SPEC/Resources/ChangeLog.html    |  2 +-
 MP.SPEC/Resources/VersNum.txt       |  2 +-
 MP.SPEC/Resources/manifest.xml      |  2 +-
 MP.SPEC/wwwroot/lib/chartBoot.js    | 10 +--------
 MP.SPEC/wwwroot/lib/modalHandler.js | 32 +++++++++++++++++++++++++++++
 10 files changed, 70 insertions(+), 21 deletions(-)
 create mode 100644 MP.SPEC/wwwroot/lib/modalHandler.js

diff --git a/MP.SPEC/Components/ListODL.razor b/MP.SPEC/Components/ListODL.razor
index 2ae52f3a..8937c9d6 100644
--- a/MP.SPEC/Components/ListODL.razor
+++ b/MP.SPEC/Components/ListODL.razor
@@ -110,7 +110,7 @@ else
                                     <b>@record.DurataMinuti</b>
                                 </div>
                                 <div>
-                                    <button class="btn btn-sm btn-primary py-0" type="button" @onclick="() => selectRecord(record)" data-bs-toggle="modal" data-bs-target="#staticBackdrop" title="Mostra statistiche"><i class="fa-solid fa-chart-pie"></i></button>
+                                    <button class="btn btn-sm btn-primary py-0" type="button" @onclick="() => selectRecord(record)" data-bs-toggle="modal" data-bs-target="#myModal" title="Mostra statistiche"><i class="fa-solid fa-chart-pie"></i></button>
                                 </div>
                                 <!-- Modal -->
                             </td>
@@ -118,7 +118,7 @@ else
                     }
                 </tbody>
             </table>
-            <div class="modal fade" id="staticBackdrop" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+            <div class="modal fade" id="myModal" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
                 <div class="modal-dialog modal-dialog-centered modal-xl">
                     <div class="modal-content">
                         <div class="modal-header bg-primary col-12">
@@ -137,7 +137,7 @@ else
                                 </div>
                             }
                             <div class="col-1 text-end">
-                                <button type="button" class="btn btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                <button type="button" class="btn btn-close" data-bs-dismiss="modal" aria-label="Close" @onclick="TriggerDotNetInstanceMethod"></button>
                             </div>
                         </div>
                         <div class="modal-body col-12">
@@ -255,3 +255,4 @@ else
         </div>
     </div>
 }
+
diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs
index f727f6e9..4be64bc9 100644
--- a/MP.SPEC/Components/ListODL.razor.cs
+++ b/MP.SPEC/Components/ListODL.razor.cs
@@ -3,7 +3,8 @@ using Microsoft.JSInterop;
 using MP.Data;
 using MP.Data.DatabaseModels;
 using MP.SPEC.Data;
-using System.Formats.Asn1;
+using MP.SPEC.Pages;
+using System.Xml.Linq;
 
 namespace MP.SPEC.Components
 {
@@ -41,9 +42,31 @@ namespace MP.SPEC.Components
 
         public string formDurata(double durataMin)
         {
-            return Utils.FormDurata(durataMin);
+            return MP.Data.Utils.FormDurata(durataMin);
         }
 
+        //oggetto contenente le funzioni del code behind che sono jsInvokable
+        private DotNetObjectReference<ListODL>? objRef;
+
+#if true //FUNZIONA SE IL METODO TriggerDotNetInstanceMethod() E' IN ONCLOCK BOTTONE
+
+        [JSInvokable]
+        public void svuotaRecord()
+        {
+            currRecord = null;
+            
+        }
+        [JSInvokable]
+        public void setHelper()
+        {
+            objRef = DotNetObjectReference.Create(this);
+        }
+        public async Task TriggerDotNetInstanceMethod()
+        {
+            await JSRuntime.InvokeVoidAsync("recordDeselect", objRef);
+        } 
+#endif
+
         #endregion Public Methods
 
         #region Protected Properties
@@ -80,6 +103,8 @@ namespace MP.SPEC.Components
         protected override async Task OnInitializedAsync()
         {
             ListStati = await MDService.AnagStatiComm();
+            objRef = DotNetObjectReference.Create(this);
+            //await JSRuntime.InvokeVoidAsync("setHelper", objRef);
         }
 
         protected override async Task OnParametersSetAsync()
@@ -90,7 +115,7 @@ namespace MP.SPEC.Components
         protected string colorChanger(string colorCSS)
         {
             string answ = "";
-            if(colorCSS == "yellow")
+            if (colorCSS == "yellow")
             {
                 answ = "text-dark";
             }
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index e6b87a80..a10c3528 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.2210.1711</Version>
+    <Version>6.16.2210.1715</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Pages/ODL.razor b/MP.SPEC/Pages/ODL.razor
index 8356082c..e1d49972 100644
--- a/MP.SPEC/Pages/ODL.razor
+++ b/MP.SPEC/Pages/ODL.razor
@@ -102,4 +102,3 @@
     </div>
 </div>
 
-
diff --git a/MP.SPEC/Pages/_Layout.cshtml b/MP.SPEC/Pages/_Layout.cshtml
index e1d1070d..e20191f1 100644
--- a/MP.SPEC/Pages/_Layout.cshtml
+++ b/MP.SPEC/Pages/_Layout.cshtml
@@ -32,8 +32,8 @@
 
     <script src="lib/bootstrap/js/bootstrap.bundle.min.js"></script>
     <script src="_framework/blazor.server.js" autostart="false"></script>
-    <script src="lib/chartjs-adapter-luxon/chartjs-adapter-luxon.js"></script>
     <script src="lib/chartBoot.js"></script>
+    <script src="lib/modalHandler.js"></script>
     <script src="lib/Chart.js/chart.js"></script>
 
     @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 20236b47..4d586f32 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.2210.1711</h4>
+    <h4>Versione: 6.16.2210.1715</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 4169a5c0..9c48c79c 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2210.1711
+6.16.2210.1715
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 3c1947ad..e06c02e3 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.2210.1711</version>
+  <version>6.16.2210.1715</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>
diff --git a/MP.SPEC/wwwroot/lib/chartBoot.js b/MP.SPEC/wwwroot/lib/chartBoot.js
index 50401512..d8e9de3e 100644
--- a/MP.SPEC/wwwroot/lib/chartBoot.js
+++ b/MP.SPEC/wwwroot/lib/chartBoot.js
@@ -1,20 +1,12 @@
 ///Setup del chart desiderato con id univoco
 window.setup = (id, config) => {
     var ctx = document.getElementById(id).getContext('2d');
-    //let currentDate = new Date();
-    //console.log(currentDate + " - Calling setup...");
-    console.log(id);
     if (window['myChart'] instanceof Chart) {
-        //window.myChart.destroy();
         window['myChart'].destroy();
-        console.log("Chart " + id + " destroyed!");
         window['myChart'] = new Chart(ctx, config);
     }
-    else
-    {
+    else {
         window['myChart'] = new Chart(ctx, config);
-        //console.log("Chart " + id + " created!");
-        console.log(window['myChart']);
     }
 
 }
\ No newline at end of file
diff --git a/MP.SPEC/wwwroot/lib/modalHandler.js b/MP.SPEC/wwwroot/lib/modalHandler.js
new file mode 100644
index 00000000..d951b3a5
--- /dev/null
+++ b/MP.SPEC/wwwroot/lib/modalHandler.js
@@ -0,0 +1,32 @@
+//window.recordDeselect = (dotNetHelper) => {
+//    var myModalEl = document.getElementById('myModal')
+//    myModalEl.addEventListener('hidden.bs.modal', function (event) {
+//        // do something...
+//        //dotNetHelper.invokeMethodAsync('TriggerDotNetInstanceMethod');
+//        return dotNetHelper.invokeMethodAsync('svuotaRecord');
+//        console.log("fatto");
+//    });
+//};
+
+
+//TENTATIVO POPOLAMENTO HELPER PER POTER INVOCARE IL METODO DOPO
+//let helper;
+
+//window.setHelper = (dotNetHelper) => {
+//    helper = dotNetHelper.invokeMethodAsync('setHelper');
+//    console.log(helper);
+//    return dotNetHelper.invokeMethodAsync('setHelper');
+//}
+
+//BECCA QUANDO LA MODALE VIENE CHIUSA ED ESEGUE 
+document.addEventListener('click', function (e) {
+    if (e.target.id === 'myModal') {
+        console.log('chiuso');
+
+        return helper.invokeMethodAsync('svuotaRecord');
+        console.log("fatto");
+    } else {
+        console.log('aperto');
+    }
+    e.stopPropagation();
+}, false);
\ No newline at end of file