Merge branch 'release/RC4'

Fix gestione ram: parameto ServerGC collector va messo a true x linux
virtual (errore RAM/CPU/Disco di OVH)

GWMS.UI/Components/OrderAdminEditor.razor

@@ -20,7 +20,8 @@
             <DataAnnotationsValidator />
             <div class="row">
                 <div class="col-12 col-lg-1">
-                    <img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />
+                    <div id="qrCodeImg"></div>
+                    @*<img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />*@
                 </div>
                 <div class="col-12 col-lg-9 align-items-center">
                     <div class="row">
@@ -266,6 +267,20 @@
     protected override async Task OnInitializedAsync()
     {
         await ReloadAllData();
+        await JSRuntime.InvokeVoidAsync("displayQr", "qrCodeImg", rawCode);
+    }
+
+    protected string rawCode
+    {
+        get
+        {
+            string answ = "";
+            if (_currItem != null)
+            {
+                answ = _currItem.OrderCode;
+            }
+            return answ;
+        }
     }
 
     protected async Task ReloadAllData()
@@ -290,17 +305,17 @@
         return q[parmName] ?? "";
     }
 
-    /// <summary>
-    /// Restituisce URL immagine QRCode
-    /// </summary>
-    /// <param name="QrValue">Parametro da renderizzare con QRCode</param>
-    /// <returns></returns>
-    protected string getImgUrl(object QrValue)
-    {
-        string baseUrl = $"{Configuration["ZCodeUrl"]}/HOME/QR_site/JSON?val=";
-        string payload = "{'baseUrl':'{0}','parameters':['" + $"{QrValue}" + "']}";
-        string answ = $"{baseUrl}{payload}";
-        return answ;
-    }
+    ///// <summary>
+    ///// Restituisce URL immagine QRCode
+    ///// </summary>
+    ///// <param name="QrValue">Parametro da renderizzare con QRCode</param>
+    ///// <returns></returns>
+    //protected string getImgUrl(object QrValue)
+    //{
+    //    string baseUrl = $"{Configuration["ZCodeUrl"]}/HOME/QR_site/JSON?val=";
+    //    string payload = "{'baseUrl':'{0}','parameters':['" + $"{QrValue}" + "']}";
+    //    string answ = $"{baseUrl}{payload}";
+    //    return answ;
+    //}
 
 }

GWMS.UI/Components/OrderSupplierEditor.razor

@@ -8,6 +8,7 @@
 @inject MessageService AppMService
 @inject GWMSDataService DataService
 @inject IConfiguration Configuration
+@inject IJSRuntime JSRuntime
 
 <div class="card">
     <div class="card-header bg-info text-light">
@@ -17,10 +18,11 @@
         <EditForm Model="@_currItem">
             <DataAnnotationsValidator />
             <div class="row">
-                <div class="col-12 col-lg-2">
-                    <img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />
+                <div class="col-12 col-lg-1">
+                    <div id="qrCodeImg"></div>
+                    @*<img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />*@
                 </div>
-                <div class="col-12 col-lg-8 align-items-center">
+                <div class="col-12 col-lg-9 align-items-center">
                     <div class="row">
                         <div class="col-8">
                             <div class="input-group">
@@ -138,6 +140,20 @@
     protected override async Task OnInitializedAsync()
     {
         await ReloadAllData();
+        await JSRuntime.InvokeVoidAsync("displayQr", "qrCodeImg", rawCode);
+    }
+
+    protected string rawCode
+    {
+        get
+        {
+            string answ = "";
+            if (_currItem != null)
+            {
+                answ = _currItem.OrderCode;
+            }
+            return answ;
+        }
     }
 
     protected async Task ReloadAllData()
@@ -145,17 +161,17 @@
         transpList = await DataService.TransportersGetAll();
     }
 
