Merge branch 'release/ScannerQr'

Correzione comportamento scanner
Merge tag 'ForwHeadersù' into develop
2021-08-19 15:52:08 +02:00 · 2021-08-19 15:51:48 +02:00 · 2021-08-19 11:05:55 +02:00 · 2021-08-19 11:05:39 +02:00 · 2021-08-19 11:05:10 +02:00 · 2021-08-11 19:08:06 +02:00
26 changed files with 220 additions and 105 deletions
@@ -1,12 +1,10 @@
-<div class="row">
-    <div class="col-4 text-left">
-        GWMS v.@version
+<div class="row px-1 text-light">
+    <div class="col-5 pr-0 text-left">
+        GWMS <span class="small">v.@version</span>
    </div>
-    <div class="col-4 text-center text-secondary small">
-        @adesso
-    </div>
-    <div class="col-4 text-right">
-        powered by&nbsp;<a class="text-light" href="https://www.egalware.com/" target="_blank">Egalware <img height="16" src="img/LogoBlu.svg" /></a>
+    <div class="col-7 pl-0 text-right">
+        <span class="small">@adesso</span>
+        <a class="text-light" href="https://www.egalware.com/" target="_blank">Egalware<img class="img-fluid" width="16" src="img/LogoBlu.svg" /></a>
    </div>
 </div>

