diff --git a/MP.INVE/MP.INVE.csproj b/MP.INVE/MP.INVE.csproj
index 2d758695..b03cdbda 100644
--- a/MP.INVE/MP.INVE.csproj
+++ b/MP.INVE/MP.INVE.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.INVE
- 8.16.2605.2808
+ 8.16.2605.2809
diff --git a/MP.INVE/Resources/ChangeLog.html b/MP.INVE/Resources/ChangeLog.html
index f21a80e9..8829f265 100644
--- a/MP.INVE/Resources/ChangeLog.html
+++ b/MP.INVE/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOINVE
- Versione: 8.16.2605.2808
+ Versione: 8.16.2605.2809
Note di rilascio:
-
diff --git a/MP.INVE/Resources/VersNum.txt b/MP.INVE/Resources/VersNum.txt
index 828db479..c5710be8 100644
--- a/MP.INVE/Resources/VersNum.txt
+++ b/MP.INVE/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2605.2808
+8.16.2605.2809
diff --git a/MP.INVE/Resources/manifest.xml b/MP.INVE/Resources/manifest.xml
index d1535baa..46859ddf 100644
--- a/MP.INVE/Resources/manifest.xml
+++ b/MP.INVE/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2605.2808
+ 8.16.2605.2809
https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip
https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html
false
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index dd8f7d78..2c60b1aa 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
net8.0
MP.Land
- 8.16.2605.2808
+ 8.16.2605.2809
Debug;Release;Debug_LiManDebug
en
True
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index 474c8f3d..241e7d7d 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo Tablet MAPO - DotNet6
-
Versione: 8.16.2605.2808
+ Versione: 8.16.2605.2809
Note di rilascio:
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 828db479..c5710be8 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2605.2808
+8.16.2605.2809
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index fc2d24fe..6f8aeb69 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2605.2808
+ 8.16.2605.2809
https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip
https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html
false
diff --git a/MP.MON/MP.MON.csproj b/MP.MON/MP.MON.csproj
index 34adfe61..d59e8e78 100644
--- a/MP.MON/MP.MON.csproj
+++ b/MP.MON/MP.MON.csproj
@@ -6,7 +6,7 @@
enable
MP.MON
$(AssemblyName.Replace(' ', '_'))
- 8.16.2605.2808
+ 8.16.2605.2809
diff --git a/MP.MON/Resources/ChangeLog.html b/MP.MON/Resources/ChangeLog.html
index 1fc88236..64ea7d73 100644
--- a/MP.MON/Resources/ChangeLog.html
+++ b/MP.MON/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 8.16.2605.2808
+ Versione: 8.16.2605.2809
Note di rilascio:
-
diff --git a/MP.MON/Resources/VersNum.txt b/MP.MON/Resources/VersNum.txt
index 828db479..c5710be8 100644
--- a/MP.MON/Resources/VersNum.txt
+++ b/MP.MON/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2605.2808
+8.16.2605.2809
diff --git a/MP.MON/Resources/manifest.xml b/MP.MON/Resources/manifest.xml
index 5d52ff5f..a39501a5 100644
--- a/MP.MON/Resources/manifest.xml
+++ b/MP.MON/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2605.2808
+ 8.16.2605.2809
https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.MON.zip
https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html
false
diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj
index 3601b540..85d82cfd 100644
--- a/MP.Prog/MP.Prog.csproj
+++ b/MP.Prog/MP.Prog.csproj
@@ -3,7 +3,7 @@
net8.0
MP.Prog
- 8.16.2605.2808
+ 8.16.2605.2809
True
diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html
index e99d3083..a67c97db 100644
--- a/MP.Prog/Resources/ChangeLog.html
+++ b/MP.Prog/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo gestione Programmi MAPO
-
Versione: 8.16.2605.2808
+ Versione: 8.16.2605.2809
Note di rilascio:
diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt
index 828db479..c5710be8 100644
--- a/MP.Prog/Resources/VersNum.txt
+++ b/MP.Prog/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2605.2808
+8.16.2605.2809
diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml
index 70a2dbb7..5fffba9d 100644
--- a/MP.Prog/Resources/manifest.xml
+++ b/MP.Prog/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2605.2808
+ 8.16.2605.2809
https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip
https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html
false
diff --git a/MP.RIOC/MP.RIOC.csproj b/MP.RIOC/MP.RIOC.csproj
index fa7dd417..d997ea7a 100644
--- a/MP.RIOC/MP.RIOC.csproj
+++ b/MP.RIOC/MP.RIOC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.RIOC
- 8.16.2605.2808
+ 8.16.2605.2809
diff --git a/MP.RIOC/Resources/ChangeLog.html b/MP.RIOC/Resources/ChangeLog.html
index 98241e80..9ecf5dd5 100644
--- a/MP.RIOC/Resources/ChangeLog.html
+++ b/MP.RIOC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MP-RIOC
-
Versione: 8.16.2605.2808
+ Versione: 8.16.2605.2809
Note di rilascio:
-
diff --git a/MP.RIOC/Resources/VersNum.txt b/MP.RIOC/Resources/VersNum.txt
index 828db479..c5710be8 100644
--- a/MP.RIOC/Resources/VersNum.txt
+++ b/MP.RIOC/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2605.2808
+8.16.2605.2809
diff --git a/MP.RIOC/Resources/manifest.xml b/MP.RIOC/Resources/manifest.xml
index 67258ee2..375ab3ee 100644
--- a/MP.RIOC/Resources/manifest.xml
+++ b/MP.RIOC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2605.2808
+ 8.16.2605.2809
https://nexus.steamware.net/repository/SWS/MP-RIOC/stable/LAST/MP.RIOC.zip
https://nexus.steamware.net/repository/SWS/MP-RIOC/stable/LAST/ChangeLog.html
false
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index d793d9c7..dd106114 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,7 +4,7 @@
net8.0
MP.Stats
826e877c-ba70-4253-84cb-d0b1cafd4440
- 8.16.2605.2808
+ 8.16.2605.2809
true
en
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index bf5b6ad9..3c0aaeec 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
-
Versione: 8.16.2605.2808
+ Versione: 8.16.2605.2809
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 828db479..c5710be8 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-8.16.2605.2808
+8.16.2605.2809
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 6a52562d..0f083e08 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 8.16.2605.2808
+ 8.16.2605.2809
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html
false
diff --git a/MP.TaskMan/Controllers/MpTaskController.cs b/MP.TaskMan/Controllers/MpTaskController.cs
index 0ccb73bf..fadf73d4 100644
--- a/MP.TaskMan/Controllers/MpTaskController.cs
+++ b/MP.TaskMan/Controllers/MpTaskController.cs
@@ -2,16 +2,11 @@
using Microsoft.Extensions.Configuration;
using MP.TaskMan.Models;
using NLog;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using static MP.TaskMan.Objects.Enums;
namespace MP.TaskMan.Controllers
{
- public class MpTaskController : IDisposable
+ public class MpTaskController
{
#region Public Constructors
@@ -87,11 +82,7 @@ namespace MP.TaskMan.Controllers
return dtNext;
}
- public void Dispose()
- {
- _configuration = null;
- }
-
+
///
/// Chiamata esecuzione di un singolo task programmato, SE in stato abilitato
///
diff --git a/MP.TaskMan/Services/TaskService.cs b/MP.TaskMan/Services/TaskService.cs
index 7727f72a..abbf331e 100644
--- a/MP.TaskMan/Services/TaskService.cs
+++ b/MP.TaskMan/Services/TaskService.cs
@@ -16,7 +16,7 @@ using static MP.TaskMan.Objects.Enums;
namespace MP.TaskMan.Services
{
- public class TaskService : BaseServ, IDisposable
+ public class TaskService : BaseServ
{
#region Public Constructors
@@ -88,15 +88,6 @@ namespace MP.TaskMan.Services
#region Public Methods
- public void Dispose()
- {
- // Clear database controller
- MLController.Dispose();
- // redis dispose
- redisConn = null;
- redisDb = null;
- }
-
///
/// Chiamata esecuzione di un singolo task programmato
///
@@ -136,18 +127,22 @@ namespace MP.TaskMan.Services
{
var callResp = await RCallService.CallRestGet(TaskRec.Command, TaskRec.Args);
DateTime dtEnd = DateTime.Now;
- string formattedJson = JValue.Parse(callResp.Content).ToString(Formatting.Indented);
- TaskExecModel tExeMod = new TaskExecModel()
+ if (callResp != null && !string.IsNullOrEmpty(callResp.Content))
{
- DtEnd = dtEnd,
- DtStart = dtStart,
- IsError = callResp.StatusCode != System.Net.HttpStatusCode.OK,
- TaskId = TaskRec.TaskId,
- // deserializzazione come json indentato?!?
- Result = formattedJson// $"{callResp.Content}".Replace("\"", ""),
- };
- // salvo su DB
- answ = MLController.TaskExecSaveExecuted(TaskRec.TaskId, SchedNext, tExeMod);
+
+ string formattedJson = JValue.Parse(callResp.Content).ToString(Formatting.Indented);
+ TaskExecModel tExeMod = new TaskExecModel()
+ {
+ DtEnd = dtEnd,
+ DtStart = dtStart,
+ IsError = callResp.StatusCode != System.Net.HttpStatusCode.OK,
+ TaskId = TaskRec.TaskId,
+ // deserializzazione come json indentato?!?
+ Result = formattedJson// $"{callResp.Content}".Replace("\"", ""),
+ };
+ // salvo su DB
+ answ = MLController.TaskExecSaveExecuted(TaskRec.TaskId, SchedNext, tExeMod);
+ }
}
break;
diff --git a/MP.TaskMan/TaskExeList.razor.cs b/MP.TaskMan/TaskExeList.razor.cs
index 2ffdad04..8fa45d62 100644
--- a/MP.TaskMan/TaskExeList.razor.cs
+++ b/MP.TaskMan/TaskExeList.razor.cs
@@ -95,8 +95,8 @@ namespace MP.TaskMan
private static Logger Log = LogManager.GetCurrentClassLogger();
- private List ListRecords;
- private List SearchRecords;
+ private List ListRecords = new();
+ private List SearchRecords = new();
#endregion Private Fields
@@ -112,19 +112,26 @@ namespace MP.TaskMan
private async Task ReloadData()
{
- SearchRecords = await TService.TaskExecGetFilt(CurrRecord.TaskId, 1000, "");
- // se non tutti filtro...
- if (ShowErrorMode != 0)
+ if (CurrRecord != null)
{
- if (ShowErrorMode == 1)
+ SearchRecords = await TService.TaskExecGetFilt(CurrRecord.TaskId, 1000, "");
+ // se non tutti filtro...
+ if (ShowErrorMode != 0)
{
- SearchRecords = SearchRecords.FindAll(x => x.IsError);
- }
- else if (ShowErrorMode == 2)
- {
- SearchRecords = SearchRecords.FindAll(x => !x.IsError);
+ if (ShowErrorMode == 1)
+ {
+ SearchRecords = SearchRecords.FindAll(x => x.IsError);
+ }
+ else if (ShowErrorMode == 2)
+ {
+ SearchRecords = SearchRecords.FindAll(x => !x.IsError);
+ }
}
}
+ else
+ {
+ SearchRecords = new();
+ }
totalCount = SearchRecords.Count;
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
}
diff --git a/MP.TaskMan/TaskList.razor.cs b/MP.TaskMan/TaskList.razor.cs
index 09de8099..30eabb1a 100644
--- a/MP.TaskMan/TaskList.razor.cs
+++ b/MP.TaskMan/TaskList.razor.cs
@@ -205,8 +205,11 @@ namespace MP.TaskMan
protected void ResetData()
{
- TService.rollBackEdit(currRecord);
- currRecord = null;
+ if (currRecord != null)
+ {
+ TService.rollBackEdit(currRecord);
+ currRecord = null;
+ }
}
protected double righDiv(double num, double den)
diff --git a/MP.TaskMan/TaskListTable.razor.cs b/MP.TaskMan/TaskListTable.razor.cs
index 58d7f59f..2449ca37 100644
--- a/MP.TaskMan/TaskListTable.razor.cs
+++ b/MP.TaskMan/TaskListTable.razor.cs
@@ -10,10 +10,10 @@ namespace MP.TaskMan
#region Public Properties
[Parameter]
- public int CodGroup { get; set; } = 0;
+ public List AllRecords { get; set; } = new List();
[Parameter]
- public List AllRecords { get; set; } = new List();
+ public int CodGroup { get; set; } = 0;
[Parameter]
public EventCallback EC_Cancel { get; set; }
@@ -207,7 +207,6 @@ namespace MP.TaskMan
private int currPage = 1;
private TaskListModel? DetailTaskId = null;
- private bool isLoading = false;
private List ListRecords = new List();
private int maxOrdinal = 999;
private int minOrdinal = 0;