-    /// <summary>
-    /// Restituisce URL immagine QRCode
-    /// </summary>
-    /// <param name="QrValue">Parametro da renderizzare con QRCode</param>
-    /// <returns></returns>
-    protected string getImgUrl(object QrValue)
-    {
-        string baseUrl = $"{Configuration["ZCodeUrl"]}/HOME/QR_site/JSON?val=";
-        string payload = "{'baseUrl':'{0}','parameters':['" + $"{QrValue}" + "']}";
-        string answ = $"{baseUrl}{payload}";
-        return answ;
-    }
+    ///// <summary>
+    ///// Restituisce URL immagine QRCode
+    ///// </summary>
+    ///// <param name="QrValue">Parametro da renderizzare con QRCode</param>
+    ///// <returns></returns>
+    //protected string getImgUrl(object QrValue)
+    //{
+    //    string baseUrl = $"{Configuration["ZCodeUrl"]}/HOME/QR_site/JSON?val=";
+    //    string payload = "{'baseUrl':'{0}','parameters':['" + $"{QrValue}" + "']}";
+    //    string answ = $"{baseUrl}{payload}";
+    //    return answ;
+    //}
 
 }

GWMS.UI/Components/OrderTranspEditor.razor

@@ -155,17 +155,17 @@
         transpList = await DataService.TransportersGetAll();
     }
 
-    /// <summary>
-    /// Restituisce URL immagine QRCode
-    /// </summary>
-    /// <param name="QrValue">Parametro da renderizzare con QRCode</param>
-    /// <returns></returns>
-    protected string getImgUrl(object QrValue)
-    {
-        string baseUrl = $"{Configuration["ZCodeUrl"]}/HOME/QR_site/JSON?val=";
-        string payload = "{'baseUrl':'{0}','parameters':['" + $"{QrValue}" + "']}";
-        string answ = $"{baseUrl}{payload}";
-        return answ;
-    }
+    ///// <summary>
+    ///// Restituisce URL immagine QRCode
+    ///// </summary>
+    ///// <param name="QrValue">Parametro da renderizzare con QRCode</param>
+    ///// <returns></returns>
+    //protected string getImgUrl(object QrValue)
+    //{
+    //    string baseUrl = $"{Configuration["ZCodeUrl"]}/HOME/QR_site/JSON?val=";
+    //    string payload = "{'baseUrl':'{0}','parameters':['" + $"{QrValue}" + "']}";
+    //    string answ = $"{baseUrl}{payload}";
+    //    return answ;
+    //}
 
 }

GWMS.UI/Components/PlantDetail.razor.cs

@@ -7,6 +7,7 @@ using GWMS.Data.DTO;
 using Microsoft.AspNetCore.Components;
 using Blazorise.Charts;
 using System.Threading;
+using Microsoft.Extensions.Configuration;
 
 namespace GWMS.UI.Components
 {
@@ -75,6 +76,9 @@ namespace GWMS.UI.Components
 
         #region Private Properties
 
+        [Inject]
+        private IConfiguration Configuration { get; set; }
+
         [Inject]
         private NavigationManager NavManager { get; set; }
 
@@ -127,7 +131,9 @@ namespace GWMS.UI.Components
                     var dataReload = Task.Run(async () =>
                     {
                         // aggiunta delay o non riesce a disegnare
-                        Thread.Sleep(150);
+                        int ChartWaitDelay = 150;
+                        int.TryParse(Configuration["ChartWaitDelay"], out ChartWaitDelay);
+                        Thread.Sleep(ChartWaitDelay);
                         await HandleRedraw();
                     });
                 }

GWMS.UI/GWMS.UI.csproj

@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.2711</Version>
+    <Version>1.0.2108.2713</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
-    <ServerGarbageCollection>false</ServerGarbageCollection>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
 
   <ItemGroup>
@@ -38,11 +38,11 @@
     <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" />
-    <PackageReference Include="Blazorise.Components" Version="0.9.3.7" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.3.7" />
+    <PackageReference Include="Blazorise" Version="0.9.4.3" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.4.3" />
+    <PackageReference Include="Blazorise.Charts" Version="0.9.4.3" />
+    <PackageReference Include="Blazorise.Components" Version="0.9.4.3" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.4.3" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.9" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.9" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.9" />