@@ -4,7 +4,7 @@
            <div class="col-12 small">
                @if (totalCount > 0)
                {
-                    <Pagination>
+                    <Pagination Class="mb-0">
                        <PaginationItem>
                            <PaginationLink Clicked="@HandlePaginationItemClick" Page="1">
                                <i class="fas fa-angle-double-left"></i>
@@ -49,19 +49,18 @@
            </div>
        </div>
    </div>
-    <div class="col-12 col-lg-3 small">
+    <div class="col-12 col-lg-3">
        <div class="d-flex">
-            <div class="p-2 flex-fill">
+            <div class="p-1 flex-fill text-right">
                @if (!showLoading)
                {
                    <span>@totalCount records</span>
                }
            </div>
-            <div class="p-2 flex-fill text-right">
+            <div class="p-1 flex-fill text-right small">
                @if (totalCount > 0)
                {
                    <div class="input-group input-group-sm">
-                        row/pag:&nbsp;
                        <select @bind="@PageSize" class="form-control form-control-sm">
                            <option value="5">5</option>
                            <option value="10">10</option>
@@ -10,9 +10,9 @@
@inject IConfiguration Configuration

 <div class="card">
-    <div class="card-header bg-info text-light">
-        <b>Modifica</b>
-    </div>
+    @*<div class="card-header bg-info text-light">
+            <b>Modifica</b>
+        </div>*@
    <div class="card-body small p-1">
        <EditForm Model="@_currItem">
            <DataAnnotationsValidator />
@@ -26,10 +26,10 @@
                            <div class="input-group input-group-sm">
                                <div class="input-group-prepend">
                                    <span class="input-group-text" style="width: 3em;">
-                                        <span class="fas fa-calendar-alt" aria-hidden="true"></span>
+                                        <span class="fas fa-truck" aria-hidden="true"></span>
                                    </span>
                                </div>
-                                <InputDate id="DtEta" @bind-Value="_currItem.DtETA" class="form-control" title="ETA (previsione consegna)" />
+                                <DateEdit @bind-Date="_currItem.DtETA" InputMode="DateInputMode.DateTime" class="form-control" title="ETA (previsione consegna)" />
                            </div>
                        </div>
                        <div class="col-12">
@@ -50,11 +50,13 @@
                    </div>
                </div>
                <div class="col-12 col-lg-2">
-                    <div>
-                        <button type="button" class="btn btn-sm btn-outline-success btn-block" value="Save" @onclick="saveUpdate">Save <i class="far fa-save"></i></button>
-                    </div>
-                    <div>
-                        <button type="button" class="btn btn-sm btn-outline-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel <i class="fas fa-ban"></i></button>
+                    <div class="row">
+                        <div class="col-6">
+                            <button type="button" class="btn btn-sm btn-success btn-block" value="Save" @onclick="saveUpdate">Save <i class="far fa-save"></i></button>
+                        </div>
+                        <div class="col-6">
+                            <button type="button" class="btn btn-sm btn-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel <i class="fas fa-ban"></i></button>
+                        </div>
                    </div>
                </div>
            </div>
@@ -5,14 +5,14 @@
    <div class="card-header table-primary h1 py-1">
        @if (currItem != null)
        {
-            <div class="row py-0">
-                <div class="col-6">
-                    <b>@currItem.PlantCode</b>
-                </div>
-                <div class="col-6 text-right">
-                    @currItem.PlantDesc
-                </div>
+        <div class="row py-0">
+            <div class="col-6">
+                <b>@currItem.PlantCode</b>
            </div>
+            <div class="col-6 text-right">
+                @currItem.PlantDesc
+            </div>
+        </div>
        }
    </div>
    <div class="card-body p-1">
@@ -21,7 +21,7 @@
                <div class="row">
                    <div class="col-12">
                        <ul class="list-group">
-                            <li class="list-group-item d-flex justify-content-between align-items-center p-0">
+                            <li class="list-group-item d-flex justify-content-between align-items-center p-0 border border-primary">
                                <img src="./img/Plant/@(currItem.PlantCode).jpg" class="img-fluid" />
                            </li>
                            <li class="list-group-item active d-flex justify-content-between align-items-center py-1">PB Alta</li>
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.1012</Version>
+    <Version>1.0.2108.1915</Version>
    <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
  </PropertyGroup>

@@ -24,6 +24,7 @@
    <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
    <PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="5.0.1" />
    <PackageReference Include="AspNetCore.HealthChecks.Uris" Version="5.0.1" />
+    <PackageReference Include="BlazorBarcodeScanner.ZXing.JS" Version="0.2.4" />
    <PackageReference Include="Blazorise" Version="0.9.3.7" />
    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.3.7" />
    <PackageReference Include="Blazorise.Charts" Version="0.9.3.7" />
@@ -1,7 +1,9 @@
@page "/GasStation"
+@page "/GasStation/{BarcodeText}"

@using Blazorise.Components
@using GWMS.UI.Components
+@using BlazorBarcodeScanner.ZXing.JS

 <div class="card">
    <div class="card-header table-primary mb-0">
@@ -9,10 +11,13 @@
            <div class="col-12">
                <div class="row">
                    <div class="col-9 col-lg-8 h3">
-                        Registrazione
+                        Lettura QRCode
                    </div>
                    <div class="col-3 col-lg-2">
-                        <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleBCode()"><i class="fas fa-qrcode"></i> <i class="fas fa-chevron-down"></i></button>
+                        @if (!string.IsNullOrEmpty(BarcodeText))
+                        {
+                            <button class="btn btn-sm btn-block btn-success" @onclick="() => ToggleBCode()" title="reload"><i class="fas fa-qrcode"></i>&nbsp;re-scan</button>
+                        }
                    </div>
                </div>
            </div>
@@ -22,24 +27,41 @@
    </div>
    <div class="card-body p-1">
        <div class="row small">
-            <div class="col-12">
-                <b>Acquisizione barcode</b>
+            <div class="col-12 text-center">
                <div class="form-group">
-                    <input class="form-control" />
+                    @if (string.IsNullOrEmpty(BarcodeText))
+                    {
+                        <BlazorBarcodeScanner.ZXing.JS.BarcodeReader Title=""
+                                                                     StartCameraAutomatically="true"
+                                                                     ShowStart="false"
+                                                                     ShowReset="false"
+                                                                     ShowToggleTorch="false"
+                                                                     ShowVideoDeviceList="true"
+                                                                     ShowResult="false"
+                                                                     OnBarcodeReceived="LocalReceivedBarcodeText"
+                                                                     VideoWidth="300"
+                                                                     VideoHeight="200" />
+                    }
+                    else
+                    {
+                        <h3 class="textCondensed">
+                            @BarcodeText
+                        </h3>
+                    }
                </div>
            </div>
        </div>

-        <p class="small">
+        @*<p class="small">

-            Work IN progress, links:
-            <ul>
-                <li>https://github.com/sabitertan/BlazorBarcodeScanner</li>
-                <li>https://github.com/tallichet/ZXingBlazor</li>
-                <li>https://github.com/LorsSilvermort/BlazorBarcodeReader</li>
-                <li>https://www.bing.com/search?q=blazor+server+qrcode+scanner&qs=n&form=QBRE&sp=-1&pq=blazor+server+qrcode+scanner&sc=0-28&sk=&cvid=D827470C199B47BDB39F277EFC72A266</li>
-            </ul>
-        </p>
+                Work IN progress, links:
+                <ul>
+                    <li>https://github.com/sabitertan/BlazorBarcodeScanner</li>
+                    <li>https://github.com/tallichet/ZXingBlazor</li>
+                    <li>https://github.com/LorsSilvermort/BlazorBarcodeReader</li>
+                    <li>https://www.bing.com/search?q=blazor+server+qrcode+scanner&qs=n&form=QBRE&sp=-1&pq=blazor+server+qrcode+scanner&sc=0-28&sk=&cvid=D827470C199B47BDB39F277EFC72A266</li>
+                </ul>
+            </p>*@
    </div>
    <div class="card-footer p-1">
    </div>
@@ -1,4 +1,5 @@
-using GWMS.Data.DatabaseModels;
+using BlazorBarcodeScanner.ZXing.JS;
+using GWMS.Data.DatabaseModels;
 using GWMS.Data.DTO;
 using GWMS.UI.Data;
 using Microsoft.AspNetCore.Components;
@@ -15,7 +16,6 @@ namespace GWMS.UI.Pages
        #region Private Fields

        private OrderModel currRecord = null;
-
        private List<OrderModel> ListRecords;
        private List<PlantDTO> PlantsList;
        private List<OrderModel> SearchRecords;
@@ -26,7 +26,6 @@ namespace GWMS.UI.Pages
        #region Private Properties

        private int _currPage { get; set; } = 1;
-
        private int _numRecord { get; set; } = 10;

        private int currPage
@@ -182,8 +181,31 @@ namespace GWMS.UI.Pages

        #endregion Protected Properties

+        #region Public Properties
+
+        [Parameter]
+        public string BarcodeText { get; set; } = "";
+
+        #endregion Public Properties
+
        #region Private Methods

+        private void LocalReceivedBarcodeText(BarcodeReceivedEventArgs args)
+        {
+            // rimando a pagina con  codice ordine....
+            NavManager.NavigateTo($"GasStation/{args.BarcodeText}");
+
+#if false
+            BarcodeText = args.BarcodeText;
+
+            // verifico il codice
+
+            // registro inizio trasferimento
+
+            StateHasChanged();
+#endif
+        }
+
        private void OnDateEndChanged(DateTime? date)
        {
            DateEnd = (DateTime)date;
@@ -260,7 +282,10 @@ namespace GWMS.UI.Pages

        protected void ToggleBCode()
        {
+            NavManager.NavigateTo("GasStation");
+#if false
            showBcodeScan = !showBcodeScan;
+#endif
        }

        protected async Task UpdateData()
@@ -7,7 +7,7 @@
@inject GWMSDataService DataService
@inject MessageService AppMService

-<div class="jumbotron">
+<div class="jumbotron py-4">
    <div class="row">
        <div class="col-12 col-lg-4">
            <h1>GWMS</h1>
@@ -16,29 +16,29 @@
            </div>
        </div>
        <div class="col-12 col-lg-8 text-right">
-            <div class="text-light display-4">
+            <div class="text-light h1 d-none d-md-block">
                <span class="fas fa-home" aria-hidden="true"></span> | <span class="fas fa-gas-pump" aria-hidden="true"></span> | <span class="fas fa-file-invoice" aria-hidden="true"></span> | <span class="fas fa-industry" aria-hidden="true"></span> | <span class="fas fa-truck-moving" aria-hidden="true"></span> | <span class="fas fa-wrench" aria-hidden="true"></span>
            </div>
        </div>
    </div>
 </div>
 <div class="row">
-    <div class="col-12 my-5">
+    <div class="col-12 my-lg-5">
        <SetupDiagnostics></SetupDiagnostics>
    </div>
    <div class="col-12 text-center">
-        <img class="img-fluid mb-3" src="./img/LogoPizzaferri.jpg" />
-        <h3>
+        <img class="img-fluid mb-3" src="./img/LogoPizzaferri.png" />
+        <h4>
            Sistema di gestione e pianificazione logistica impianti distribuzione metano
-        </h3>
+        </h4>
    </div>
    <div class="col-12 text-center mt-5">
        <div class="col-4"></div>
        <div class="col-4"></div>
        <div class="col-4 badge badge-pill badge-dark">
-            <h3>
-                <a class="text-light" href="https://www.egalware.com/" target="_blank">powered by&nbsp;EgalWare <img width="32" class="img-fluid" src="img/LogoBlu.svg" /></a>
-            </h3>
+            <div class="px-1">
+                <a class="text-light" href="https://www.egalware.com/" target="_blank">powered by&nbsp;EgalWare <img width="24" class="img-fluid" src="img/LogoBlu.svg" /></a>
+            </div>
        </div>
    </div>
 </div>
@@ -16,8 +16,8 @@
                            <div class="input-group-prepend">
                            </div>
                            <div class="custom-control custom-switch">
-                                <input type="checkbox" class="custom-control-input" id="togAttivi" title="Solo Aperti / Mostra tutti" @bind-value="@ShowClosed" />
-                                <label class="custom-control-label small" for="togAttivi">tutti</label>
+                                <input type="checkbox" class="custom-control-input" id="togAttivi" title="Solo Aperti / Mostra tutti" @bind-value="@ShowClosed" checked="@ShowClosed" />
+                                <label class="custom-control-label small" for="togAttivi"><sub>evasi</sub></label>
                            </div>
                        </div>
                    </div>
@@ -25,16 +25,16 @@
                        <div class="input-group input-group-sm">
                            <div class="input-group-prepend">
                                <span class="input-group-text">inizio:</span>
-                                <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateStart" DateChanged="@OnDateStartChanged" />
                            </div>
+                            <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateStart" DateChanged="@OnDateStartChanged" />
                        </div>
                    </div>
                    <div class="p-2">
                        <div class="input-group input-group-sm">
                            <div class="input-group-prepend">
                                <span class="input-group-text">fine:</span>
-                                <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateEnd" DateChanged="@OnDateEndChanged" />
                            </div>
+                            <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateEnd" DateChanged="@OnDateEndChanged" />
                        </div>
                    </div>
                    <div class="p-2">
@@ -83,7 +83,7 @@
                    <div class="p-2">
                        @if (ShowAddNew)
                        {
-                            <button class="btn btn-block btn-sm btn-success" @onclick="CreateNew">Nuovo <i class="far fa-calendar-plus"></i></button>
+                            <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>
@@ -262,7 +262,7 @@ namespace GWMS.UI.Pages
                    OrderCode = $"O{currPlant.PlantCode}{adesso:yyMMddHHmm}",
                };
                // aggiorno filtro
-                AppMService.Order_Filter = SelectOrderData.Init(5, 7);
+                AppMService.Order_Filter = SelectOrderData.Init(5, 10);
            }
        }

@@ -283,6 +283,7 @@ namespace GWMS.UI.Pages

        protected override async Task OnInitializedAsync()
        {
+            DataService.ResetController();
            AppMService.ShowSearch = false;
            AppMService.PageName = "Ordini";
            AppMService.PageIcon = "fas fa-file-invoice pr-2";
@@ -308,7 +309,8 @@ namespace GWMS.UI.Pages
            currRecord = null;
            SearchRecords = null;
            ListRecords = null;
-            AppMService.Order_Filter = SelectOrderData.Init(5, 7);
+            AppMService.Order_Filter = SelectOrderData.Init(5, 10);
+            ShowClosed = false;
            await ReloadAllData();
        }

@@ -1,4 +1,5 @@
@page "/Suppliers"
+@page "/Suppliers/{SupplierIdReq}"

@using Blazorise.Components
@using GWMS.UI.Components
@@ -15,16 +16,16 @@
                        <div class="input-group input-group-sm">
                            <div class="input-group-prepend">
                                <span class="input-group-text">inizio:</span>
-                                <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateStart" DateChanged="@OnDateStartChanged" />
                            </div>
+                            <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateStart" DateChanged="@OnDateStartChanged" />
                        </div>
                    </div>
                    <div class="p-2">
                        <div class="input-group input-group-sm">
                            <div class="input-group-prepend">
                                <span class="input-group-text">fine:</span>
-                                <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateEnd" DateChanged="@OnDateEndChanged" />
                            </div>
+                            <DateEdit class="form-control form-control-sm" TValue="DateTime?" Date="@DateEnd" DateChanged="@OnDateEndChanged" />
                        </div>
                    </div>
                    <div class="p-2">
@@ -165,6 +165,16 @@ namespace GWMS.UI.Pages
        [Inject]
        protected NavigationManager NavManager { get; set; }

+        protected int SupplierIdFilt
+        {
+            get
+            {
+                int answ = 0;
+                int.TryParse(SupplierIdReq, out answ);
+                return answ;
+            }
+        }
+
        protected int totalCount
        {
            get
@@ -180,6 +190,13 @@ namespace GWMS.UI.Pages

        #endregion Protected Properties

+        #region Public Properties
+
+        [Parameter]
+        public string SupplierIdReq { get; set; } = "";
+
+        #endregion Public Properties
+
        #region Private Methods

        private void OnDateEndChanged(DateTime? date)
@@ -231,7 +248,8 @@ namespace GWMS.UI.Pages
        protected async Task ReloadAllData()
        {
            PlantsList = await DataService.PlantsGetAll();
-            SuppliersList = await DataService.SuppliersGetAll();
+            var suppliersAll = await DataService.SuppliersGetAll();
+            SuppliersList = suppliersAll.Where(x => x.SupplierId == SupplierIdFilt || SupplierIdFilt == 0).ToList();
            await ReloadData();
        }

@@ -1,21 +1,22 @@
@page "/Transporters"
+@page "/Transporters/{TransporterIdReq}"

@using Blazorise.Components
@using GWMS.UI.Components

 <div class="card">
-    <div class="card-header table-primary mb-0">
+    <div class="card-header table-primary pb-0 mb-0">
        <div class="row">
            <div class="col-12">
                <div class="row">
-                    <div class="col-6 col-lg-8 h3">
-                        In Consegna
+                    <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="fas fa-chevron-down"></i></button>
+                        <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="fas fa-chevron-down"></i></button>
+                        <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>
@@ -58,24 +59,6 @@
                                </select>
                            </div>
                        </div>
-                        @*<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">
-                                        @if (TransportersList != null)
-                                        {
-                                            foreach (var item in TransportersList)
-                                            {
-                                                <option value="@item.TransporterId">@item.TransporterCode | @item.TransporterDesc</option>
-                                            }
-                                        }
-                                    </select>
-                                </div>
-                            </div>*@
                    </div>
                }
            </div>
@@ -119,8 +102,11 @@
                                        <div>
                                            <b>@record.OrderQty.ToString("N0")</b>
                                        </div>
-                                        <div>@record.DtETA.ToString("yyyy.MM.dd")</div>
-                                        <div class="small">@record.DtETA.ToString("ddd HH:mm.ss")</div>
+                                        @if (!record.DtExecStart.Equals(@record.DtExecEnd))
+                                        {
+                                            <div>@record.DtETA.ToString("yyyy.MM.dd")</div>
+                                            <div class="small">@record.DtETA.ToString("ddd HH:mm.ss")</div>
+                                        }
                                    </td>
                                </tr>
                            }
