diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index b1d6c7e9..9350c1a4 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -1,9 +1,17 @@ 
- -
-
- -
+ +
+
+

FILTRI

+ +
+
+
+ Seleziona i filtri per: +
+
+
+
-
-
-
-
- @if (showParam) - { - -
- - - - - -
- } - else - { - - } +
+ + +
+
+ +
diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor index 1be0c622..525ee3b5 100644 --- a/MP.SPEC/Components/ParamsFilter.razor +++ b/MP.SPEC/Components/ParamsFilter.razor @@ -1,115 +1,111 @@ -
-
-
-
+
+
- @if (!liveUpdate) - { - - } - else - { - - } -
-
- @if (selMacchina != "*") - { - - } -
-
- @if (snapshotDone) - { - - } -
-
-
- -
-
- @if (showEditPar) + @if (!liveUpdate) { -
- - - - - -
+ } else { -
- -
+ } -
-
- - - - - @if (selDtMax == null) +
+
+ @if (selMacchina != "*") + { + + } +
+
+ @if (snapshotDone) + { + + } +
+ +
+ +
+
+

FILTRI

+ +
+
+
+ Seleziona i filtri per: +
+
+ + +
+
+ + - - + foreach (var item in ListFlux) + { + + } } -
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs index 9930b251..76cd2905 100644 --- a/MP.SPEC/Components/ParamsFilter.razor.cs +++ b/MP.SPEC/Components/ParamsFilter.razor.cs @@ -99,7 +99,8 @@ namespace MP.SPEC.Components } } } - + protected bool showParam { get; set; } = false; + protected bool selDt { get; set; } = false; protected string selMacchina { get => SelFilter.IdxMacchina; @@ -185,7 +186,7 @@ namespace MP.SPEC.Components // copio il filtro var currFilt = SelFilter; // fermo update - currFilt.LiveUpdate = false; + //currFilt.LiveUpdate = false; currFilt.CurrPage = 0; currFilt.lastUpdate = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss}"; currFilt.dtMax = RoundDatetime(5); @@ -193,6 +194,7 @@ namespace MP.SPEC.Components SelFilter = currFilt; } + protected void startTimer() { aTimer = new System.Timers.Timer(5000); @@ -310,6 +312,26 @@ namespace MP.SPEC.Components { FilterChanged.InvokeAsync(SelFilter); } + private void toggleShowParams() + { + showParam = !showParam; + } + private void untoggleSelDt() + { + selDt = false; + liveUpdate = true; + } + private void toggleSelDt() + { + selDt = true; + liveUpdate = false; + + if (selDtMax == null) + { + setDtMax(); + } + + } #endregion Private Methods } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 3abca903..ccb08c71 100644 --- a/MP.SPEC/MP.SPEC.csproj +++ b/MP.SPEC/MP.SPEC.csproj @@ -5,7 +5,7 @@ enable enable MP.SPEC - 6.16.2210.516 + 6.16.2210.616 diff --git a/MP.SPEC/Pages/Test.razor b/MP.SPEC/Pages/Test.razor new file mode 100644 index 00000000..be6e0035 --- /dev/null +++ b/MP.SPEC/Pages/Test.razor @@ -0,0 +1,32 @@ +@page "/Test" + +

Test

+ + +
+
+
Offcanvas
+ +
+
+
+ Some text as placeholder. In real life you can have the elements you have chosen. Like, text, images, lists, etc. +
+ +
+
+ +@code { + +} diff --git a/MP.SPEC/Pages/_Layout.cshtml b/MP.SPEC/Pages/_Layout.cshtml index 060b003f..9353216d 100644 --- a/MP.SPEC/Pages/_Layout.cshtml +++ b/MP.SPEC/Pages/_Layout.cshtml @@ -30,7 +30,9 @@ 🗙
+ + @*Gestione autoriconnessione: https://github.com/dotnet/aspnetcore/issues/38305 (vedere anche https://docs.microsoft.com/it-it/aspnet/core/blazor/fundamentals/signalr?view=aspnetcore-6.0#modify-the-reconnection-handler-blazor-server)*@