GWMS.UI/Pages/Orders.razor

@@ -132,7 +132,20 @@
                             @foreach (var record in ListRecords)
                             {
                                 <tr class="@checkSelect(@record.OrderId)">
-                                    <td class="text-nowrap"><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button></td>
+                                    <td class="text-nowrap">
+                                        @if (currRecord == null)
+                                        {
+                                            <button class="btn btn-sm btn-info" @onclick="() => Edit(record)">
+                                                <span class="oi oi-pencil"></span>
+                                            </button>
+                                        }
+                                        else
+                                        {
+                                            <button class="btn btn-sm btn-secondary disabled">
+                                                <i class="oi oi-pencil"></i>
+                                            </button>
+                                        }
+                                    </td>
                                     <td>
                                         <div>@record.Plant.PlantCode</div>
                                         <div class="small">@record.Plant.PlantDesc</div>

GWMS.UI/Pages/Suppliers.razor

@@ -105,7 +105,20 @@
                             @foreach (var record in ListRecords)
                             {
                                 <tr class="@checkSelect(@record.OrderId)">
-                                    <td class="text-nowrap"><button class="btn btn-sm btn-info" @onclick="() => Edit(record)"><span class="oi oi-pencil"></span></button></td>
+                                    <td class="text-nowrap">
+                                        @if (currRecord == null)
+                                        {
+                                            <button class="btn btn-sm btn-info" @onclick="() => Edit(record)">
+                                                <span class="oi oi-pencil"></span>
+                                            </button>
+                                        }
+                                        else
+                                        {
+                                            <button class="btn btn-sm btn-secondary disabled">
+                                                <i class="oi oi-pencil"></i>
+                                            </button>
+                                        }
+                                    </td>
                                     <td>
                                         <div>@record.Plant.PlantCode</div>
                                         <div class="small">@record.Plant.PlantDesc</div>

GWMS.UI/Pages/_Host.cshtml

@@ -19,6 +19,7 @@
 
     <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" />
     <link rel="stylesheet" href="font-awesome/css/fontawesome.min.css" />
+    <link rel="stylesheet" href="Chart.js/Chart.min.css" />
     <link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
     <link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
 
@@ -41,9 +42,9 @@
     </div>
 
     <!-- inside of body section and after the div/app tag  -->
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>
+    <script src="jquery/jquery.min.js"></script>
+    <script src="Chart.js/Chart.min.js"></script>
+    <script src="popper.js/umd/popper.min.js"></script>
     <script src="bootstrap/js/bootstrap.min.js"></script>
 
     <script src="_content/Blazorise/blazorise.js"></script>

GWMS.UI/Startup.cs

@@ -129,18 +129,18 @@ namespace GWMS.UI
             string connStringDB = DbConfig.CONNECTION_STRING;
             string connStringRedis = Configuration.GetConnectionString("Redis");
             string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"));
-            var qrCodeUri = new Uri(Configuration["ZCodeUrl"]);
-            string qrCodeAddr = qrCodeUri.Host;
+            //var qrCodeUri = new Uri(Configuration["ZCodeUrl"]);
+            //string qrCodeAddr = qrCodeUri.Host;
 
             // healthchecks
             services.AddHealthChecks()
                 .AddMySql(connStringDB, "MySql instance")
                 .AddAsyncCheck($"DB PING ({dbServerAddr})", () => Health.Checks.PingCheck(dbServerAddr))
                 .AddAsyncCheck($"Redis PING ({redisSrvAddr})", () => Health.Checks.PingCheck(redisSrvAddr))
-                .AddAsyncCheck($"QrCode PING ({qrCodeAddr})", () => Health.Checks.PingCheck(qrCodeAddr))
+                //.AddAsyncCheck($"QrCode PING ({qrCodeAddr})", () => Health.Checks.PingCheck(qrCodeAddr))
                 .AddProcessAllocatedMemoryHealthCheck(512, "Max Process memory (<512MB)", failureStatus: HealthStatus.Degraded) // 512 MB max allocated memory
                 .AddRedis(Configuration.GetConnectionString("Redis"), "Redis", failureStatus: HealthStatus.Degraded)
-                .AddUrlGroup(new Uri(Configuration["ZCodeUrl"]), name: $"QrCode Gen ({Configuration["ZCodeUrl"]})", failureStatus: HealthStatus.Degraded)
+                //.AddUrlGroup(new Uri(Configuration["ZCodeUrl"]), name: $"QrCode Gen ({Configuration["ZCodeUrl"]})", failureStatus: HealthStatus.Degraded)
                 .AddAsyncCheck($"MySql Root User", () => Health.Checks.DbUserRoot("MySql"))
                 .AddAsyncCheck($"MySql App Users", () => Health.Checks.DbUserApp(DbConfig.DATABASE_NAME))
                 .AddAsyncCheck($"MySql Identity", () => Health.Checks.DbIdentity(DbConfig.DATABASE_NAME))

GWMS.UI/appsettings.json

@@ -34,6 +34,7 @@
     "IntervalMin": 60,
     "MaxLogRecord": 360,
     "ZCodeUrl": "https://qrcode.steamware.net/",
+    "ChartWaitDelay": 10,
     "logo": "img/LogoPizzaferri.jpg",
     "ExternalProviders": {
         "MailKit": {

GWMS.UI/libman.json

@@ -1,14 +1,26 @@
 {
-    "version": "1.0",
-    "defaultProvider": "cdnjs",
-    "libraries": [
-        {
-            "library": "font-awesome@5.15.4",
-            "destination": "wwwroot/font-awesome/"
-        },
-        {
-            "library": "bootstrap@4.6.0",
-            "destination": "wwwroot/bootstrap/"
-        }
-    ]
+  "version": "1.0",
+  "defaultProvider": "cdnjs",
+  "libraries": [
+    {
+      "library": "font-awesome@5.15.4",
+      "destination": "wwwroot/font-awesome/"
+    },
+    {
+      "library": "bootstrap@4.6.0",
+      "destination": "wwwroot/bootstrap/"
+    },
+    {
+      "library": "Chart.js@2.8.0",
+      "destination": "wwwroot/Chart.js/"
+    },
+    {
+      "library": "popper.js@1.16.1",
+      "destination": "wwwroot/popper.js/"
+    },
+    {
+      "library": "jquery@3.5.1",
+      "destination": "wwwroot/jquery/"
+    }
+  ]
 }

GWMS.UI/wwwroot/Chart.js/Chart.css

@@ -0,0 +1,47 @@
+/*
+ * DOM element rendering detection
+ * https://davidwalsh.name/detect-node-insertion
+ */
+@keyframes chartjs-render-animation {
+	from { opacity: 0.99; }
+	to { opacity: 1; }
+}
+
+.chartjs-render-monitor {
+	animation: chartjs-render-animation 0.001s;
+}
+
+/*
+ * DOM element resizing detection
+ * https://github.com/marcj/css-element-queries
+ */
+.chartjs-size-monitor,
+.chartjs-size-monitor-expand,
+.chartjs-size-monitor-shrink {
+	position: absolute;
+	direction: ltr;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	overflow: hidden;
+	pointer-events: none;
+	visibility: hidden;
+	z-index: -1;
+}
+
+.chartjs-size-monitor-expand > div {
+	position: absolute;
+	width: 1000000px;
+	height: 1000000px;
+	left: 0;
+	top: 0;
+}
+
+.chartjs-size-monitor-shrink > div {
+	position: absolute;
+	width: 200%;
+	height: 200%;
+	left: 0;
+	top: 0;
+}

GWMS.UI/wwwroot/Chart.js/Chart.min.css

@@ -0,0 +1 @@
+@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}

Resources/ChangeLog.html

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

Resources/VersNum.txt

@@ -1 +1 @@
-1.0.2108.2711
+1.0.2108.2713

Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.2711</version>
+  <version>1.0.2108.2713</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>