@@ -43,6 +43,22 @@ namespace GWMS.UI.Pages
            }
        }

+        private string icnFiltDest
+        {
+            get
+            {
+                return showFiltDest ? "fas fa-chevron-up" : "fas fa-chevron-down";
+            }
+        }
+
+        private string icnFiltTime
+        {
+            get
+            {
+                return showFiltTime ? "fas fa-chevron-up" : "fas fa-chevron-down";
+            }
+        }
+
        private bool isLoading { get; set; } = false;

        private int numRecord
@@ -74,6 +90,7 @@ namespace GWMS.UI.Pages
            {
                if (!MessageService.Order_Filter.PlantId.Equals(value))
                {
+                    currRecord = null;
                    MessageService.Order_Filter.PlantId = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
@@ -103,8 +120,6 @@ namespace GWMS.UI.Pages
            }
        }

-        private bool ShowCharts { get; set; } = false;
-
        #endregion Private Properties

        #region Protected Properties
@@ -182,17 +197,36 @@ namespace GWMS.UI.Pages
            }
        }

+        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)
        {
+            currRecord = null;
            DateEnd = (DateTime)date;
        }

        private void OnDateStartChanged(DateTime? date)
        {
+            currRecord = null;
            DateStart = (DateTime)date;
        }

@@ -200,7 +234,7 @@ namespace GWMS.UI.Pages
        {
            isLoading = true;
            SearchRecords = await DataService.OrdersGetFilt(MessageService.Order_Filter);
-            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;
        }

