From 81fd2820df78b542ab056d493cc624d367c1a2af Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Wed, 5 Oct 2022 17:39:51 +0200 Subject: [PATCH 1/3] Params filter con dots INIZIO --- MP.SPEC/Components/DossiersFilter.razor | 91 +++++++----- MP.SPEC/Components/ParamsFilter.razor | 182 +++++++++++------------ MP.SPEC/Components/ParamsFilter.razor.cs | 13 +- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 7 files changed, 159 insertions(+), 135 deletions(-) diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index b1d6c7e9..8378557c 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -2,54 +2,67 @@
+ @if (!showParam) + { +
+
+
+ + + + +
+
+
+ } -
- - - - - -
-
-
+ + + +
+
+
+
@if (showParam) { +
-
- - - - - +
+ + + + + +
} else { - + }
diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor index 1be0c622..be6a984b 100644 --- a/MP.SPEC/Components/ParamsFilter.razor +++ b/MP.SPEC/Components/ParamsFilter.razor @@ -1,103 +1,100 @@ +
-
-
-
+
+
- @if (!liveUpdate) - { - - } - else - { - - } -
-
- @if (selMacchina != "*") - { - - } -
-
- @if (snapshotDone) - { - - } -
-
-
- -
-
- @if (showEditPar) + @if (!liveUpdate) { -
- - - - - -
+ } else { -
- -
+ } +
+
+ @if (selMacchina != "*") + { + + } +
+
+ @if (snapshotDone) + { + + } +
+
+
+
+ + + + +
+ @if (showParam) + { +
+ + + + + +
+ + } + else + {
- - - - + @if (selDtMax == null) { @@ -108,10 +105,13 @@ + + }
-
+ + }
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs index 9930b251..8093512e 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; @@ -192,6 +193,7 @@ namespace MP.SPEC.Components currFilt.dtMin = RoundDatetime(5).AddHours(-numOreAnticipoSnapshot); SelFilter = currFilt; } + protected void startTimer() { @@ -310,6 +312,15 @@ namespace MP.SPEC.Components { FilterChanged.InvokeAsync(SelFilter); } + private void toggleShowParams() + { + showParam = !showParam; + } + private void untoggleSelDt() + { + selDt = true; + liveUpdate = true; + } #endregion Private Methods } diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index 3abca903..dafe7145 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.517 diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html index e0f700ec..396e50ac 100644 --- a/MP.SPEC/Resources/ChangeLog.html +++ b/MP.SPEC/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2210.516

+

Versione: 6.16.2210.517


Note di rilascio:
  • diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt index 401aa198..ee6d4dff 100644 --- a/MP.SPEC/Resources/VersNum.txt +++ b/MP.SPEC/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2210.516 +6.16.2210.517 diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml index cb2da6ab..3b015d2a 100644 --- a/MP.SPEC/Resources/manifest.xml +++ b/MP.SPEC/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2210.516 + 6.16.2210.517 https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html false From 5b12ac47d3cf4508715483b5cbbd2a51155d5aa9 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 6 Oct 2022 13:10:12 +0200 Subject: [PATCH 2/3] update Filter --- MP.SPEC/Components/ParamsFilter.razor | 9 ++++----- MP.SPEC/Components/ParamsFilter.razor.cs | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor index be6a984b..b9b098fc 100644 --- a/MP.SPEC/Components/ParamsFilter.razor +++ b/MP.SPEC/Components/ParamsFilter.razor @@ -94,10 +94,10 @@ {
    - - @if (selDtMax == null) + @if (selDt) { - + + } else { @@ -105,8 +105,7 @@ - - + }
    diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs index 8093512e..76cd2905 100644 --- a/MP.SPEC/Components/ParamsFilter.razor.cs +++ b/MP.SPEC/Components/ParamsFilter.razor.cs @@ -186,14 +186,14 @@ 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); currFilt.dtMin = RoundDatetime(5).AddHours(-numOreAnticipoSnapshot); SelFilter = currFilt; } - + protected void startTimer() { @@ -318,9 +318,20 @@ namespace MP.SPEC.Components } private void untoggleSelDt() { - selDt = true; + selDt = false; liveUpdate = true; } + private void toggleSelDt() + { + selDt = true; + liveUpdate = false; + + if (selDtMax == null) + { + setDtMax(); + } + + } #endregion Private Methods } From 90d4a46087a851c8b620267c2c31c0c4a7702766 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 6 Oct 2022 16:27:49 +0200 Subject: [PATCH 3/3] Fine fix filtri params e dossier --- MP.SPEC/Components/DossiersFilter.razor | 113 ++++++++++-------------- MP.SPEC/Components/ParamsFilter.razor | 103 +++++++++++---------- MP.SPEC/MP.SPEC.csproj | 2 +- MP.SPEC/Pages/Test.razor | 32 +++++++ MP.SPEC/Pages/_Layout.cshtml | 2 + MP.SPEC/Resources/ChangeLog.html | 2 +- MP.SPEC/Resources/VersNum.txt | 2 +- MP.SPEC/Resources/manifest.xml | 2 +- 8 files changed, 137 insertions(+), 121 deletions(-) create mode 100644 MP.SPEC/Pages/Test.razor diff --git a/MP.SPEC/Components/DossiersFilter.razor b/MP.SPEC/Components/DossiersFilter.razor index 8378557c..9350c1a4 100644 --- a/MP.SPEC/Components/DossiersFilter.razor +++ b/MP.SPEC/Components/DossiersFilter.razor @@ -1,69 +1,54 @@ 
    - -
    -
    - @if (!showParam) - { -
    -
    -
    - - - - -
    -
    -
    - } - + +
    +
    +

    FILTRI

    +
    - - - -
    -
    -
    -
    - @if (showParam) - { -
    - -
    - - - - - -
    -
    - } - else - { - - } +
    +
    + Seleziona i filtri per: +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    diff --git a/MP.SPEC/Components/ParamsFilter.razor b/MP.SPEC/Components/ParamsFilter.razor index b9b098fc..525ee3b5 100644 --- a/MP.SPEC/Components/ParamsFilter.razor +++ b/MP.SPEC/Components/ParamsFilter.razor @@ -1,5 +1,3 @@ - -
    @@ -39,35 +37,55 @@ }
    +
    -
    -
    - - - - + +
    +
    +

    FILTRI

    +
    - @if (showParam) - { -
    +
    +
    + Seleziona i filtri per: +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    -
    - - } - else - { -
    -
    - @if (selDt) - { - - - } - else - { - - - - - - } -
    -
    - - } +
    diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj index dafe7145..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.517 + 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)*@