diff --git a/MP.Stats/Components/TaskExeList.razor b/MP.Stats/Components/TaskExeList.razor new file mode 100644 index 00000000..ae7c9327 --- /dev/null +++ b/MP.Stats/Components/TaskExeList.razor @@ -0,0 +1,5 @@ +

TaskExeList

+ +@code { + +} diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 9690072f..ff2c7f38 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,8 +4,8 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.16.2403.2819 - 6.16.2403.2819 + 6.16.2404.0210 + 6.16.2404.0210 diff --git a/MP.Stats/Pages/TaskScheduler.razor b/MP.Stats/Pages/TaskScheduler.razor index 84a68d64..55994218 100644 --- a/MP.Stats/Pages/TaskScheduler.razor +++ b/MP.Stats/Pages/TaskScheduler.razor @@ -1,112 +1,129 @@ @page "/TaskScheduler" -
-
-
-
- TaskList -
-
-
- @if (currRecord == null) - { - - } - else - { - - } - +
+
+
+
+
+
+ TaskList +
+
+
+ @if (currRecord == null) + { + + } + else + { + + } + +
+
+ +
+
+ @if (ListRecords == null) + { + + } + else if (totalCount == 0) + { +
Nessun record trovato
+ } + else + { +
+
+ + + + + + + + + + @if (detRecord == null) + { + + + + } + + + + @foreach (var record in ListRecords) + { + + + + + + + + @if (detRecord == null) + { + + + + } + + } + +
+ + #TaskTipoCommandSchedulazioneLastNextResult
+ + @if (currRecord == null) + { + + } + else + { + @* *@ + + } + @record.TaskId +
@record.Name
+
@record.Descript
+
+ @record.TType + +
@record.Command
+
@record.Args
+
@record.Freq × @record.Cad +
@($"{record.DtLastExec:yyyy-MM-dd}")
+
@($"{record.DtLastExec:ddd HH:mm:ss}")
+
+
@($"{record.DtNextExec:yyyy-MM-dd}")
+
@($"{record.DtNextExec:ddd HH:mm:ss}")
+
+
@record.LastDuration sec
+
@record.LastResult
+
+
+
+ } +
+
- -
-
- @if (ListRecords == null) - { - - } - else if (totalCount == 0) - { -
Nessun record trovato
- } - else - { -
-
- - - - - - - - - - - - - - - - @foreach (var record in ListRecords) - { - - - - - - - - - - - - } - -
- - #TaskTipoCommandSchedulazioneLastNextResult
- @if (currRecord == null) - { - - } - else - { - @* *@ - - } - @record.TaskId -
@record.Name
-
@record.Descript
-
- @record.TType - -
@record.Command
-
@record.Args
-
@record.Freq × @record.Cad -
@($"{record.DtLastExec:yyyy-MM-dd}")
-
@($"{record.DtLastExec:ddd HH:mm:ss}")
-
-
@($"{record.DtNextExec:yyyy-MM-dd}")
-
@($"{record.DtNextExec:ddd HH:mm:ss}")
-
-
@record.LastDuration sec
-
@record.LastResult
-
-
-
- } -
- + @if (detRecord != null) + { +
+ +
+ }
\ No newline at end of file diff --git a/MP.Stats/Pages/TaskScheduler.razor.cs b/MP.Stats/Pages/TaskScheduler.razor.cs index b0f9807d..977a744e 100644 --- a/MP.Stats/Pages/TaskScheduler.razor.cs +++ b/MP.Stats/Pages/TaskScheduler.razor.cs @@ -28,6 +28,10 @@ namespace MP.Stats.Pages catch { } } + else if (detRecord != null) + { + answ = (detRecord.TaskId == TaskId) ? "table-info" : ""; + } return answ; } @@ -58,6 +62,11 @@ namespace MP.Stats.Pages [Inject] protected IJSRuntime JSRuntime { get; set; } + protected string mainCss + { + get => detRecord == null ? "col-12" : "col-6"; + } + [Inject] protected MessageService MessageService { get; set; } @@ -111,6 +120,7 @@ namespace MP.Stats.Pages protected async Task doCancel() { currRecord = null; + detRecord = null; await ReloadData(); } @@ -131,32 +141,15 @@ namespace MP.Stats.Pages protected async Task doReset() { + detRecord = null; currRecord = null; await ReloadData(); } - protected async Task doSave() + protected async Task doSelect(TaskListModel selRec) { - if (currRecord != null) - { -#if false - bool done = false; - // salvo verificando status... - if (currOrder.OrderStatus == 10 || currOrder.OrderStatus == 10000) - { - done = await WDService.OrderUpdateDescript(currOrder.OrderId, currOrder.OrderExtCode, currOrder.OrderDescript); - } - else - { - done = await WDService.OrderUpdatePromDate(currOrder.OrderId, currOrder.DateProm); - } - // resetto info - currOrder = null; - isEdit = false; - await WDService.OrdersFlushCache(); -#endif - await ReloadData(); - } + detRecord = selRec; + await ReloadData(); } protected async Task ForceReload(int newNum) @@ -232,6 +225,7 @@ namespace MP.Stats.Pages #region Private Fields private TaskListModel currRecord = null; + private TaskListModel detRecord = null; private List ListRecords; private List SearchRecords; diff --git a/MP.Stats/Pages/Test.razor b/MP.Stats/Pages/Test.razor index fc344409..e4396842 100644 --- a/MP.Stats/Pages/Test.razor +++ b/MP.Stats/Pages/Test.razor @@ -1,7 +1,5 @@ @page "/test" -@using MP.Stats.Components.ChartJs -

Test Normal plot

diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 1da11f4c..ce6dd787 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: 6.16.2403.2819

+

Versione: 6.16.2404.0210


Note di rilascio:
    diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 9f442f9f..08eaa4b9 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2403.2819 +6.16.2404.0210 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 92ddb2d6..e3d67763 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2403.2819 + 6.16.2404.0210 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