@@ -225,6 +259,7 @@ namespace GWMS.UI.Pages

        protected override async Task OnInitializedAsync()
        {
+            SelPlantId = 0;
            MessageService.ShowSearch = false;
            MessageService.PageName = "Fornitore";
            MessageService.PageIcon = "fas fa-industry pr-2";
@@ -263,6 +298,11 @@ namespace GWMS.UI.Pages
        protected void ToggleFiltDest()
        {
            showFiltDest = !showFiltDest;
+            // se nascosto --> reset
+            if (!showFiltDest)
+            {
+                SelPlantId = 0;
+            }
        }

        protected void ToggleFiltPeriod()
@@ -27,7 +27,8 @@
    <link href="GWMS.UI.styles.css" rel="stylesheet" />
 </head>
 <body>
-    <component type="typeof(App)" render-mode="ServerPrerendered" />
+    <component type="typeof(App)" render-mode="Server" />
+    @*<component type="typeof(App)" render-mode="ServerPrerendered" />*@

    <div id="blazor-error-ui">
        <environment include="Staging,Production">
@@ -50,6 +51,9 @@
    <script src="_content/Blazorise.Bootstrap/blazorise.bootstrap.js"></script>
    <script src="_content/Blazorise.Charts/blazorise.charts.js"></script>

+    <script src="_content/BlazorBarcodeScanner.ZXing.JS/zxingjs.index.min.js"></script>
+    <script src="_content/BlazorBarcodeScanner.ZXing.JS/BlazorBarcodeScanner.js"></script>
+
    <script src="_framework/blazor.server.js"></script>
 </body>
 </html>
@@ -15,7 +15,7 @@
            <div class="top-row">
                <CmpTop></CmpTop>
            </div>
-            <div class="content px-2 mb-5">
+            <div class="content pt-1 pt-lg-2 px-2 mb-5">
                @Body
            </div>
            <div class="fixed-bottom bottom-row">
@@ -2,7 +2,7 @@
    <a class="navbar-brand" href="">
        <div class="row">
            <div class="col-2 px-0">
-                <img src="./img/LogoBlu.svg" class="img-fluid" width="128" />
+                <img src="./img/LogoBlu.svg" class="img-fluid" width="64" />
            </div>
            <div class="col-10 h4">
                MAPO.GWMS
@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI;
@@ -80,6 +81,14 @@ namespace GWMS.UI
            // https://github.com/ElmahCore/ElmahCore
            app.UseElmah();

+            // fix forwarders
+            app.UseForwardedHeaders(new ForwardedHeadersOptions
+            {
+                ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+            });
+
+            app.UseAuthentication();
+
            app.UseHttpsRedirection();
            app.UseStaticFiles();

@@ -15,7 +15,8 @@ display-4 {
  font-family: 'Lato', sans-serif;
 }
 html,
-body {
+body,
+.textCondensed {
  font-family: 'Roboto Condensed', sans-serif;
 }
 a,
@@ -158,4 +159,7 @@ a,
    min-width: 8rem;
    min-height: 4rem;
  }
+  body {
+    font-size: 0.9em;
+  }
 }
