From f7cdb29a4ea00eb3871261def4542405389950f2 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 5 Jun 2025 09:45:54 +0200
Subject: [PATCH] Update componente taskScheduler x ricalcolo + corretto

---
 MP.Land/MP.Land.csproj                     |  2 +-
 MP.Land/Resources/ChangeLog.html           |  2 +-
 MP.Land/Resources/VersNum.txt              |  2 +-
 MP.Land/Resources/manifest.xml             |  2 +-
 MP.Stats/MP.Stats.csproj                   |  4 +-
 MP.Stats/Resources/ChangeLog.html          |  2 +-
 MP.Stats/Resources/VersNum.txt             |  2 +-
 MP.Stats/Resources/manifest.xml            |  2 +-
 MP.TaskMan/Controllers/MpTaskController.cs | 65 ++++++++++++----------
 9 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index f58a24be..7b249a09 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.16.2504.1612</Version>
+        <Version>6.16.2505.2814</Version>
         <Configurations>Debug;Release;Debug_LiManDebug</Configurations>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
         <RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index 7c5c054b..2eb24261 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo Tablet MAPO - DotNet6</i>
-    <h4>Versione: 6.16.2504.1612</h4>
+    <h4>Versione: 6.16.2505.2814</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 22950480..23b36889 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2504.1612
+6.16.2505.2814
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index 4cd0b5dc..4a7eae81 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2504.1612</version>
+  <version>6.16.2505.2814</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index d4b9726d..039d6c10 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.2504.1617</Version>
-        <Version>6.16.2504.1617</Version>
+        <Version>6.16.2505.1908</Version>
+        <Version>6.16.2505.1908</Version>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591</NoWarn>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index c2260675..c9ba38db 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.2504.1617</h4>
+    <h4>Versione: 6.16.2505.1908</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 02219081..723f40e5 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2504.1617
+6.16.2505.1908
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 0d916c20..f50a7ec3 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.2504.1617</version>
+  <version>6.16.2505.1908</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 881d6bdb..bb0dd76d 100644
--- a/MP.TaskMan/Controllers/MpTaskController.cs
+++ b/MP.TaskMan/Controllers/MpTaskController.cs
@@ -28,49 +28,56 @@ namespace MP.TaskMan.Controllers
         public DateTime CalcNextExe(TaskListModel taskRec)
         {
             DateTime dtNext = DateTime.Today;
+            DateTime adesso = DateTime.Now;
+            int maxIter = 1000;
             try
             {
                 // prendo come partenza la DATA di fine a cui aggiungo l'ora/minuti schedulata precedentemente
                 TimeSpan oraSched = taskRec.DtNextExec.Subtract(taskRec.DtNextExec.Date);
                 DateTime baseDT = taskRec.DtLastExec.Date.Add(oraSched);
-                // calcolo next exec da tipo...
-                switch (taskRec.Freq)
+                // calcolo next exec da tipo... con ciclo fino a quando supero dataora attuale...
+                while (dtNext < adesso && maxIter > 0)
                 {
-                    case TaskFreqType.ND:
-                        dtNext = baseDT.AddDays(taskRec.Cad);
-                        break;
+                    switch (taskRec.Freq)
+                    {
+                        case TaskFreqType.ND:
+                            dtNext = baseDT.AddDays(taskRec.Cad);
+                            break;
 
-                    case TaskFreqType.Sec:
-                        dtNext = baseDT.AddSeconds(taskRec.Cad);
-                        break;
+                        case TaskFreqType.Sec:
+                            dtNext = baseDT.AddSeconds(taskRec.Cad);
+                            break;
 
-                    case TaskFreqType.Min:
-                        dtNext = baseDT.AddMinutes(taskRec.Cad);
-                        break;
+                        case TaskFreqType.Min:
+                            dtNext = baseDT.AddMinutes(taskRec.Cad);
+                            break;
 
-                    case TaskFreqType.Hour:
-                        dtNext = baseDT.AddHours(taskRec.Cad);
-                        break;
+                        case TaskFreqType.Hour:
+                            dtNext = baseDT.AddHours(taskRec.Cad);
+                            break;
 
-                    case TaskFreqType.Day:
-                        dtNext = baseDT.AddDays(taskRec.Cad);
-                        break;
+                        case TaskFreqType.Day:
+                            dtNext = baseDT.AddDays(taskRec.Cad);
+                            break;
 
-                    case TaskFreqType.Week:
-                        dtNext = baseDT.AddDays(7 * taskRec.Cad);
-                        break;
+                        case TaskFreqType.Week:
+                            dtNext = baseDT.AddDays(7 * taskRec.Cad);
+                            break;
 
-                    case TaskFreqType.Month:
-                        dtNext = baseDT.AddMonths(taskRec.Cad);
-                        break;
+                        case TaskFreqType.Month:
+                            dtNext = baseDT.AddMonths(taskRec.Cad);
+                            break;
 
-                    case TaskFreqType.Year:
-                        dtNext = baseDT.AddYears(taskRec.Cad);
-                        break;
+                        case TaskFreqType.Year:
+                            dtNext = baseDT.AddYears(taskRec.Cad);
+                            break;
 
-                    default:
-                        dtNext = baseDT.AddDays(taskRec.Cad);
-                        break;
+                        default:
+                            dtNext = baseDT.AddDays(taskRec.Cad);
+                            break;
+                    }
+                    baseDT = dtNext;
+                    maxIter--;
                 }
             }
             catch (Exception exc)
