From 695f6e91522ea6c7dcbda6aa61ae7db069eb3e0e Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 30 Oct 2024 10:05:49 +0100
Subject: [PATCH] TaskMan - fix call esecuzione stored RAW STATS - fix pagina
 ForceReset che non si chiude correttamente

---
 MP.Prog/appsettings.json                   | 12 ++++++------
 MP.Stats/MP.Stats.csproj                   |  4 ++--
 MP.Stats/Pages/ForceReset.razor.cs         |  2 +-
 MP.Stats/Resources/ChangeLog.html          |  2 +-
 MP.Stats/Resources/VersNum.txt             |  2 +-
 MP.Stats/Resources/manifest.xml            |  2 +-
 MP.TaskMan/Controllers/MpTaskController.cs | 19 ++++++++++++-------
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/MP.Prog/appsettings.json b/MP.Prog/appsettings.json
index e3d55f38..c0db94d9 100644
--- a/MP.Prog/appsettings.json
+++ b/MP.Prog/appsettings.json
@@ -55,16 +55,16 @@
   },
   "ConnectionStrings": {
 
-    "DefaultConnection": "Server=W2019-SQL-STEAM;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
-    "MP.Prog": "Server=W2019-SQL-STEAM;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
-    //"DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
-    //"MP.Prog": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
+    //"DefaultConnection": "Server=W2019-SQL-STEAM;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
+    //"MP.Prog": "Server=W2019-SQL-STEAM;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
+    "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
+    "MP.Prog": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;",
     "Redis": "localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
   },
   "ServerConf": {
     "FolderBasePath": "\\\\stor01",
-    "Prog.ApiUrl": "https://office.egalware.com/MP/PROG"
-    //"Prog.ApiUrl": "https://iis01.egalware.com/MP/PROG"
+    //"Prog.ApiUrl": "https://office.egalware.com/MP/PROG"
+    "Prog.ApiUrl": "https://iis01.egalware.com/MP/PROG"
   },
   "SpecialConf": {
     "AppUrl": "/MP/PROG",
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index f3bd404e..0a29b929 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2410.2816</Version>
-        <Version>6.16.2410.2816</Version>
+        <Version>6.16.2410.3010</Version>
+        <Version>6.16.2410.3010</Version>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591</NoWarn>
     </PropertyGroup>
diff --git a/MP.Stats/Pages/ForceReset.razor.cs b/MP.Stats/Pages/ForceReset.razor.cs
index 68d87ad0..56bbc029 100644
--- a/MP.Stats/Pages/ForceReset.razor.cs
+++ b/MP.Stats/Pages/ForceReset.razor.cs
@@ -28,7 +28,7 @@ namespace MP.Stats.Pages
             await StatService.FlushCache();
             await TServ.FlushCache();
             await Task.Delay(500);
-            NavManager.NavigateTo("/", true);
+            NavManager.NavigateTo("", true);
         }
 
         #endregion Protected Methods
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index a0157909..288ce829 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2410.2816</h4>
+    <h4>Versione: 6.16.2410.3010</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 05d65809..332be544 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2410.2816
+6.16.2410.3010
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 40d79758..b0950ae0 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2410.2816</version>
+  <version>6.16.2410.3010</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.TaskMan/Controllers/MpTaskController.cs b/MP.TaskMan/Controllers/MpTaskController.cs
index ccc5eafc..9d7f5add 100644
--- a/MP.TaskMan/Controllers/MpTaskController.cs
+++ b/MP.TaskMan/Controllers/MpTaskController.cs
@@ -96,6 +96,7 @@ namespace MP.TaskMan.Controllers
                 // imposto timeout a 5 min
                 //var currTimeout = dbCtx.Database.GetCommandTimeout();
                 dbCtx.Database.SetCommandTimeout(TimeSpan.FromMinutes(5));
+                string sqlCall = "";
                 try
                 {
                     DateTime dtStart = DateTime.Now;
@@ -109,12 +110,16 @@ namespace MP.TaskMan.Controllers
                         // recupero comando
                         string sqlCommand = currRec.Command;
                         string rawParams = currRec.Args;
-                        callRes = dbCtx
-                                    .DbSetTaskResult
-                                    .FromSqlRaw($"EXEC {sqlCommand} {rawParams}")
-                                    .AsNoTracking()
-                                    .AsEnumerable()
-                                    .FirstOrDefault();
+                        // salvo la call x eventuale log errore
+                        sqlCall = $"EXEC {sqlCommand} {rawParams}";
+
+                        var rawData = dbCtx
+                                        .DbSetTaskResult
+                                        .FromSqlRaw($"EXEC {sqlCommand} {rawParams}")
+                                        .ToList();
+
+                        callRes = rawData.FirstOrDefault() ?? new TaskResultModel();
+
                         DateTime dtEnd = DateTime.Now;
 
                         // preparo record esecuzione...
@@ -150,7 +155,7 @@ namespace MP.TaskMan.Controllers
                 }
                 catch (Exception exc)
                 {
-                    Log.Error($"Eccezione in ExecuteSqlCommand{Environment.NewLine}{exc}");
+                    Log.Error($"Eccezione in ExecuteSqlCommand{Environment.NewLine}Call eseguita:{Environment.NewLine}{sqlCall}{Environment.NewLine}------- Stack Eccezione -------{Environment.NewLine}{exc}");
                 }
             }
             return callRes;