@@ -6,7 +6,7 @@ h1, h2, h3, h4, h5, h6, b, display-1, display-2, display-3, display-4 {
    font-family: 'Lato', sans-serif;
 }

-html, body {
+html, body, .textCondensed {
    font-family: 'Roboto Condensed', sans-serif;
 }

@@ -173,4 +173,8 @@ a, .btn-link {
        min-width: @blSCut * 8;
        min-height: @blSCut * 4;
    }
+
+    body {
+        font-size: 0.9em;
+    }
 }
@@ -1 +1 @@
-@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.min.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif;}html,body{font-family:'Roboto Condensed',sans-serif;}a,.btn-link{color:#0366d6;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.shortcuts{text-align:center;}.shortcuts .shortcut-icon{font-size:2rem;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}
+@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.min.css');h1,h2,h3,h4,h5,h6,b,display-1,display-2,display-3,display-4{font-family:'Lato',sans-serif;}html,body,.textCondensed{font-family:'Roboto Condensed',sans-serif;}a,.btn-link{color:#0366d6;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.shortcuts{text-align:center;}.shortcuts .shortcut-icon{font-size:2rem;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}body{font-size:.9em;}}
@@ -1,6 +1,6 @@
 <body>
    <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2108.1012</h4>
+    <h4>Versione: 1.0.2108.1915</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-1.0.2108.1012
+1.0.2108.1915
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.1012</version>
+  <version>1.0.2108.1915</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>
Author	SHA1	Message	Date
Samuele Locatelli	a344c71a41	Merge branch 'release/ScannerQr'	2021-08-19 15:52:08 +02:00
Samuele Locatelli	16084755d4	Correzione comportamento scanner	2021-08-19 15:51:48 +02:00
Samuele Locatelli	677842f5e2	Merge tag 'ForwHeadersù' into develop Aggiunta forwarders headers coem suggerito da Marco x nginx proxy	2021-08-19 11:05:55 +02:00
Samuele Locatelli	e52c9f56fa	Merge branch 'release/ForwHeadersù'	2021-08-19 11:05:39 +02:00
Samuele Locatelli	871bec2cf3	Fix forwarders headers x nginx	2021-08-19 11:05:10 +02:00
Samuele Locatelli	0a5ea3ad64	Merge tag 'QRCodeTest' into develop Release iniziale lettura QRCode	2021-08-11 19:08:06 +02:00
Samuele Locatelli	11557de866	Merge branch 'release/QRCodeTest'	2021-08-11 19:07:57 +02:00
Samuele Locatelli	0a1fb88174	Abbozzata gestione acquisizione QRCode	2021-08-11 19:06:38 +02:00
Samuele Locatelli	1b28ddd007	Merge branch 'master' into develop	2021-08-11 18:34:30 +02:00
Samuele Locatelli	447c1d1d90	Test preliminare QRCode reader	2021-08-11 18:34:12 +02:00
Samuele Locatelli	050637948a	Merge branch 'release/FixMobileTrasporters'	2021-08-11 18:21:30 +02:00
Samuele Locatelli	0497d6aaa5	Aggiunto filtro in URL x trasportatore	2021-08-11 18:21:02 +02:00
Samuele Locatelli	be56ae95c5	Refresh	2021-08-11 18:14:30 +02:00
Samuele Locatelli	c8603a2a34	OK pagina trasportatore (tranne filtro...)	2021-08-11 13:34:56 +02:00
Samuele Locatelli	3b2e8eefa4	Continuo modifiche x ppagina trasportatori (SMART-mobile)	2021-08-11 13:15:06 +02:00
Samuele Locatelli	06f2f7c9ea	Inizio modifiche x pagina mobile	2021-08-11 13:14:53 +02:00
Samuele Locatelli	3908ee690d	Gestione supplier filtrato (inizio)	2021-08-11 11:45:23 +02:00
Samuele Locatelli	a15279766f	Merge tag 'FullOrderEditing' into develop Completato review editing ordini completo x user admin	2021-08-10 16:13:00 +02:00