diff --git a/MP.Stats/Pages/TaskScheduler.razor b/MP.Stats/Pages/TaskScheduler.razor
index 22e6d441..ae3e8fa0 100644
--- a/MP.Stats/Pages/TaskScheduler.razor
+++ b/MP.Stats/Pages/TaskScheduler.razor
@@ -55,7 +55,7 @@
|
|
- # |
+ Ord |
Task |
Tipo |
Command |
@@ -86,7 +86,25 @@
}
- @record.TaskId |
+
+ @if (record.Ordinal == minOrdinal)
+ {
+
+ }
+ else
+ {
+
+ }
+ @record.Ordinal
+ @if (record.Ordinal == maxOrdinal)
+ {
+
+ }
+ else
+ {
+
+ }
+ |
@record.Name
@record.Descript
diff --git a/MP.Stats/Pages/TaskScheduler.razor.cs b/MP.Stats/Pages/TaskScheduler.razor.cs
index 45c35e3a..1fe4e398 100644
--- a/MP.Stats/Pages/TaskScheduler.razor.cs
+++ b/MP.Stats/Pages/TaskScheduler.razor.cs
@@ -78,6 +78,8 @@ namespace MP.Stats.Pages
protected MpStatsService StatService { get; set; }
protected int totalCount { get; set; } = 0;
+ protected int minOrdinal { get; set; } = 0;
+ protected int maxOrdinal { get; set; } = 999;
protected Task2ExeType TypeSel
{
@@ -152,8 +154,11 @@ namespace MP.Stats.Pages
protected async Task doRun(TaskListModel selRec)
{
// SE non è ancora scaduto chiedo conferma
- if (!await JSRuntime.InvokeAsync("confirm", $"Confermi esecuzione forzata task non scaduto?{Environment.NewLine}[{selRec.TaskId}]: {selRec.Name} - {selRec.Descript}{Environment.NewLine}Prossima schedulazione: {selRec.DtNextExec:yyyy-MM-dd HH:mm:ss}"))
- return;
+ if (selRec.DtNextExec > DateTime.Now)
+ {
+ if (!await JSRuntime.InvokeAsync("confirm", $"Confermi esecuzione forzata task non scaduto?{Environment.NewLine}[{selRec.TaskId}]: {selRec.Name} - {selRec.Descript}{Environment.NewLine}Prossima schedulazione: {selRec.DtNextExec:yyyy-MM-dd HH:mm:ss}"))
+ return;
+ }
// imposto tempo atteso esecuzione da ultimo...
isLoading = true;
@@ -240,6 +245,7 @@ namespace MP.Stats.Pages
protected async Task ResetFilter(SelectData newFilter)
{
clearFile();
+ detRecord = null;
currRecord = null;
SearchRecords = null;
ListRecords = null;
@@ -269,6 +275,14 @@ namespace MP.Stats.Pages
await ReloadData();
}
+ protected async Task doMove(TaskListModel currRec, bool goUp)
+ {
+ await StatService.TaskListMove(currRec, goUp);
+ detRecord = null;
+ currRecord = null;
+ await ReloadData();
+ }
+
#endregion Protected Methods
#region Private Fields
@@ -340,6 +354,10 @@ namespace MP.Stats.Pages
{
SearchRecords = await StatService.TaskListAll(TypeSel, "");
totalCount = SearchRecords.Count;
+ var firstRec = SearchRecords.OrderBy(x => x.Ordinal).FirstOrDefault();
+ minOrdinal = firstRec != null ? firstRec.Ordinal : 0;
+ var lastRec = SearchRecords.OrderByDescending(x => x.Ordinal).FirstOrDefault();
+ maxOrdinal = lastRec != null ? lastRec.Ordinal : 9999;
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
}
diff --git a/MP.Stats/Program.cs b/MP.Stats/Program.cs
index 0922ce22..cf9c5b1a 100644
--- a/MP.Stats/Program.cs
+++ b/MP.Stats/Program.cs
@@ -23,7 +23,7 @@ namespace MP.Stats
.ConfigureLogging(logging =>
{
logging.ClearProviders();
- logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Debug);
+ logging.SetMinimumLevel(LogLevel.Information);
//logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
})
.UseNLog();
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index 6ef61bf4..2b9ffd5f 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
- Versione: 6.16.2404.0309
+ Versione: 6.16.2404.0311
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 5ba9d076..7d08573a 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2404.0309
+6.16.2404.0311
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 9f6a0068..5414356a 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2404.0309
+ 6.16.2404.0311
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.Stats/appsettings.Production.json b/MP.Stats/appsettings.Production.json
index d11e6522..7a46be05 100644
--- a/MP.Stats/appsettings.Production.json
+++ b/MP.Stats/appsettings.Production.json
@@ -8,8 +8,9 @@
}
},
"AllowedHosts": "*",
- "ConnectionStrings": {
- "DefaultConnection": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true",
- "MP.Stats": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;"
- }
+ "ConnectionStrings": {
+ "Redis": "localhost:6379,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true",
+ "DefaultConnection": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true",
+ "MP.Stats": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;"
+ }
}
\ No newline at end of file
diff --git a/MP.Stats/appsettings.json b/MP.Stats/appsettings.json
index 0c2e0de4..6e1fcc91 100644
--- a/MP.Stats/appsettings.json
+++ b/MP.Stats/appsettings.json
@@ -8,8 +8,7 @@
},
"AllowedHosts": "*",
"ConnectionStrings": {
- "Redis": "localhost:6379,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true",
- //"Redis": "localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true",
+ "Redis": "localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true",
"DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_STATS;Trusted_Connection=True;MultipleActiveResultSets=true",
"MP.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.STATS;"
},
|