Merge branch 'release/BetaTest'

Update x scalabilità cellulari

GWMS.UI/Extensions/NavigationManagerExtension.cs

@@ -0,0 +1,39 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.WebUtilities;
+
+namespace GWMS.UI.Extensions
+{
+    public static class NavigationManagerExtension
+    {
+        #region Public Methods
+
+        /// <summary>
+        /// Estensione metodo NavigationManager
+        ///
+        /// https://code-maze.com/query-strings-blazor-webassembly/
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="navManager"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static T ExtractQueryStringByKey<T>(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
+    }
+}

GWMS.UI/GWMS.UI.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.2319</Version>
+    <Version>1.0.2108.2409</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
   </PropertyGroup>
 

GWMS.UI/Pages/Orders.razor

@@ -6,11 +6,16 @@
 <div class="card">
     <div class="card-header table-primary h3">
         <div class="row">
-            <div class="col-3 h3">
+            <div class="col-6 col-lg-2 h3">
                 Elenco Ordini
             </div>
-            <div class="col-9 text-right">
+            <div class="col-6 col-lg-2 text-right">
                 <div class="d-flex justify-content-between">
+                    <div class="p-2">
+                        <div class="form-group mb-0">
+                            <Button id="btnReset" class="btn btn-info btn-sm btn-block" Clicked="ResetFilter" title="Reset Filter"><span class="oi oi-loop-circular"></span></Button>
+                        </div>
+                    </div>
                     <div class="p-2">
                         <div class="input-group input-group-sm">
                             <div class="input-group-prepend">
@@ -21,6 +26,16 @@
                             </div>
                         </div>
                     </div>
+                    <div class="p-2">
+                        @if (ShowAddNew)
+                        {
+                            <button class="btn btn-block btn-sm btn-success" @onclick="CreateNew" title="Aggiunta nuovo Ordine"><i class="far fa-calendar-plus"></i></button>
+                        }
+                    </div>
+                </div>
+            </div>
+            <div class="col-12 col-lg-4 text-right">
+                <div class="d-flex justify-content-between">
                     <div class="p-2">
                         <div class="input-group input-group-sm">
                             <div class="input-group-prepend">
@@ -37,6 +52,10 @@
                             <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateEnd" DateChanged="@OnDateEndChanged" />
                         </div>
                     </div>
+                </div>
+            </div>
+            <div class="col-12 col-lg-4 text-right">
+                <div class="d-flex justify-content-between">
                     <div class="p-2">
                         <div class="input-group">
                             <div class="input-group-prepend">
@@ -75,17 +94,6 @@
                             </select>
                         </div>
                     </div>
-                    <div class="p-2">
-                        <div class="form-group mb-0">
-                            <Button id="btnReset" class="btn btn-info btn-sm btn-block" Clicked="ResetFilter" title="Reset Filter"><span class="oi oi-loop-circular"></span></Button>
-                        </div>
-                    </div>
-                    <div class="p-2">
-                        @if (ShowAddNew)
-                        {
-                            <button class="btn btn-block btn-sm btn-success" @onclick="CreateNew" title="Aggiunta nuovo Ordine"><i class="far fa-calendar-plus"></i></button>
-                        }
-                    </div>
                 </div>
             </div>
         </div>
@@ -107,7 +115,7 @@
         {
             <div class="row">
                 <div class="col-12">
-                    <table class="table table-sm table-striped">
+                    <table class="table table-sm table-striped table-responsive-lg">
                         <thead>
                             <tr>
                                 <th></th>

GWMS.UI/Pages/Suppliers.razor

@@ -7,10 +7,10 @@
 <div class="card">
     <div class="card-header table-primary h3">
         <div class="row">
-            <div class="col-3 h3">
+            <div class="col-12 col-lg-4 h3">
                 Ordini Fornitore
             </div>
-            <div class="col-9 text-right">
+            <div class="col-12 col-lg-4 text-right">
                 <div class="d-flex justify-content-between">
                     <div class="p-2">
                         <div class="input-group input-group-sm">
@@ -28,6 +28,10 @@
                             <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateEnd" DateChanged="@OnDateEndChanged" />
                         </div>
                     </div>
+                </div>
+            </div>
+            <div class="col-12 col-lg-4 text-right">
+                <div class="d-flex justify-content-between">
                     <div class="p-2">
                         <div class="input-group">
                             <div class="input-group-prepend">
@@ -86,7 +90,7 @@
         {
             <div class="row">
                 <div class="col-12">
-                    <table class="table table-sm table-striped">
+                    <table class="table table-sm table-striped table-responsive-lg">
                         <thead>
                             <tr>
                                 <th></th>

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 @@
                     <div class="col-6 pr-0 col-lg-8 h3">
                         Consegne
                     </div>
-                    <div class="col-3 col-lg-2">
-                        <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltPeriod()"><i class="far fa-calendar-alt"></i> <i class="@icnFiltTime"></i></button>
-                    </div>
-                    <div class="col-3 col-lg-2">
-                        <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltDest()"><i class="fas fa-gas-pump"></i> <i class="@icnFiltDest"></i></button>
+                    <div class="col-6 col-lg-4">
+                        <div class="row">
+                            <div class="col-6 px-1">
+                                <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltPeriod()"><i class="far fa-calendar-alt"></i> <i class="@icnFiltTime"></i></button>
+                            </div>
+                            @*<div class="col-4 px-1">
+                                    <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltTransp()"><i class="fas fa-truck-moving"></i> <i class="@icnFiltTran"></i></button>
+                                </div>*@
+                            <div class="col-6 px-1">
+                                <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltDest()"><i class="fas fa-gas-pump"></i> <i class="@icnFiltDest"></i></button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -36,7 +42,6 @@
                         </div>
                     </div>
                 }
-
                 @if (showFiltDest)
                 {
                     <div class="row">
@@ -61,6 +66,27 @@
                         </div>
                     </div>
                 }
+                <div class="row">
+                    <div class="col">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text">
+                                    <span class="fas fa-truck-moving" aria-hidden="true"></span>
+                                </span>
+                            </div>
+                            <select @bind="SelTranspId" class="form-control form-control-sm" title="Trasportatore">
+                                <option value="0">--- Tutti ---</option>
+                                @if (TransportersList != null)
+                                {
+                                    foreach (var item in TransportersList)
+                                    {
+                                        <option value="@item.TransporterId">@item.TransporterCode | @item.TransporterDesc</option>
+                                    }
+                                }
+                            </select>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

GWMS.UI/Pages/Transporters.razor.cs

@@ -19,6 +19,7 @@ namespace GWMS.UI.Pages
         private List<OrderModel> ListRecords;
         private List<PlantDTO> PlantsList;
         private List<OrderModel> SearchRecords;
+
         private List<TransporterModel> TransportersList;
 
         #endregion Private Fields
@@ -59,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
@@ -113,6 +122,7 @@ namespace GWMS.UI.Pages
             {
                 if (!MessageService.Order_Filter.TransporterId.Equals(value))
                 {
+                    currRecord = null;
                     MessageService.Order_Filter.TransporterId = value;
                     var pUpd = Task.Run(async () => await ReloadData());
                     pUpd.Wait();
@@ -183,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)
@@ -234,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;
         }
 
@@ -260,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";
@@ -298,7 +294,6 @@ namespace GWMS.UI.Pages
         protected void ToggleFiltDest()
         {
             showFiltDest = !showFiltDest;
-            // se nascosto --> reset
             if (!showFiltDest)
             {
                 SelPlantId = 0;
@@ -310,6 +305,11 @@ namespace GWMS.UI.Pages
             showFiltTime = !showFiltTime;
         }
 
+        protected void ToggleFiltTransp()
+        {
+            showFiltTrasp = !showFiltTrasp;
+        }
+
         protected async Task UpdateData()
         {
             currRecord = null;

GWMS.UI/Shared/NavMenu.razor

@@ -1,15 +1,23 @@
-<div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" @onclick="() => ToggleCompress()" title="Comprimi">
-        @*<a class="navbar-brand" href="">*@
-        <div class="row">
-            <div class="col-2 px-0">
-                <img src="./img/LogoBlu.svg" class="img-fluid" width="64" />
-            </div>
-            <div class="col-10 h4">
-                <span class="@hideText">MAPO.GWMS</span>
-            </div>
-        </div>
-    </a>
+<div class="top-row pl-3 navbar navbar-dark">
+    <div class="text-nowrap">
+        @if (showText)
+        {
+            <a class="navbar-brand" @onclick="() => ToggleCompress()" title="Comprimi">
+                <img src="./img/LogoBlu.svg" class="img-fluid" width="32" />
+                @*<i class="fas fa-chevron-left"></i>*@
+            </a>
+        }
+        else
+        {
+            <a class="navbar-brand" @onclick="() => ToggleCompress()" title="Comprimi">
+                <img src="./img/LogoBlu.svg" class="img-fluid" width="32" />
+                @*<i class="fas fa-chevron-right"></i>*@
+            </a>
+        }
+        <a class="navbar-brand" href="">
+            <span class="@hideText">MAPO.GWMS</span>
+        </a>
+    </div>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
     </button>
@@ -66,18 +74,18 @@
                 <span class="@hideText">Utenti</span>
             </NavLink>
         </li>
-        <li class="nav-item px-3" title="Job Scheduler">
-            <NavLink class="nav-link" href="Scheduler">
-                <i class="fas fa-calendar-alt pr-2" aria-hidden="true"></i>
-                <span class="@hideText">Job Scheduler</span>
-            </NavLink>
-        </li>
-        <li class="nav-item px-3" title="Setup Parametri">
-            <NavLink class="nav-link" href="Parameters">
-                <i class="fas fa-wrench pr-2" aria-hidden="true"></i>
-                <span class="@hideText">Setup Parametri</span>
-            </NavLink>
-        </li>
+        @*<li class="nav-item px-3" title="Job Scheduler">
+                <NavLink class="nav-link" href="Scheduler">
+                    <i class="fas fa-calendar-alt pr-2" aria-hidden="true"></i>
+                    <span class="@hideText">Job Scheduler</span>
+                </NavLink>
+            </li>
+            <li class="nav-item px-3" title="Setup Parametri">
+                <NavLink class="nav-link" href="Parameters">
+                    <i class="fas fa-wrench pr-2" aria-hidden="true"></i>
+                    <span class="@hideText">Setup Parametri</span>
+                </NavLink>
+            </li>*@
     </ul>
 </div>
 

Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2108.2319</h4>
+    <h4>Versione: 1.0.2108.2409</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

Resources/VersNum.txt

@@ -1 +1 @@
-1.0.2108.2319
+1.0.2108.2409

Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.2319</version>
+  <version>1.0.2108.2409</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>