From ae30f49d13e20f50c39c067e90327aa84c4dd6c3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 23 Aug 2021 19:53:52 +0200 Subject: [PATCH 1/5] Fix display ordini su mobile --- GWMS.UI/Pages/Orders.razor | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/GWMS.UI/Pages/Orders.razor b/GWMS.UI/Pages/Orders.razor index f4930b7..67f44fd 100644 --- a/GWMS.UI/Pages/Orders.razor +++ b/GWMS.UI/Pages/Orders.razor @@ -6,11 +6,16 @@
-
+
Elenco Ordini
-
+
+
+
+ +
+
@@ -21,6 +26,16 @@
+
+ @if (ShowAddNew) + { + + } +
+
+
+
+
@@ -37,6 +52,10 @@
+
+
+
+
@@ -75,17 +94,6 @@
-
-
- -
-
-
- @if (ShowAddNew) - { - - } -
From 51686f4ed7674da74193db402ef2b1e1fc54f738 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 24 Aug 2021 08:46:34 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Fix=20display=20men=C3=B9=20laterale?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GWMS.UI/GWMS.UI.csproj | 2 +- GWMS.UI/Pages/Orders.razor | 2 +- GWMS.UI/Pages/Suppliers.razor | 10 +++++-- GWMS.UI/Shared/NavMenu.razor | 56 ++++++++++++++++++++--------------- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 7 files changed, 44 insertions(+), 32 deletions(-) diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index f40c8ac..c2760d7 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,7 +2,7 @@ net5.0 - 1.0.2108.2319 + 1.0.2108.2408 95c9f021-52d1-4390-a670-5810b7b777b0 diff --git a/GWMS.UI/Pages/Orders.razor b/GWMS.UI/Pages/Orders.razor index 67f44fd..459205b 100644 --- a/GWMS.UI/Pages/Orders.razor +++ b/GWMS.UI/Pages/Orders.razor @@ -115,7 +115,7 @@ {
- +
diff --git a/GWMS.UI/Pages/Suppliers.razor b/GWMS.UI/Pages/Suppliers.razor index 498c11c..c244503 100644 --- a/GWMS.UI/Pages/Suppliers.razor +++ b/GWMS.UI/Pages/Suppliers.razor @@ -7,10 +7,10 @@
-
+
Ordini Fornitore
-
+
@@ -28,6 +28,10 @@
+
+
+
+
@@ -86,7 +90,7 @@ {
-
+
diff --git a/GWMS.UI/Shared/NavMenu.razor b/GWMS.UI/Shared/NavMenu.razor index 0def308..cca5606 100644 --- a/GWMS.UI/Shared/NavMenu.razor +++ b/GWMS.UI/Shared/NavMenu.razor @@ -1,15 +1,23 @@ -
- - @**@ -
-
- -
-
- MAPO.GWMS -
-
- +
+
+ @if (showText) + { + + + @**@ + + } + else + { + + + @**@ + + } + + MAPO.GWMS + +
@@ -66,18 +74,18 @@ Utenti -
  • - - - Job Scheduler - -
    • -
  • - - - Setup Parametri - -
    • + @*
  • + + + Job Scheduler + +
    • +
  • + + + Setup Parametri + +
    • *@
    diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index e8afc62..be9c5d4 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

    Versione: 1.0.2108.2319

    +

    Versione: 1.0.2108.2408


    Note di rilascio:
    • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 336623c..1873de6 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2108.2319 +1.0.2108.2408 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index f5c0fea..c0da644 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2108.2319 + 1.0.2108.2408 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false From 527d29eac31c60f7bbbc09836eac9326016d8a52 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 24 Aug 2021 08:58:12 +0200 Subject: [PATCH 3/5] Aggiunta estensione x recupero QueryString --- .../Extensions/NavigationManagerExtension.cs | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 GWMS.UI/Extensions/NavigationManagerExtension.cs diff --git a/GWMS.UI/Extensions/NavigationManagerExtension.cs b/GWMS.UI/Extensions/NavigationManagerExtension.cs new file mode 100644 index 0000000..ae4544e --- /dev/null +++ b/GWMS.UI/Extensions/NavigationManagerExtension.cs @@ -0,0 +1,30 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.WebUtilities; + +namespace GWMS.UI.Extensions +{ + public static class NavigationManagerExtension + { + #region Public Methods + + public static T ExtractQueryStringByKey(this NavigationManager navManager, string key) + { + var uri = navManager.ToAbsoluteUri(navManager.Uri); + QueryHelpers.ParseQuery(uri.Query) + .TryGetValue(key, out var queryValue); + + if (typeof(T).Equals(typeof(int))) + { + int.TryParse(queryValue, out int result); + return (T)(object)result; + } + + if (typeof(T).Equals(typeof(string))) + return (T)(object)queryValue.ToString(); + + return default; + } + + #endregion Public Methods + } +} \ No newline at end of file From bc0ff628fe25dc71315ae2efd2bd50d8f4e2a7b5 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 24 Aug 2021 08:58:27 +0200 Subject: [PATCH 4/5] Cleanup --- GWMS.UI/Pages/Transporters.razor.cs | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/GWMS.UI/Pages/Transporters.razor.cs b/GWMS.UI/Pages/Transporters.razor.cs index 5963a17..fd8a54c 100644 --- a/GWMS.UI/Pages/Transporters.razor.cs +++ b/GWMS.UI/Pages/Transporters.razor.cs @@ -19,7 +19,6 @@ namespace GWMS.UI.Pages private List ListRecords; private List PlantsList; private List SearchRecords; - private List TransportersList; #endregion Private Fields @@ -98,28 +97,6 @@ namespace GWMS.UI.Pages } } - private int SelTranspId - { - get - { - int answ = 0; - if (MessageService.Order_Filter != null) - { - answ = MessageService.Order_Filter.TransporterId; - } - return answ; - } - set - { - if (!MessageService.Order_Filter.TransporterId.Equals(value)) - { - MessageService.Order_Filter.TransporterId = value; - var pUpd = Task.Run(async () => await ReloadData()); - pUpd.Wait(); - } - } - } - #endregion Private Properties #region Protected Properties @@ -270,7 +247,6 @@ namespace GWMS.UI.Pages protected async Task ReloadAllData() { PlantsList = await DataService.PlantsGetAll(); - TransportersList = await DataService.TransportersGetAll(); await ReloadData(); } From 36c79829b54c88cfcd7eb3ddb973bb7477cd6bc7 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 24 Aug 2021 09:29:43 +0200 Subject: [PATCH 5/5] Filtro trasportatore libero (pre auth) --- .../Extensions/NavigationManagerExtension.cs | 9 +++ GWMS.UI/GWMS.UI.csproj | 2 +- GWMS.UI/Pages/Transporters.razor | 40 +++++++++-- GWMS.UI/Pages/Transporters.razor.cs | 66 +++++++++++++------ Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 7 files changed, 91 insertions(+), 32 deletions(-) diff --git a/GWMS.UI/Extensions/NavigationManagerExtension.cs b/GWMS.UI/Extensions/NavigationManagerExtension.cs index ae4544e..befd252 100644 --- a/GWMS.UI/Extensions/NavigationManagerExtension.cs +++ b/GWMS.UI/Extensions/NavigationManagerExtension.cs @@ -7,6 +7,15 @@ namespace GWMS.UI.Extensions { #region Public Methods + /// + /// Estensione metodo NavigationManager + /// + /// https://code-maze.com/query-strings-blazor-webassembly/ + /// + /// + /// + /// + /// public static T ExtractQueryStringByKey(this NavigationManager navManager, string key) { var uri = navManager.ToAbsoluteUri(navManager.Uri); diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj index c2760d7..e3a02f9 100644 --- a/GWMS.UI/GWMS.UI.csproj +++ b/GWMS.UI/GWMS.UI.csproj @@ -2,7 +2,7 @@ net5.0 - 1.0.2108.2408 + 1.0.2108.2409 95c9f021-52d1-4390-a670-5810b7b777b0 diff --git a/GWMS.UI/Pages/Transporters.razor b/GWMS.UI/Pages/Transporters.razor index 9fe09fc..aa19632 100644 --- a/GWMS.UI/Pages/Transporters.razor +++ b/GWMS.UI/Pages/Transporters.razor @@ -1,5 +1,4 @@ @page "/Transporters" -@page "/Transporters/{TransporterIdReq}" @using Blazorise.Components @using GWMS.UI.Components @@ -12,11 +11,18 @@
      Consegne
      -
      - -
      -
      - +
      +
      +
      + +
      + @*
      + +
      *@ +
      + +
      +
    @@ -36,7 +42,6 @@ } - @if (showFiltDest) {
    @@ -61,6 +66,27 @@
    } +
    +
    +
    +
    + + + +
    + +
    +
    +
    diff --git a/GWMS.UI/Pages/Transporters.razor.cs b/GWMS.UI/Pages/Transporters.razor.cs index fd8a54c..2e34be2 100644 --- a/GWMS.UI/Pages/Transporters.razor.cs +++ b/GWMS.UI/Pages/Transporters.razor.cs @@ -20,6 +20,8 @@ namespace GWMS.UI.Pages private List PlantsList; private List SearchRecords; + private List TransportersList; + #endregion Private Fields #region Private Properties @@ -58,6 +60,14 @@ namespace GWMS.UI.Pages } } + private string icnFiltTran + { + get + { + return showFiltTrasp ? "fas fa-chevron-up" : "fas fa-chevron-down"; + } + } + private bool isLoading { get; set; } = false; private int numRecord @@ -97,6 +107,29 @@ namespace GWMS.UI.Pages } } + private int SelTranspId + { + get + { + int answ = 0; + if (MessageService.Order_Filter != null) + { + answ = MessageService.Order_Filter.TransporterId; + } + return answ; + } + set + { + if (!MessageService.Order_Filter.TransporterId.Equals(value)) + { + currRecord = null; + MessageService.Order_Filter.TransporterId = value; + var pUpd = Task.Run(async () => await ReloadData()); + pUpd.Wait(); + } + } + } + #endregion Private Properties #region Protected Properties @@ -160,39 +193,23 @@ namespace GWMS.UI.Pages protected bool showFiltDest { get; set; } = false; protected bool showFiltTime { get; set; } = false; + protected bool showFiltTrasp { get; set; } = false; protected int totalCount { get { int answ = 0; - if (SearchRecords != null) + if (ListRecords != null) { - answ = SearchRecords.Count; + answ = ListRecords.Count; } return answ; } } - protected int TransporterIdFilt - { - get - { - int answ = 0; - int.TryParse(TransporterIdReq, out answ); - return answ; - } - } - #endregion Protected Properties - #region Public Properties - - [Parameter] - public string TransporterIdReq { get; set; } = ""; - - #endregion Public Properties - #region Private Methods private void OnDateEndChanged(DateTime? date) @@ -211,7 +228,8 @@ namespace GWMS.UI.Pages { isLoading = true; SearchRecords = await DataService.OrdersGetFilt(MessageService.Order_Filter); - ListRecords = SearchRecords.Where(x => x.TransporterId == TransporterIdFilt).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); + //ListRecords = SearchRecords.Where(x => x.TransporterId == TransporterIdFilt).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); isLoading = false; } @@ -237,6 +255,7 @@ namespace GWMS.UI.Pages protected override async Task OnInitializedAsync() { SelPlantId = 0; + SelTranspId = 0; MessageService.ShowSearch = false; MessageService.PageName = "Fornitore"; MessageService.PageIcon = "fas fa-industry pr-2"; @@ -247,6 +266,7 @@ namespace GWMS.UI.Pages protected async Task ReloadAllData() { PlantsList = await DataService.PlantsGetAll(); + TransportersList = await DataService.TransportersGetAll(); await ReloadData(); } @@ -274,7 +294,6 @@ namespace GWMS.UI.Pages protected void ToggleFiltDest() { showFiltDest = !showFiltDest; - // se nascosto --> reset if (!showFiltDest) { SelPlantId = 0; @@ -286,6 +305,11 @@ namespace GWMS.UI.Pages showFiltTime = !showFiltTime; } + protected void ToggleFiltTransp() + { + showFiltTrasp = !showFiltTrasp; + } + protected async Task UpdateData() { currRecord = null; diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index be9c5d4..f36a3f8 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GWMS - Gas Warehouse Management System -

    Versione: 1.0.2108.2408

    +

    Versione: 1.0.2108.2409


    Note di rilascio:
    • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 1873de6..c3ae201 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.0.2108.2408 +1.0.2108.2409 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index c0da644..25aee9f 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.0.2108.2408 + 1.0.2108.2409 http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html false