Merge branch 'release/HistPlantPage'

Completato editing ed update ordini mancanti
Fix comportamento cambio selezione data
2021-09-23 15:37:35 +02:00 · 2021-09-23 15:36:49 +02:00 · 2021-09-23 11:57:56 +02:00 · 2021-09-23 11:24:53 +02:00 · 2021-09-23 10:53:02 +02:00 · 2021-09-23 10:52:31 +02:00
95 changed files with 66678 additions and 582 deletions
@@ -1,10 +1,4 @@
 variables:
-#  NUGET_PATH: 'C:\Tools\nuget.exe'
-#  MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe'
-#  ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
-#  EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release'
-#  DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds'
-#  NEW_REL: '' 
  VERS_MAIN: '0.9'
  NEXUS_PATH: 'GWMS'
  APP_NAME: 'GWMS.UI'
@@ -14,9 +8,9 @@ variables:
   - |
      $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C
      if ($hasSource -eq 0) {
-         C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
+         C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
      } else {
-         C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source http://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
+         C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
      }
      echo $hasSource
      
@@ -52,11 +46,12 @@ variables:
      $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*")
      ForEach ($File in $File2Send) {
        $FileName = Split-Path $File -leaf
-        mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/$FileName
-        mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNumb/$FileName
+        mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName
+        mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ARCHIVE/$VersNumb/$FileName
+
      }
-      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/manifest.xml
-      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/ChangeLog.html
+      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
+      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
      

 # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip
@@ -64,12 +59,13 @@ variables:
 stages:
  - build
  - test
-  # - deploy
  - installer
  - release

 build:
  stage: build
+  tags:
+    - win
  before_script:
    - *nuget-fix
    - dotnet restore GWMS.sln
@@ -78,38 +74,18 @@ build:

 test:
  stage: test
+  tags:
+    - win
  only:
    - develop
  needs: ["build"]
  script:
    - dotnet test -p:Configuration=Release GWMS.UI/GWMS.UI.csproj 

-# IIS01:deploy:
-#   stage: deploy
-#   only:
-#     - develop
-#   needs: ["test"]
-#   # before_script:
-#   #   - *nuget-fix
-#   #   - dotnet restore
-#   script: 
-#     - dotnet publish -p:PublishProfile=IIS01.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GWMS.UI/GWMS.UI.csproj
-
-
-# IIS02:deploy:
-#   stage: deploy
-#   only:
-#     - master
-#   needs: ["build"]
-#   # before_script:
-#   #   - *nuget-fix
-#   #   - dotnet restore
-#   script: 
-#     - dotnet publish -p:PublishProfile=IIS02.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GWMS.UI/GWMS.UI.csproj
-#     - dotnet publish -p:PublishProfile=W2019-IIS-DEVProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release -p:username=jenkins -p:Password=viadante16 -p:AllowUntrustedCertificate=true GWMS.UI/GWMS.UI.csproj
-
 installer:
  stage: installer
+  tags:
+    - win
  only:
    - develop
    - master
@@ -118,13 +94,17 @@ installer:
    # - *nuget-fix
    # - dotnet restore
  script: 
-    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish
+    # - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish
+    # pubblico solo installer Linux x64: https://docs.microsoft.com/en-us/dotnet/core/deploying/
+    - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release GWMS.UI/GWMS.UI.csproj -o:publish  -r linux-x64 --self-contained false
    # qui il deploy su nexus...
    - *hashBuild
    - *nexusUpload

 release:
  stage: release
+  tags:
+    - win
  only:
    #- feature/Deploy_CI_CD
    # - master
@@ -0,0 +1,35 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+            "name": ".NET Core Launch (web)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/GWMS.UI/bin/Debug/net5.0/GWMS.UI.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/GWMS.UI",
+            "stopAtEntry": false,
+            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+            "serverReadyAction": {
+                "action": "openExternally",
+                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+            },
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "sourceFileMap": {
+                "/Views": "${workspaceFolder}/Views"
+            }
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}
@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/GWMS.UI/GWMS.UI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/GWMS.UI/GWMS.UI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "${workspaceFolder}/GWMS.UI/GWMS.UI.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
@@ -26,117 +26,11 @@ namespace GWMS.Data.Controllers
        {
            _configuration = configuration;
            dbCtx = new GWMSContext(configuration);
-            Log.Info("Avviata classe GWMSController");
+            //Log.Info("Avviata classe GWMSController");
        }

        #endregion Public Constructors

-        #region Private Methods
-
-        private void CreateSimData(int numDays, int stepMin, int maxHourRate)
-        {
-            // disattivazione per sicurezza
-#if false
-            ResetController();
-            // generazione dati casuale
-            Random rnd = new Random();
-            foreach (var plant in GetPlants())
-            {
-                var currPlant = GetPlant(plant.PlantId);
-                // imposto limiti e valori attuali...
-                //currPlant.LevelMax = rnd.Next(24, 28) * 1000;
-                int simLevel = rnd.Next(1, (int)currPlant.LevelMax);
-                double simPress = (double)rnd.Next((int)(currPlant.PressMax - 50) * 10, (int)currPlant.PressMax * 10) / 10;
-                double simPressH = (double)rnd.Next((int)(currPlant.PressBHMax - 70) * 10, (int)currPlant.PressBHMax * 10) / 10;
-                double simPressL = (double)rnd.Next((int)(currPlant.PressBLMax - 70) * 10, (int)currPlant.PressBLMax * 10) / 10;
-                currPlant.LevelAct = simLevel;
-                currPlant.PressAct = simPress;
-                currPlant.PressBHAct = simPressH;
-                currPlant.PressBLAct = simPressL;
-                dbCtx.SaveChanges();
-
-                // genero random le soglie x simulare rilievi e ordini
-                int soglia01 = rnd.Next((int)currPlant.LevelMax * 60 / 100, (int)currPlant.LevelMax * 75 / 100);
-                int soglia02 = rnd.Next((int)currPlant.LevelMax * 5 / 100, (int)currPlant.LevelMax * 35 / 100);
-
-                List<PlantLogModel> LogLevels = new List<PlantLogModel>();
-                List<PlantLogModel> LogPressures = new List<PlantLogModel>();
-                List<OrderModel> LogOrders = new List<OrderModel>();
-
-                DateTime adesso = DateTime.Now;
-                int lastLevel = simLevel;
-                int lastOrder = 0;
-                int anticipo = 0;
-                double lastPress = simPress;
-                double lastPressH = simPressH;
-                double lastPressL = simPressL;
-                // simulo numDays gg...
-                for (int i = numDays * 24 * (60 / stepMin); i > 0; i--)
-                {
-                    anticipo = i * stepMin;
-                    lastLevel = lastLevel - rnd.Next(0, maxHourRate / (60 / stepMin));
-                    // se inferiore a soglia 1 --> ordine
-                    if (lastLevel + lastOrder < soglia01)
-                    {
-                        lastOrder = rnd.Next((int)currPlant.LevelMax - soglia01, (int)currPlant.LevelMax - soglia02);
-                        LogOrders.Add(new OrderModel() { DtOrder = adesso.AddMinutes(-anticipo), OrderQty = lastOrder, PlantId = plant.PlantId, OrderCode = $"ORD{i:000000}", OrderDesc = "SIM Order", SupplierId = 1, TransporterId = 1 });
-                    }
-
-                    // se inferiore a soglia 2 --> refill
-                    if (lastLevel < soglia02)
-                    {
-                        lastLevel += lastOrder;
-                        lastOrder = 0;
-                    }
-                    LogLevels.Add(new PlantLogModel() { DtEvent = adesso.AddMinutes(-anticipo), FluxType = "Level", PlantId = plant.PlantId, ValNumber = lastLevel });
-
-                    // pressioni!
-                    lastPress = lastPress - (double)rnd.Next(-30, 25) / 10;
-                    lastPressH = lastPressH - (double)rnd.Next(-25, 20) / 10;
-                    lastPressL = lastPressL - (double)rnd.Next(-25, 20) / 10;
-                    LogPressures.Add(new PlantLogModel() { DtEvent = adesso.AddMinutes(-anticipo), FluxType = "MainPress", PlantId = plant.PlantId, ValNumber = lastPress });
-                    LogPressures.Add(new PlantLogModel() { DtEvent = adesso.AddMinutes(-anticipo), FluxType = "PressBH", PlantId = plant.PlantId, ValNumber = lastPressH });
-                    LogPressures.Add(new PlantLogModel() { DtEvent = adesso.AddMinutes(-anticipo), FluxType = "PressBL", PlantId = plant.PlantId, ValNumber = lastPressL });
-                }
-
-                try
-                {
-                    dbCtx
-                        .DbSetPlantLog
-                        .AddRange(LogLevels);
-
-                    dbCtx
-                        .DbSetPlantLog
-                        .AddRange(LogPressures);
-
-                    // salvo sul DB!
-                    dbCtx.SaveChanges();
-                    Log.Info($"Effettuato inserimento {LogLevels.Count} record PlantLog");
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"Eccezione in salvataggio PlantLog{Environment.NewLine}{exc}");
-                }
-                try
-                {
-                    dbCtx
-                        .DbSetOrders
-                        .AddRange(LogOrders);
-
-                    // salvo sul DB!
-                    dbCtx.SaveChanges();
-                    Log.Info($"Effettuato inserimento {LogOrders.Count} record Orders");
-                }
-                catch (Exception exc)
-                {
-                    Log.Error($"Eccezione in salvataggio Orders{Environment.NewLine}{exc}");
-                }
-            }
-#endif
-        }
-
-        #endregion Private Methods
-
        #region Public Methods

        /// <summary>
@@ -156,6 +50,7 @@ namespace GWMS.Data.Controllers
        {
            // Clear database context
            dbCtx.Dispose();
+            //Log.Info("Dispose di GWMSController");
        }

        public List<ConfigModel> GetConfig()
@@ -192,6 +87,22 @@ namespace GWMS.Data.Controllers
            return dbResult;
        }

+        public OrderModel GetOrderById(int OrderId)
+        {
+            OrderModel dbResult = new OrderModel();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
+                    .DbSetOrders
+                    .Where(x => (x.OrderId == OrderId))
+                    .Include(p => p.Plant)
+                    .Include(s => s.Supplier)
+                    .Include(t => t.Transporter)
+                    .FirstOrDefault();
+            }
+            return dbResult;
+        }
+
        public List<OrderModel> GetOrdersFilt(int PlantId, int SupplierId, int TransporterId, DateTime DtStart, DateTime DtEnd, bool ShowClosed)
        {
            var dbResult = dbCtx
@@ -249,6 +160,102 @@ namespace GWMS.Data.Controllers
            return dbResult;
        }

+        /// <summary>
+        /// Elenco in formato di lista DTO resoconti giornalieri x Plant
+        /// - elenco record livelli giornalieri
+        /// - elenco record ordini giornalieri
+        /// - valori start/end/min/max giornalieri x livello
+        /// </summary>
+        /// <param name="PlantId">codice plant</param>
+        /// <param name="DtStart">data inizio</param>
+        /// <param name="DtEnd">data fine</param>
+        /// <returns></returns>
+        public List<PlantLevSumDTO> GetPlantLogSummary(int PlantId, DateTime DtStart, DateTime DtEnd)
+        {
+            List<PlantLevSumDTO> dbResult = new List<PlantLevSumDTO>();
+            if (PlantId > 0)
+            {
+                using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+                {
+                    var dbLevels = localDbCtx
+                     .DbSetPlantLog
+                     .Where(x => x.PlantId == PlantId && x.FluxType == "Level" && x.DtEvent <= DtEnd && x.DtEvent > DtStart)
+                     .OrderBy(x => x.DtEvent)
+                     .ToList();
+
+                    var dbOrders = localDbCtx
+                         .DbSetOrders
+                         .Where(x => (x.PlantId == PlantId) && x.DtExecStart <= DtEnd && x.DtExecStart > DtStart)
+                         .OrderBy(x => x.DtExecStart)
+                         .ToList();
+
+                    var dbPlant = localDbCtx
+                        .DbSetPlant
+                        .Where(x => x.PlantId == PlantId)
+                        .FirstOrDefault();
+
+                    // ora ricostruisco i record in uscita... ciclando data x data...
+                    DateTime dataCurr = DtStart.Date;
+                    int numDays = DtEnd.Subtract(DtStart).Days;
+                    for (int i = 0; i < numDays; i++)
+                    {
+                        dataCurr = DtStart.Date.AddDays(i);
+                        // recupero i dati della gioranta indicata
+                        var currLevelTS = dbLevels
+                                        .Where(x => x.DtEvent > dataCurr && x.DtEvent <= dataCurr.AddDays(1))
+                                        .Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber })
+                                        .ToList();
+                        // SOLO SE ho almeno 1 record livello
+                        if (currLevelTS.Count > 0)
+                        {
+                            PlantLevSumDTO newRec = new PlantLevSumDTO()
+                            {
+                                PlantId = PlantId,
+                                PlantCode = dbPlant.PlantCode,
+                                PlantDesc = dbPlant.PlantDesc,
+                                DataRif = dataCurr
+                            };
+                            // se ho dati giornalieri li aggiungo...
+                            if (currLevelTS.Count > 0)
+                            {
+                                var minRecord = currLevelTS
+                                                    .OrderBy(x => x.ValDouble)
+                                                    .FirstOrDefault();
+                                var maxRecord = currLevelTS
+                                                    .OrderByDescending(x => x.ValDouble)
+                                                    .FirstOrDefault();
+
+                                newRec.LevelTS = currLevelTS;
+                                newRec.LevelStart = currLevelTS
+                                                    .OrderBy(x => x.DtEvent)
+                                                    .FirstOrDefault().ValDouble;
+                                newRec.LevelEnd = currLevelTS
+                                                    .OrderByDescending(x => x.DtEvent)
+                                                    .FirstOrDefault().ValDouble;
+                                newRec.LevelMin = minRecord.ValDouble;
+                                newRec.FillStart = minRecord.DtEvent;
+                                newRec.LevelMax = maxRecord.ValDouble;
+                                newRec.FillEnd = maxRecord.DtEvent;
+                            }
+                            if (dbOrders.Count > 0)
+                            {
+                                newRec.OrderTS = dbOrders
+                                            .Where(x => x.DtExecStart >= dataCurr && x.DtExecStart < dataCurr.AddDays(1))
+                                            .Select(x => new TSData() { DtEvent = x.DtOrder, ValDouble = x.OrderQty }).ToList();
+                                newRec.OrdersIds = dbOrders
+                                            .Where(x => x.DtExecStart >= dataCurr && x.DtExecStart < dataCurr.AddDays(1))
+                                            .Select(x => x.OrderId).ToList();
+                            }
+                            dbResult.Add(newRec);
+                        }
+                    }
+                    dbResult = dbResult.OrderByDescending(x => x.DataRif).ToList();
+                }
+            }
+            // restituisco riordinato DESC
+            return dbResult;
+        }
+
        public List<PlantDetailModel> GetPlants()
        {
            var dbResult = dbCtx
@@ -261,9 +268,9 @@ namespace GWMS.Data.Controllers
        public List<PlantDTO> GetPlantsDTO(int maxRecords)
        {
            List<PlantDTO> dbResult = new List<PlantDTO>();
-            using (GWMSContext dbCtxMult = new GWMSContext(_configuration))
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
            {
-                var plantList = dbCtxMult
+                var plantList = localDbCtx
                    .DbSetPlant
                    .ToList();

@@ -330,7 +337,7 @@ namespace GWMS.Data.Controllers
            List<WeekPlanModel> dbResult = new List<WeekPlanModel>();
            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
            {
-                dbResult = dbCtx
+                dbResult = localDbCtx
                    .DbSetPlantSupplWeekPlan
                    .Include(p => p.Plant)
                    .Include(s => s.Supplier)
@@ -367,15 +374,21 @@ namespace GWMS.Data.Controllers
            {
                if (Item2Del != null)
                {
+                    var rec2del = dbCtx
+                                    .DbSetOrders
+                                    .Where(x => x.OrderId == Item2Del.OrderId)
+                                    .FirstOrDefault();
                    dbCtx
                        .DbSetOrders
-                        .Remove(Item2Del);
+                        .Remove(rec2del);
                    dbCtx.SaveChanges();
                    done = true;
                }
            }
            catch (Exception exc)
-            { }
+            {
+                Log.Error($"Eccezione in OrderDelete:{Environment.NewLine}{exc}");
+            }
            return done;
        }

@@ -439,7 +452,9 @@ namespace GWMS.Data.Controllers
                done = true;
            }
            catch (Exception exc)
-            { }
+            {
+                Log.Error($"Eccezione in OrderUpdate:{Environment.NewLine}{exc}");
+            }
            return done;
        }

@@ -451,6 +466,7 @@ namespace GWMS.Data.Controllers
        /// <returns></returns>
        public PlantDTO PlantDTO(int PlantId, int maxRecords)
        {
+            DateTime lastRec = DateTime.Today;
            var currPlant = GetPlant(PlantId);
            PlantDTO answ = new PlantDTO();
            List<TSData> LevelTS = new List<TSData>();
@@ -461,10 +477,10 @@ namespace GWMS.Data.Controllers
            List<TSData> PressBLTS = new List<TSData>();
            List<TSData> OrderTS = new List<TSData>();

-            using (GWMSContext dbCtxMult = new GWMSContext(_configuration))
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
            {
                // recupero dal DB
-                var rawLevelData = dbCtxMult
+                var rawLevelData = localDbCtx
                                .DbSetPlantLog
                                .Where(x => x.FluxType == "Level" && x.PlantId == PlantId)
                                .OrderByDescending(x => x.DtEvent)
@@ -472,7 +488,7 @@ namespace GWMS.Data.Controllers
                                .OrderBy(x => x.DtEvent)
                                .ToList();

-                var rawMainPressData = dbCtxMult
+                var rawMainPressData = localDbCtx
                                    .DbSetPlantLog
                                    .Where(x => x.FluxType == "MainPress" && x.PlantId == PlantId)
                                    .OrderByDescending(x => x.DtEvent)
@@ -480,7 +496,7 @@ namespace GWMS.Data.Controllers
                                    .OrderBy(x => x.DtEvent)
                                    .ToList();

-                var rawBHPressData = dbCtxMult
+                var rawBHPressData = localDbCtx
                                    .DbSetPlantLog
                                    .Where(x => x.FluxType == "PressBH" && x.PlantId == PlantId)
                                    .OrderByDescending(x => x.DtEvent)
@@ -488,7 +504,7 @@ namespace GWMS.Data.Controllers
                                    .OrderBy(x => x.DtEvent)
                                    .ToList();

-                var rawBLPressData = dbCtxMult
+                var rawBLPressData = localDbCtx
                                    .DbSetPlantLog
                                    .Where(x => x.FluxType == "PressBL" && x.PlantId == PlantId)
                                    .OrderByDescending(x => x.DtEvent)
@@ -496,7 +512,7 @@ namespace GWMS.Data.Controllers
                                    .OrderBy(x => x.DtEvent)
                                    .ToList();

-                var rawOrderData = dbCtxMult
+                var rawOrderData = localDbCtx
                                    .DbSetOrders
                                    .Where(x => x.PlantId == PlantId && x.ExecutionQty == 0)
                                    .OrderByDescending(x => x.DtOrder)
@@ -528,6 +544,8 @@ namespace GWMS.Data.Controllers
                double valBH = PressBHTS.Count > 0 ? PressBHTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
                double valBL = PressBLTS.Count > 0 ? PressBLTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;

+                lastRec = LevelTS.Count > 0 ? LevelTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().DtEvent : DateTime.Today;
+
                PressAct.Add("Main", valMain);
                PressAct.Add("BH", valBH);
                PressAct.Add("BL", valBL);
@@ -535,6 +553,7 @@ namespace GWMS.Data.Controllers
                // popolo valolri
                answ = new PlantDTO()
                {
+                    LastUpdate = lastRec,
                    PlantId = PlantId,
                    PlantCode = currPlant.PlantCode,
                    PlantDesc = currPlant.PlantDesc,
@@ -609,30 +628,6 @@ namespace GWMS.Data.Controllers
            return done;
        }

-        /// <summary>
-        /// Rigenera intero DB se riceve ID di un plant SIM...
-        /// </summary>
-        /// <param name="PlantId"></param>
-        public bool RegenDB(int PlantId, int numDays, int stepMin, int maxHourRate)
-        {
-            bool answ = false;
-            var currPlant = GetPlant(PlantId);
-            if (currPlant.PlantCode.StartsWith("PIZ"))
-            {
-                Log.Info("Inizio RegenDB");
-
-                DbAdmin.resetPlantLogTable();
-
-                ResetController();
-
-                CreateSimData(numDays, stepMin, maxHourRate);
-                Log.Info("Dati SIM generati");
-
-                answ = true;
-            }
-            return answ;
-        }
-
        public void ResetController()
        {
            dbCtx = new GWMSContext(_configuration);
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+// <Auto-Generated>
+// This is here so CodeMaid doesn't reorganize this document
+// </Auto-Generated>
+
+namespace GWMS.Data.DTO
+{
+    public class PlantLevSumDTO
+    {
+        #region Public Properties
+        public int PlantId { get; set; }
+        public string PlantCode { get; set; } = "";
+        public string PlantDesc { get; set; } = "";
+
+        public DateTime DataRif { get; set; } = DateTime.Today;
+
+        public double LevelStart { get; set; } = 0;
+        public double LevelMin { get; set; } = 0;
+        public double LevelMax { get; set; } = 99999;
+        public double LevelEnd { get; set; } = 0;
+
+        public DateTime FillStart { get; set; } = DateTime.Today;
+        public DateTime FillEnd { get; set; } = DateTime.Today;
+
+        public double DeltaMin { get; set; } = 100;
+
+        public bool HasRefill
+        {
+            get
+            {
+                return (LevelMax > LevelStart + DeltaMin) && ((LevelStart + LevelEnd) > 0);
+            }
+        }
+        public bool HasOrder
+        {
+            get
+            {
+                return OrderTS.Count > 0;
+            }
+        }
+
+        public List<TSData> LevelTS { get; set; } = new List<TSData>();
+        public List<TSData> OrderTS { get; set; } = new List<TSData>();
+        public List<int> OrdersIds { get; set; } = new List<int>();
+
+        #endregion Public Properties
+    }
+}
@@ -14,10 +14,11 @@ namespace GWMS.Data.DTO
    {
        #region Public Properties
        public int PlantId { get; set; }
-
        public string PlantCode { get; set; } = "";
        public string PlantDesc { get; set; } = "";

+        public DateTime LastUpdate { get; set; } = DateTime.Today.AddYears(-10);
+
        public double LevelMax { get; set; } = 99999;

        public double LevelAct { get; set; } = 0;
@@ -10,21 +10,21 @@

  <ItemGroup>
    <PackageReference Include="MailKit" Version="2.15.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.10">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
-    <PackageReference Include="NLog" Version="4.7.10" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0" />
+    <PackageReference Include="NLog" Version="4.7.11" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.1" />
  </ItemGroup>
 </Project>
@@ -34,7 +34,9 @@ namespace GWMS.Data
                Database.Migrate();
            }
            catch (Exception exc)
-            { }
+            {
+                Log.Error(exc, "Exception during context initialization 01");
+            }
        }

        public GWMSContext(DbContextOptions<GWMSContext> options) : base(options)
@@ -45,7 +47,9 @@ namespace GWMS.Data
                Database.Migrate();
            }
            catch (Exception exc)
-            { }
+            {
+                Log.Error(exc, "Exception during context initialization 02");
+            }
        }

        #endregion Public Constructors
@@ -1,10 +0,0 @@
-<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
-    </Found>
-    <NotFound>
-        <LayoutView Layout="@typeof(MainLayout)">
-            <p>Sorry, there's nothing at this address.</p>
-        </LayoutView>
-    </NotFound>
-</Router>
@@ -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">
@@ -89,12 +90,12 @@
                            <div class="input-group">
                                <div class="input-group-prepend">
                                    <span class="input-group-text">
-                                        <span class="fas fa-weight" aria-hidden="true"></span>
+                                        <span class="fas fa-cart-plus" title="Ordinato"></span>
                                    </span>
                                </div>
                                <InputNumber @bind-Value="@_currItem.OrderQty" class="form-control"></InputNumber>
                                <div class="input-group-append">
-                                    <span class="input-group-text">kg</span>
+                                    <span class="input-group-text" title="Ordinato">kg</span>
                                </div>
                            </div>
                        </div>
@@ -171,12 +172,12 @@
                        <div class="input-group">
                            <div class="input-group-prepend">
                                <span class="input-group-text">
-                                    <span class="fas fa-weight" aria-hidden="true"></span>
+                                    <span class="fas fa-weight" aria-hidden="true" title="Consegnato"></span>
                                </span>
                            </div>
                            <InputNumber @bind-Value="@_currItem.ExecutionQty" class="form-control"></InputNumber>
                            <div class="input-group-append">
-                                <span class="input-group-text">kg</span>
+                                <span class="input-group-text" title="Consegnato">kg</span>
                            </div>
                        </div>
                    </div>
@@ -233,7 +234,7 @@
    {
        if (_currItem != null)
        {
-            DataService.OrderUpdate(_currItem);
+            await DataService.OrderUpdate(_currItem);
            await DataUpdated.InvokeAsync(1);
        }
        else
@@ -254,7 +255,7 @@

        if (_currItem != null)
        {
-            DataService.OrderDelete(_currItem);
+            await DataService.OrderDelete(_currItem);
            await DataUpdated.InvokeAsync(1);
        }
        else
@@ -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;
+    //}

 }
@@ -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">
@@ -66,10 +68,10 @@
                </div>
                <div class="col-12 col-lg-2">
                    <div class="mb-2">
-                        <button type="button" class="btn btn-outline-success btn-block" value="Save" @onclick="saveUpdate">Save <i class="far fa-save"></i></button>
+                        <button type="button" class="btn btn-success btn-block" value="Save" @onclick="saveUpdate">Save <i class="far fa-save"></i></button>
                    </div>
                    <div>
-                        <button type="button" class="btn btn-outline-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel <i class="fas fa-ban"></i></button>
+                        <button type="button" class="btn btn-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel <i class="fas fa-ban"></i></button>
                    </div>
                </div>
            </div>
@@ -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;
+    //}

 }
@@ -17,50 +17,14 @@
        {
            <EditForm Model="@_currItem">
                <DataAnnotationsValidator />
-                <div class="row">
-                    <div class="col-12 col-lg-2 text-center">
+                <div class="d-flex flex-column text-center">
+                    <div class="p-1 flex-grow-1">
                        <div id="qrCodeImg"></div>
                        @_currItem.OrderCode
                        @*<img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" />*@
                    </div>
-                    @*<div class="col-12 col-lg-8 align-items-center">
-                            <div class="row small">
-                                <div class="col-12">
-                                    <div class="input-group input-group-sm">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text" style="width: 3em;">
-                                                <span class="fas fa-truck" aria-hidden="true"></span>
-                                            </span>
-                                        </div>
-                                        <DateEdit @bind-Date="_currItem.DtETA" InputMode="DateInputMode.DateTime" class="form-control" title="ETA (previsione consegna)" />
-                                    </div>
-                                </div>
-                                <div class="col-12">
-                                    <div class="input-group input-group-sm">
-                                        <div class="input-group-prepend">
-                                            <span class="input-group-text" style="width: 3em;">
-                                                <span class="fas fa-comment-alt" aria-hidden="true"></span>
-                                            </span>
-                                        </div>
-                                        <InputText id="OrderDesc" @bind-Value="_currItem.OrderDesc" class="form-control" title="Note Ordine (opzionali)" />
-                                        <div class="input-group-append">
-                                            <span class="input-group-text">
-                                                Note
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>*@
-                    <div class="col-12 col-lg-2">
-                        <div class="row">
-                            @*<div class="col">
-                                    <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">
-                                <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 class="p-1 flex-grow-1">
+                        <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>
            </EditForm>
@@ -155,17 +119,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;
+    //}

 }
@@ -9,7 +9,7 @@
                <div class="col-5 pr-0 font-weight-bold">
                    <h2>@currItem.PlantCode</h2>
                </div>
-                <div class="col-7 text-right">
+                <div class="col-7 text-right align-bottom">
                    <h4>@currItem.PlantDesc</h4>
                </div>
            </div>
@@ -46,31 +46,26 @@
                <div class="row">
                    <div class="col-12">
                        <ul class="list-group">
-                            <li class="list-group-item active d-flex justify-content-between align-items-center">SERBATOIO Principale</li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center">
-                                <div class="row">
-                                    @*<div class="col-4 small">
-                                            @currItem.LevelAct.ToString("N0")
-                                        </div>*@
-                                    <div class="col-12 text-center small">
-                                        <span><i class="fas fa-database"></i> Livello: </span> <span style="font-size:1.2em;"><b>@currItem.LevelRatio</b> <sub>%</sub></span> <span>(@currItem.LevelAct.ToString("N0")/@currItem.LevelMax.ToString("N0"))</span>
-                                    </div>
-                                    @*<div class="col-4 text-right small">
-                                            @currItem.LevelMax.ToString("N0")
-                                        </div>*@
-                                    <div class="col-12 small">
+                            <li class="list-group-item @headerStatus d-flex justify-content-between align-items-center px-0 py-1 small">
+                                <div class="px-1" title="@checkRTime">
+                                    SERBATOIO Principale <i class="fas fa-play @playStatus"></i>
+                                </div>
+                                <div class="px-1 text-right">
+                                    <span><i class="fas fa-database"></i> Livello:</span><span>@currItem.LevelAct.ToString("N0")/@currItem.LevelMax.ToString("N0")</span> | <span style="font-size:1.2em;"><b>@currItem.LevelRatio</b> <sub>%</sub></span>
+                                </div>
+                            </li>
+                            <li class="list-group-item align-items-center px-1 py-2">
+                                <div class="d-flex flex-column">
+                                    <div class="p-1 flex-grow-1">
                                        <Progress>
                                            <ProgressBar Value="@currItem.LevelRatio" Striped="false" Animated="false" />
                                        </Progress>
                                    </div>
-                                    <div class="col-12 px-0 mt-2">
+                                    <div class="px-1 py-2">
                                        <LineChart @ref="LevelVal" TItem="double" OptionsObject="lineChartOptions" />
                                    </div>
                                </div>
                            </li>
-                            @*<li class="list-group-item d-flex justify-content-between align-items-center">
-                                    <span><i class="fas fa-database"></i> Livello</span> <span style="font-size:1.2em;"><b>@currItem.LevelRatio</b> <sub>%</sub></span>
-                                </li>*@
                            <li class="list-group-item d-flex justify-content-between align-items-center">
                                <span><i class="fas fa-compress-arrows-alt"></i> Pressione</span> <span style="font-size:1.2em;"><b>@currItem.PressAct["Main"].ToString("N1")</b> <span class="small"> <sub>bar</sub></span></span>
                            </li>
@@ -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
 {
@@ -56,7 +57,7 @@ namespace GWMS.UI.Components
                Mode = "nearest",
                Intersect = false
            },
-            Animation = true,
+            Animation = false,
            Responsive = true,
            AspectRatio = 2,
            type = "line",
@@ -75,6 +76,9 @@ namespace GWMS.UI.Components

        #region Private Properties

+        [Inject]
+        private IConfiguration Configuration { get; set; }
+
        [Inject]
        private NavigationManager NavManager { get; set; }

@@ -112,6 +116,11 @@ namespace GWMS.UI.Components

        #region Public Properties

+        public string checkRTime
+        {
+            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? $"Mancata ricezione: ultimo aggiornamento {_currItem.LastUpdate}" : $"Dati Realtime aggiornati al {_currItem.LastUpdate}";
+        }
+
        [Parameter]
        public PlantDTO currItem
        {
@@ -127,13 +136,25 @@ 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();
                    });
                }
            }
        }

+        public string headerStatus
+        {
+            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? "text-secondary" : "active";
+        }
+
+        public string playStatus
+        {
+            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? "text-danger" : "text-success";
+        }
+
        #endregion Public Properties

        #region Private Methods
@@ -144,13 +165,13 @@ namespace GWMS.UI.Components
            int numCount = _currItem.LevelTS.Count;
            // passo a 2h se > 3 gg
            if (numCount > 72)
-                answ = 2;
+                answ = 3;
            // passo a 3h se > 5 gg
            else if (numCount > 120)
-                answ = 3;
+                answ = 4;
            // passo a 4h se > 10 gg
            else if (numCount > 240)
-                answ = 4;
+                answ = 5;
            redFact = answ;
        }

@@ -0,0 +1,90 @@
+@using Blazorise
+@using GWMS.UI.Components
+
+<div class="card">
+    <div class="card-header table-primary py-1">
+        @if (currItem != null)
+        {
+            <div class="row py-0">
+                <div class="col-8 pr-0 font-weight-bold">
+                    <h2>@currItem.PlantCode</h2>
+                </div>
+                <div class="col-4 text-right align-bottom">
+                    <button class="btn btn-primary btn-lg btn-block" @onclick="() => ShowDetail(currItem.PlantId)">
+                        <b>@currItem.PlantDesc&nbsp;<i class="fas fa-angle-double-right"></i></b>
+                    </button>
+                </div>
+            </div>
+        }
+    </div>
+    <div class="card-body p-1">
+        <div class="row">
+            <div class="col-4 pr-0">
+                <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 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>
+                            <li class="list-group-item d-flex justify-content-between align-items-center small">
+                                <span><i class="fas fa-compress-arrows-alt"></i> Stoccaggio</span> <span><b>@getPressData("BH", "N1")</b> <sub>bar</sub></span>
+                            </li>
+                            <li class="list-group-item d-flex justify-content-between align-items-center small">
+                                <span><i class="fas fa-compress-arrows-alt"></i> Alimentazione</span> <span><b>@getPressData("BHA", "N1")</b> <sub>bar</sub></span>
+                            </li>
+                            <li class="list-group-item active d-flex justify-content-between align-items-center py-1">PB Bassa</li>
+                            <li class="list-group-item d-flex justify-content-between align-items-center small">
+                                <span><i class="fas fa-compress-arrows-alt"></i> Stoccaggio</span> <span><b>@getPressData("BL", "N1")</b> <sub>bar</sub></span>
+                            </li>
+                            <li class="list-group-item d-flex justify-content-between align-items-center small">
+                                <span><i class="fas fa-compress-arrows-alt"></i> Alimentazione</span> <span><b>@getPressData("BLA", "N1")</b> <sub>bar</sub></span>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="col-8 pl-1">
+                <div class="row">
+                    <div class="col-12">
+                        <ul class="list-group">
+                            <li class="list-group-item @headerStatus d-flex justify-content-between align-items-center px-0 py-1 small">
+                                <div class="px-1" title="@checkRTime">
+                                    SERBATOIO Principale <i class="fas fa-play @playStatus"></i>
+                                </div>
+                                <div class="px-1 text-right">
+                                    <span><i class="fas fa-database"></i> Livello:</span><span>@currItem.LevelAct.ToString("N0")/@currItem.LevelMax.ToString("N0")</span> | <span style="font-size:1.2em;"><b>@currItem.LevelRatio</b> <sub>%</sub></span>
+                                </div>
+                            </li>
+                            <li class="list-group-item align-items-center px-1 py-2">
+                                <div class="d-flex flex-column">
+                                    <div class="p-1 flex-grow-1">
+                                        <Progress>
+                                            <ProgressBar Value="@currItem.LevelRatio" Striped="false" Animated="false" />
+                                        </Progress>
+                                    </div>
+                                    <div class="px-1 py-2">
+                                        <LineChart @ref="LevelVal" TItem="double" OptionsObject="lineChartOptions" />
+                                    </div>
+                                </div>
+                            </li>
+                            <li class="list-group-item d-flex justify-content-between align-items-center">
+                                <span><i class="fas fa-compress-arrows-alt"></i> Pressione</span> <span style="font-size:1.2em;"><b>@currItem.PressAct["Main"].ToString("N1")</b> <span class="small"> <sub>bar</sub></span></span>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="card-footer alert alert-primary mb-0 p-1">
+        <div class="d-flex justify-content-between">
+            <div class="py-1 px-2 mb-0">
+                <h4>Ordini aperti: <b>@currItem.OrderTS.Count</b></h4>
+            </div>
+            <div class="py-1 px-2">
+                <button class="btn btn-block btn-primary" title="Mostra Ordini" @onclick="() => ShowOrders(currItem.PlantId)">Mostra Ordini <i class="fas fa-file-invoice"></i></button>
+            </div>
+        </div>
+    </div>
+</div>
@@ -0,0 +1,270 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using GWMS.UI.Data;
+using GWMS.Data.DTO;
+using Microsoft.AspNetCore.Components;
+using Blazorise.Charts;
+using System.Threading;
+using Microsoft.Extensions.Configuration;
+
+namespace GWMS.UI.Components
+{
+    public partial class PlantOverview
+    {
+        #region Protected Fields
+
+        protected PlantDTO _currItem = new PlantDTO();
+
+        protected LineChart<double> LevelVal = new LineChart<double>();
+
+        protected object lineChartOptions = new
+        {
+            Scales = new
+            {
+                XAxes = new object[]
+                 {
+                     new {
+                         display = true,
+                         //type = "timeseries",
+                         //type = "time",
+                         //Time = new {
+                         //    unit="day"
+                         //}
+                     }
+                 },
+                YAxes = new object[]
+                {
+                    new {
+                        display = true,
+                        position = "right",
+                        //text    = "Kg",
+                        ticks = new {
+                            suggestedMin = 0,
+                            suggestedMax = 10000
+                        }
+                    }
+                }
+            },
+            Tooltips = new
+            {
+                Mode = "nearest",
+                Intersect = false
+            },
+            Hover = new
+            {
+                Mode = "nearest",
+                Intersect = false
+            },
+            Animation = false,
+            Responsive = true,
+            AspectRatio = 2,
+            type = "line",
+            Legend = new
+            {
+                display = false
+            }
+        };
+
+        /// <summary>
+        /// fattore di riduzione x visualizzare meno punti (in base alla numerosità...
+        /// </summary>
+        protected int redFact = 1;
+
+        #endregion Protected Fields
+
+        #region Private Properties
+
+        [Inject]
+        private IConfiguration Configuration { get; set; }
+
+        [Inject]
+        private NavigationManager NavManager { get; set; }
+
+        private int SelPlantId
+        {
+            get
+            {
+                int answ = 0;
+                if (AppMService.Order_Filter != null)
+                {
+                    answ = AppMService.Order_Filter.PlantId;
+                }
+                return answ;
+            }
+            set
+            {
+                if (!AppMService.Order_Filter.PlantId.Equals(value))
+                {
+                    AppMService.Order_Filter.PlantId = value;
+                }
+            }
+        }
+
+        #endregion Private Properties
+
+        #region Protected Properties
+
+        [Inject]
+        protected MessageService AppMService { get; set; }
+
+        [Inject]
+        protected GWMSDataService DataService { get; set; }
+
+        #endregion Protected Properties
+
+        #region Public Properties
+
+        public string checkRTime
+        {
+            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? $"Mancata ricezione: ultimo aggiornamento {_currItem.LastUpdate}" : $"Dati Realtime aggiornati al {_currItem.LastUpdate}";
+        }
+
+        [Parameter]
+        public PlantDTO currItem
+        {
+            get
+            {
+                return _currItem;
+            }
+            set
+            {
+                _currItem = value;
+                if (value != null)
+                {
+                    var dataReload = Task.Run(async () =>
+                    {
+                        // aggiunta delay o non riesce a disegnare
+                        int ChartWaitDelay = 150;
+                        int.TryParse(Configuration["ChartWaitDelay"], out ChartWaitDelay);
+                        Thread.Sleep(ChartWaitDelay);
+                        await HandleRedraw();
+                    });
+                }
+            }
+        }
+
+        public string headerStatus
+        {
+            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? "text-secondary" : "active";
+        }
+
+        public string playStatus
+        {
+            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? "text-danger" : "text-success";
+        }
+
+        #endregion Public Properties
+
+        #region Private Methods
+
+        private void fixRedFactor()
+        {
+            int answ = 1;
+            int numCount = _currItem.LevelTS.Count;
+            // passo a 2h se > 3 gg
+            if (numCount > 72)
+                answ = 3;
+            // passo a 3h se > 5 gg
+            else if (numCount > 120)
+                answ = 4;
+            // passo a 4h se > 10 gg
+            else if (numCount > 240)
+                answ = 5;
+            redFact = answ;
+        }
+
+        private LineChartDataset<double> GetLineChartDataset()
+        {
+            fixRedFactor();
+            var answ = new LineChartDataset<double>
+            {
+                //Label = "Livello",
+                Data = _currItem.LevelTS.Where((cat, index) => index % redFact == 0).Select(x => x.ValDouble).ToList(),
+                BorderColor = getLineColors(1f),
+                BackgroundColor = getFillColors(0.25f),
+                Fill = true,
+                PointRadius = 3,
+                BorderWidth = 2,
+                LineTension = 0,
+                BorderDash = new List<int> { }
+            };
+            return answ;
+        }
+
+        private List<string> GetLineChartLabels()
+        {
+            fixRedFactor();
+            var answ = _currItem.LevelTS.Where((cat, index) => index % redFact == 0).Select(x => x.DtEvent.ToString("dd/MM HH")).ToList();
+            return answ;
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Genera colori sfondo
+        /// </summary>
+        /// <param name="numRecords"></param>
+        /// <returns></returns>
+        protected List<string> getFillColors(float alpha)
+        {
+            List<string> answ = new List<string>();
+            answ.Add(ChartColor.FromRgba(108, 164, 254, alpha));
+            return answ;
+        }
+
+        /// <summary>
+        /// Genera colori linea
+        /// </summary>
+        /// <param name="numRecords"></param>
+        /// <returns></returns>
+        protected List<string> getLineColors(float alpha)
+        {
+            List<string> answ = new List<string>();
+            answ.Add(ChartColor.FromRgba(54, 82, 254, alpha));
+            return answ;
+        }
+
+        protected async Task HandleRedraw()
+        {
+            if (LevelVal != null)
+            {
+                await LevelVal.Clear();
+                await LevelVal.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset());
+            }
+        }
+
+        protected void ShowDetail(int currPlantId)
+        {
+            SelPlantId = currPlantId;
+            // rimando...
+            NavManager.NavigateTo($"PlantAnalisys");
+        }
+
+        protected void ShowOrders(int currPlantId)
+        {
+            SelPlantId = currPlantId;
+            // rimando...
+            NavManager.NavigateTo($"Orders");
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
+        public string getPressData(string valore, string formato)
+        {
+            string answ = "";
+            if (currItem.PressAct.ContainsKey(valore))
+            {
+                answ = currItem.PressAct[valore].ToString(formato);
+            }
+            return answ;
+        }
+
+        #endregion Public Methods
+    }
+}
@@ -61,7 +61,7 @@
            return;

        reportProcess();
-        await DataService.RegenDB(numDays, stepMin, maxHourRate);
+        //await DataService.RegenDB(numDays, stepMin, maxHourRate);
        reportChange();
    }

@@ -3,6 +3,7 @@ using GWMS.UI.Data;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using NLog;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -27,11 +28,21 @@ namespace GWMS.UI.Controllers
    [ApiController]
    public class IOBController : ControllerBase
    {
+        #region Private Fields
+
+        /// <summary>
+        /// Classe per logging
+        /// </summary>
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
+
        #region Public Constructors

        public IOBController(GWMSDataService DataService)
        {
            _DataService = DataService;
+            //Log.Debug("Avviata classe IOBController");
        }

        #endregion Public Constructors
@@ -56,6 +67,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("addOptPar/{id}")]
        public string addOptPar(string id, string pName, string pValue)
        {
+            //Log.Debug($"Chiamata addOptPar | {id} | {pName} | {pValue}");
            return $"N.A. | {id} | {pName} | {pValue}";
        }

@@ -75,6 +87,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("addTask2Exe/{id}")]
        public string addTask2Exe(string id, string taskName, string taskVal)
        {
+            //Log.Debug($"Chiamata addTask2Exe | {id} | {taskName} | {taskVal}");
            return $"N.A. | {id} | {taskName} | {taskVal}";
        }

@@ -87,6 +100,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("alive")]
        public string alive()
        {
+            //Log.Debug("Chiamata alive");
            return $"OK";
        }

@@ -100,6 +114,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("checkLevels/{id}")]
        public async Task<string> checkLevels(string id)
        {
+            //Log.Debug($"Chiamata checkLevels | {id}");
            bool fatto = false;
            // ...verifica per ricalcolo ordini...
            fatto = await _DataService.checkLevels();
@@ -117,6 +132,7 @@ namespace GWMS.UI.Controllers
        [HttpDelete("{id}")]
        public void Delete(int id)
        {
+            //Log.Debug($"Chiamata Delete | {id}");
        }

        /// <summary>
@@ -129,6 +145,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("enabled/{id}")]
        public async Task<string> enabled(string id)
        {
+            //Log.Debug($"Chiamata enabled | {id}");
            string answ = "ND";
            // se id nullo --> KO!
            if (id == null)
@@ -152,6 +169,7 @@ namespace GWMS.UI.Controllers
        [HttpPost("evListJson/{id}")]
        public string evListJson(string id, [FromBody] evJsonPayload rawData)
        {
+            //Log.Debug($"Chiamata evListJson | {id}");
            string answ = "KO";
 #if false
            int insDone = 0;
@@ -166,7 +184,7 @@ namespace GWMS.UI.Controllers
                    {
                        if (memLayer.ML.CRI("_logLevel") > 6)
                        {
-                            logger.lg.scriviLog($"Valori letti: idxMacchina: {id} | valore: {item.valore}", tipoLog.INFO);
+                            logger.lg.scriviLog($"Valori letti: idxMacchina: {id} | valore: {item.valore}", tipoLog.Debug);
                        }

                        // formato datetime come yyyyMMddHHmmssfff -->es: 20181223180600000
@@ -204,6 +222,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("flog/{id}")]
        public async Task<string> flog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt)
        {
+            //Log.Debug($"Chiamata flog | {id} | {flux} | {valore} | {dtEve} | {dtCurr} | {cnt}");
            bool fatto = false;
            // formato yyyymmddHHMMSSnnn ovvero da anno a millisecondi
            if (cnt == null)
@@ -300,6 +319,7 @@ namespace GWMS.UI.Controllers
        [HttpPost("flogJson/{id}")]
        public async Task<string> flogJson(string id, [FromBody] flogJsonPayload rawData)
        {
+            //Log.Debug($"Chiamata flogJson | {id}");
            bool fatto = false;
            // verifico ci sia valore
            if (rawData != null && !string.IsNullOrEmpty(id))
@@ -338,6 +358,7 @@ namespace GWMS.UI.Controllers
        [HttpPost("forceSplitOdl/{id}")]
        public string forceSplitOdl(string id)
        {
+            //Log.Debug($"Chiamata forceSplitOdl | {id}");
            return "OK";
        }

@@ -356,6 +377,7 @@ namespace GWMS.UI.Controllers
        [HttpPost("forceSplitOdlFull/{id}")]
        public string forceSplitOdlFull(string id, bool doConfirm, bool qtyFromLast, int? roundStep, string keyRichiesta = "")
        {
+            //Log.Debug($"Chiamata forceSplitOdlFull | {id}");
            return "OK";
        }

@@ -368,6 +390,7 @@ namespace GWMS.UI.Controllers
        [HttpGet]
        public string Get()
        {
+            //Log.Debug("Chiamata Get");
            return "OK";
        }

@@ -381,6 +404,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("{id}")]
        public string Get(int id)
        {
+            //Log.Debug($"Chiamata Get | {id}");
            return "OK";
        }

@@ -395,6 +419,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getCounter/{id}")]
        public string getCounter(string id)
        {
+            //Log.Debug($"Chiamata getCounter | {id}");
            return "0";
        }

@@ -409,6 +434,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getCounterTCRec/{id}")]
        public string getCounterTCRec(string id)
        {
+            //Log.Debug($"Chiamata getCounterTCRec | {id}");
            return "0";
        }

@@ -423,6 +449,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getCurrData/{id}")]
        public string getCurrData(string id)
        {
+            //Log.Debug($"Chiamata getCurrData | {id}");
            return $"{id}";
        }

@@ -437,6 +464,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getCurrODL/{id}")]
        public string getCurrODL(string id)
        {
+            //Log.Debug($"Chiamata getCurrODL | {id}");
            return "1";
        }

@@ -449,6 +477,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getCurrOdlRow/{id}")]
        public string getCurrOdlRow(string id)
        {
+            //Log.Debug($"Chiamata getCurrOdlRow | {id}");
            return "";
        }

@@ -461,6 +490,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getCurrOdlStart/{id}")]
        public string getCurrOdlStart(string id)
        {
+            //Log.Debug($"Chiamata getCurrOdlStart | {id}");
            return $"{DateTime.Now}";
        }

@@ -473,6 +503,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getCurrStatoRow/{id}")]
        public string getCurrStatoRow(string id)
        {
+            //Log.Debug($"Chiamata getCurrStatoRow | {id}");
            return "";
        }

@@ -485,6 +516,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getFiles/{id}")]
        public string getFiles(string id)
        {
+            //Log.Debug($"Chiamata getFiles | {id}");
            return "";
        }

@@ -497,6 +529,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getIdlePeriod/{id}")]
        public int getIdlePeriod(string id)
        {
+            //Log.Debug($"Chiamata getIdlePeriod | {id}");
            return 0;
        }

@@ -508,6 +541,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getIob2call/{id}")]
        public string getIob2call(string id)
        {
+            //Log.Debug($"Chiamata getIob2call | {id}");
            return "";
        }

@@ -519,6 +553,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getM2IOB/{id}")]
        public string getM2IOB(string id)
        {
+            //Log.Debug($"Chiamata getM2IOB | {id}");
            return "";
        }

@@ -531,6 +566,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getObjItems/{id}")]
        public string getObjItems(string id)
        {
+            //Log.Debug($"Chiamata getObjItems | {id}");
            return "";
        }

@@ -545,6 +581,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("getTask2Exe/{id}")]
        public string getTask2Exe(string id)
        {
+            //Log.Debug($"Chiamata getTask2Exe | {id}");
            string answ = "";
 #if false
            // scrivo keep alive!!! (se necessario, altrimenti è in cache...)
@@ -576,6 +613,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("input/{id}")]
        public string input(string id, string valore, string dtEve, string dtCurr, string cnt)
        {
+            //Log.Debug($"Chiamata input | {id} | {valore} | {dtEve} | {dtCurr} | {cnt}");
            string answ = "OK";
 #if false
            // formato yyyymmddHHMMSSnnn ovvero da anno a millisecondi
@@ -587,7 +625,7 @@ namespace GWMS.UI.Controllers
            DateTime dataOraEvento = DateTime.Now;
            if (memLayer.ML.CRI("_logLevel") > 6)
            {
-                logger.lg.scriviLog($"Valori letti: idxMacchina: {id} | valore: {valore}", tipoLog.INFO);
+                logger.lg.scriviLog($"Valori letti: idxMacchina: {id} | valore: {valore}", tipoLog.Debug);
            }
            try
            {
@@ -607,12 +645,14 @@ namespace GWMS.UI.Controllers
        [HttpPost]
        public void Post([FromBody] string value)
        {
+            //Log.Debug("Chiamata Post");
        }

        // PUT api/IOB/5
        [HttpPut("{id}")]
        public void Put(int id, [FromBody] string value)
        {
+            //Log.Debug($"Chiamata Put | {id}");
        }

 #if false
@@ -692,7 +732,7 @@ namespace GWMS.UI.Controllers
                if (nCall >= nCall2Log)
                {
                    // loggo
-                    logger.lg.scriviLog(string.Format("IOB_INDEX: effettuate {0} call", nCall), tipoLog.INFO);
+                    logger.lg.scriviLog(string.Format("IOB_INDEX: effettuate {0} call", nCall), tipoLog.Debug);
                    // resetto!
                    memLayer.ML.resetRCnt(DataLayer.mHash("COUNT:pCall:IOB_INDEX"));
                }
@@ -748,7 +788,7 @@ namespace GWMS.UI.Controllers
            DateTime dataOraEvento = DateTime.Now;
            if (memLayer.ML.CRI("_logLevel") > 6)
            {
-                logger.lg.scriviLog($"Valori Live:{Environment.NewLine}idxMacchina: {id}{Environment.NewLine}liveData: {liveData}", tipoLog.INFO);
+                logger.lg.scriviLog($"Valori Live:{Environment.NewLine}idxMacchina: {id}{Environment.NewLine}liveData: {liveData}", tipoLog.Debug);
            }
            try
            {
@@ -897,7 +937,7 @@ namespace GWMS.UI.Controllers
            string answ = "";
            DateTime dataOraEvento = DateTime.Now;
            // salvo SEMPRE log x questo tipo di dati!
-            logger.lg.scriviLog($"Salvataggio incremento contapezzi:{Environment.NewLine}idxMacchina: {id}{Environment.NewLine}pezzi: {qty}", tipoLog.INFO);
+            logger.lg.scriviLog($"Salvataggio incremento contapezzi:{Environment.NewLine}idxMacchina: {id}{Environment.NewLine}pezzi: {qty}", tipoLog.Debug);
            try
            {
                DataLayer DataLayerObj = new DataLayer();
@@ -940,7 +980,7 @@ namespace GWMS.UI.Controllers
            DateTime dataOraEvento = DateTime.Now;
            if (memLayer.ML.CRI("_logLevel") > 6)
            {
-                logger.lg.scriviLog($"Salvataggio counter | idxMacchina: {id}", tipoLog.INFO);
+                logger.lg.scriviLog($"Salvataggio counter | idxMacchina: {id}", tipoLog.Debug);
            }
            try
            {
@@ -1093,6 +1133,7 @@ namespace GWMS.UI.Controllers
        [HttpPost("saveConf/{id}")]
        public string saveConf(string id, [FromBody] System.Text.Json.JsonElement rawQuery)
        {
+            //Log.Debug($"Chiamata saveConf | {id}");
            // problema deserializzaizone ENUM con classe nuova dotnet 5:
            // https://github.com/graphql-dotnet/graphql-dotnet/issues/1439

@@ -1131,6 +1172,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("sendReboot")]
        public string sendReboot(string idxMacchina, string mac)
        {
+            //Log.Debug($"Chiamata sendReboot | {idxMacchina} | {mac}");
            string answ = "";
            try
            {
@@ -1158,6 +1200,7 @@ namespace GWMS.UI.Controllers
        [HttpPost("setObjItems/{id}")]
        public string setObjItems(string id, [FromBody] List<objItem> currParams)
        {
+            //Log.Debug($"Chiamata setObjItems | {id}");
            string answ = "";
            if (string.IsNullOrWhiteSpace(id))
            {
@@ -1187,6 +1230,7 @@ namespace GWMS.UI.Controllers
        [HttpPost("uploadFile/{id}")]
        public string uploadFile(string id)
        {
+            //Log.Debug($"Chiamata uploadFile | {id}");
            string answ = "";
 #if false
            // questa classe è derivata da Controller.Response... x cui recupero lo stream in altro modo...
@@ -2,6 +2,7 @@
 using GWMS.UI.Data;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,11 +16,21 @@ namespace GWMS.UI.Controllers
    [ApiController]
    public class PlantDataController : ControllerBase
    {
+        #region Private Fields
+
+        /// <summary>
+        /// Classe per logging
+        /// </summary>
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
+
        #region Public Constructors

        public PlantDataController(GWMSDataService DataService)
        {
            _DataService = DataService;
+            Log.Info("Avviata classe PlantDataController");
        }

        #endregion Public Constructors
@@ -36,12 +47,14 @@ namespace GWMS.UI.Controllers
        [HttpDelete("{id}")]
        public void Delete(int id)
        {
+            //Log.Debug($"Chiamata Delete | {id}");
        }

        // GET: api/PlantData
        [HttpGet]
        public async Task<List<PlantDTO>> Get()
        {
+            //Log.Debug("Chiamata Get");
            // serializzo i dati di PlantDTO dell'impianto richiesto
            List<PlantDTO> ListRecords = await _DataService.PlantsGetAll();
            return ListRecords;
@@ -51,6 +64,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("{id}")]
        public async Task<PlantDTO> Get(int id)
        {
+            //Log.Debug($"Chiamata Get | {id}");
            // serializzo i dati di PlantDTO dell'impianto richiesto
            var ListRecords = await _DataService.PlantsGetAll();
            //seleziono plant...
@@ -62,12 +76,14 @@ namespace GWMS.UI.Controllers
        [HttpPost]
        public void Post([FromBody] string value)
        {
+            //Log.Debug("Chiamata Post");
        }

        // PUT api/PlantData/5
        [HttpPut("{id}")]
        public void Put(int id, [FromBody] string value)
        {
+            //Log.Debug($"Chiamata Put | {id}");
        }

        #endregion Public Methods
@@ -2,6 +2,7 @@
 using GWMS.UI.Data;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,11 +16,21 @@ namespace GWMS.UI.Controllers
    [ApiController]
    public class PlantLogController : ControllerBase
    {
+        #region Private Fields
+
+        /// <summary>
+        /// Classe per logging
+        /// </summary>
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        #endregion Private Fields
+
        #region Public Constructors

        public PlantLogController(GWMSDataService DataService)
        {
            _DataService = DataService;
+            Log.Debug("Avviata classe PlantDataController");
        }

        #endregion Public Constructors
@@ -36,12 +47,14 @@ namespace GWMS.UI.Controllers
        [HttpDelete("{id}")]
        public void Delete(int id)
        {
+            Log.Debug($"Chiamata Delete | {id}");
        }

        // GET: api/PlantLog
        [HttpGet]
        public async Task<List<PlantLogModel>> Get()
        {
+            //Log.Debug("Chiamata Get");
            // arrotondo ai 5 minuti
            DateTime adesso = DateTime.Now;
            int dayHour = adesso.Hour;
@@ -57,6 +70,7 @@ namespace GWMS.UI.Controllers
        [HttpGet("{id}")]
        public async Task<List<PlantLogModel>> Get(int id)
        {
+            Log.Debug($"Chiamata Get | {id}");
            // arrotondo ai 5 minuti
            DateTime adesso = DateTime.Now;
            int dayHour = adesso.Hour;
@@ -72,6 +86,7 @@ namespace GWMS.UI.Controllers
        [HttpPost]
        public async Task<ActionResult> Post([FromBody] List<PlantLogModel> newItems)
        {
+            Log.Debug("Chiamata Post");
            bool fatto = false;
            // verifico ci sia valore
            if (newItems != null)
@@ -92,6 +107,7 @@ namespace GWMS.UI.Controllers
        [HttpPut("{id}")]
        public void Put(int id, [FromBody] string value)
        {
+            Log.Debug($"Chiamata Put | {id}");
        }

        #endregion Public Methods
@@ -19,7 +19,7 @@ using System.Globalization;

 namespace GWMS.UI.Data
 {
-    public class GWMSDataService
+    public class GWMSDataService : IDisposable
    {
        #region Private Fields

@@ -73,9 +73,9 @@ namespace GWMS.UI.Data
            else
            {
                dbController = new GWMS.Data.Controllers.GWMSController(configuration);
-                StringBuilder sb = new StringBuilder();
-                sb.AppendLine($"DbController OK");
-                _logger.LogInformation(sb.ToString());
+                //StringBuilder sb = new StringBuilder();
+                //sb.AppendLine($"DbController OK");
+                //_logger.LogInformation(sb.ToString());
            }
        }

@@ -97,6 +97,7 @@ namespace GWMS.UI.Data
        /// <param name="newItems"></param>
        private async Task updateCurrDTO(List<PlantLogModel> newItems)
        {
+            DateTime adesso = DateTime.Now;
            List<PlantDTO> dbResult = new List<PlantDTO>();
            int PlantId = newItems.FirstOrDefault().PlantId;
            string cacheKey = "DATA:PLANTS:ListDTO";
@@ -121,6 +122,7 @@ namespace GWMS.UI.Data
                if (lastLev != null)
                {
                    currDto.LevelAct = lastLev.ValNumber;
+                    currDto.LastUpdate = adesso;
                }

                // verifico SE c'è MainPress
@@ -289,7 +291,7 @@ namespace GWMS.UI.Data
                await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(true));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
-                Log.Info($"Effettuata lettura da DB + caching per PlantLogGetLastByFlux: {ts.TotalMilliseconds} ms");
+                Log.Trace($"Effettuata lettura da DB + caching per PlantLogGetLastByFlux: {ts.TotalMilliseconds} ms");
            }
            return await Task.FromResult(lastValues);
        }
@@ -369,7 +371,7 @@ namespace GWMS.UI.Data
                await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(false));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
-                Log.Info($"Effettuata lettura da DB + caching per ConfigGetAll: {ts.TotalMilliseconds} ms");
+                Log.Trace($"Effettuata lettura da DB + caching per ConfigGetAll: {ts.TotalMilliseconds} ms");
            }
            return await Task.FromResult(dbResult);
        }
@@ -394,6 +396,12 @@ namespace GWMS.UI.Data
            return answ;
        }

+        public void Dispose()
+        {
+            // Clear database controller
+            dbController.Dispose();
+        }
+
        public async Task<bool> HasPlantLog()
        {
            return await Task.FromResult(dbController.HasPlantLog());
@@ -421,7 +429,7 @@ namespace GWMS.UI.Data
                await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(false));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
-                Log.Info($"Effettuata lettura da DB + caching per ItemsGetAll: {ts.TotalMilliseconds} ms");
+                Log.Trace($"Effettuata lettura da DB + caching per ItemsGetAll: {ts.TotalMilliseconds} ms");
            }
            return await Task.FromResult(dbResult);
        }
@@ -454,17 +462,20 @@ namespace GWMS.UI.Data
            return answ;
        }

-        public async void OrderDelete(OrderModel currItem)
+        public async Task<bool> OrderDelete(OrderModel currItem)
        {
+            bool done = false;
            try
            {
-                dbController.OrderDelete(currItem);
+                done = dbController.OrderDelete(currItem);
                invalidateAllCache();
                dbController.ResetController();
            }
-            catch
+            catch (Exception exc)
            {
+                Log.Error($"Eccezione in OrderDelete:{Environment.NewLine}{exc}");
            }
+            return await Task.FromResult(done);
        }

        public async Task<OrderModel> OrderGetByCode(string OrderCode)
@@ -476,7 +487,21 @@ namespace GWMS.UI.Data
            dbResult = dbController.GetOrderByCode(OrderCode);
            stopWatch.Stop();
            TimeSpan ts = stopWatch.Elapsed;
-            Log.Info($"Effettuata lettura da DB per OrderGetByCode: {ts.TotalMilliseconds} ms");
+            Log.Trace($"Effettuata lettura da DB per OrderGetByCode: {ts.TotalMilliseconds} ms");
+
+            return await Task.FromResult(dbResult);
+        }
+
+        public async Task<OrderModel> OrderGetById(int OrderId)
+        {
+            OrderModel dbResult = new OrderModel();
+
+            Stopwatch stopWatch = new Stopwatch();
+            stopWatch.Start();
+            dbResult = dbController.GetOrderById(OrderId);
+            stopWatch.Stop();
+            TimeSpan ts = stopWatch.Elapsed;
+            Log.Trace($"Effettuata lettura da DB per OrderGetById: {ts.TotalMilliseconds} ms");

            return await Task.FromResult(dbResult);
        }
@@ -490,7 +515,7 @@ namespace GWMS.UI.Data
            dbResult = dbController.GetOrdersFilt(CurrFilter.PlantId, CurrFilter.SupplierId, CurrFilter.TransporterId, CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.ShowClosed);
            stopWatch.Stop();
            TimeSpan ts = stopWatch.Elapsed;
-            Log.Info($"Effettuata lettura da DB per OrdersGetFilt: {ts.TotalMilliseconds} ms");
+            Log.Trace($"Effettuata lettura da DB per OrdersGetFilt: {ts.TotalMilliseconds} ms");

            return await Task.FromResult(dbResult);
        }
@@ -509,22 +534,25 @@ namespace GWMS.UI.Data
            dbResult = dbController.GetOrdersOpen(PlantId);
            stopWatch.Stop();
            TimeSpan ts = stopWatch.Elapsed;
-            Log.Info($"Effettuata lettura da DB per OrdersGetOpen | PlantId: {PlantId} | {ts.TotalMilliseconds} ms");
+            Log.Trace($"Effettuata lettura da DB per OrdersGetOpen | PlantId: {PlantId} | {ts.TotalMilliseconds} ms");

            return await Task.FromResult(dbResult);
        }

-        public void OrderUpdate(OrderModel currItem)
+        public async Task<bool> OrderUpdate(OrderModel currItem)
        {
+            bool done = false;
            try
            {
-                dbController.OrderUpdate(currItem);
+                done = dbController.OrderUpdate(currItem);
                invalidateAllCache();
                dbController.ResetController();
            }
-            catch
+            catch (Exception exc)
            {
+                Log.Error($"Eccezione in OrderUpdate:{Environment.NewLine}{exc}");
            }
+            return await Task.FromResult(done);
        }

        public async Task<List<PlantLogModel>> PlantLogGetFilt(int PlantId, DateTime DtMaxDate, int numRec)
@@ -548,7 +576,7 @@ namespace GWMS.UI.Data
                await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(true));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
-                Log.Info($"Effettuata lettura da DB + caching per PlantLogGetFilt: {ts.TotalMilliseconds} ms");
+                Log.Trace($"Effettuata lettura da DB + caching per PlantLogGetFilt: {ts.TotalMilliseconds} ms");
            }
            return await Task.FromResult(dbResult);
        }
@@ -612,6 +640,41 @@ namespace GWMS.UI.Data
            return await Task.FromResult(fatto);
        }

+        public async Task<List<PlantLevSumDTO>> PlantsAnalisysGetByCode(SelectOrderData CurrFilter)
+        {
+            List<PlantLevSumDTO> dbResult = new List<PlantLevSumDTO>();
+            string cacheKey = $"DATA:PLANTS:LevelSum:{CurrFilter.PlantId}:{CurrFilter.DateStart:yyMMdd}:{CurrFilter.DateEnd:yyMMdd}";
+            string rawData;
+            var redisDataList = await distributedCache.GetAsync(cacheKey);
+            if (redisDataList != null)
+            {
+                rawData = Encoding.UTF8.GetString(redisDataList);
+                dbResult = JsonConvert.DeserializeObject<List<PlantLevSumDTO>>(rawData);
+            }
+            else
+            {
+                Stopwatch stopWatch = new Stopwatch();
+                stopWatch.Start();
+                dbResult = dbController.GetPlantLogSummary(CurrFilter.PlantId, CurrFilter.DateStart, CurrFilter.DateEnd);
+                rawData = JsonConvert.SerializeObject(dbResult);
+                redisDataList = Encoding.UTF8.GetBytes(rawData);
+                await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(true));
+                stopWatch.Stop();
+                TimeSpan ts = stopWatch.Elapsed;
+                Log.Trace($"Effettuata lettura da DB + caching per PlantsAnalisysGetByCode: {ts.TotalMilliseconds} ms");
+            }
+            return await Task.FromResult(dbResult);
+        }
+
+        public async Task<bool> PlantsAnalisysReset(SelectOrderData CurrFilter)
+        {
+            bool answ = false;
+            string cacheKey = $"DATA:PLANTS:LevelSum:{CurrFilter.PlantId}:{CurrFilter.DateStart:yyMMdd}:{CurrFilter.DateEnd:yyMMdd}";
+            await distributedCache.RemoveAsync(cacheKey);
+            answ = true;
+            return await Task.FromResult(answ);
+        }
+
        public async Task<List<PlantDTO>> PlantsGetAll()
        {
            List<PlantDTO> dbResult = new List<PlantDTO>();
@@ -635,7 +698,7 @@ namespace GWMS.UI.Data
                await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(true));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
-                Log.Info($"Effettuata lettura da DB + caching per PlantsGetAll: {ts.TotalMilliseconds} ms");
+                Log.Trace($"Effettuata lettura da DB + caching per PlantsGetAll: {ts.TotalMilliseconds} ms");
            }
            return await Task.FromResult(dbResult);
        }
@@ -662,11 +725,6 @@ namespace GWMS.UI.Data
            { }
        }

-        public async Task<bool> RegenDB(int numDays, int stepMin = 30, int maxHourRate = 800)
-        {
-            return await Task.FromResult(dbController.RegenDB(1, numDays, stepMin, maxHourRate));
-        }
-
        public void ResetController()
        {
            dbController.ResetController();
@@ -698,7 +756,7 @@ namespace GWMS.UI.Data
                await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(true));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
-                Log.Info($"Effettuata lettura da DB + caching per PlantsGetAll: {ts.TotalMilliseconds} ms");
+                Log.Trace($"Effettuata lettura da DB + caching per PlantsGetAll: {ts.TotalMilliseconds} ms");
            }
            return await Task.FromResult(dbResult);
        }
@@ -724,7 +782,7 @@ namespace GWMS.UI.Data
                await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt(true));
                stopWatch.Stop();
                TimeSpan ts = stopWatch.Elapsed;
-                Log.Info($"Effettuata lettura da DB + caching per PlantsGetAll: {ts.TotalMilliseconds} ms");
+                Log.Trace($"Effettuata lettura da DB + caching per PlantsGetAll: {ts.TotalMilliseconds} ms");
            }
            return await Task.FromResult(dbResult);
        }
@@ -738,7 +796,7 @@ namespace GWMS.UI.Data
            dbResult = dbController.GetUsersFilt(UsrLvl, PlantId, SupplierId, TransporterId);
            stopWatch.Stop();
            TimeSpan ts = stopWatch.Elapsed;
-            Log.Info($"Effettuata lettura da DB per UsersGetFilt: {ts.TotalMilliseconds} ms");
+            Log.Trace($"Effettuata lettura da DB per UsersGetFilt: {ts.TotalMilliseconds} ms");

            return await Task.FromResult(dbResult);
        }
@@ -777,7 +835,7 @@ namespace GWMS.UI.Data
            dbResult = dbController.GetWeekPlan();
            stopWatch.Stop();
            TimeSpan ts = stopWatch.Elapsed;
-            Log.Info($"Effettuata lettura da DB per WeekPlanGet: {ts.TotalMilliseconds} ms");
+            Log.Trace($"Effettuata lettura da DB per WeekPlanGet: {ts.TotalMilliseconds} ms");
            return await Task.FromResult(dbResult);
        }

@@ -2,10 +2,17 @@

  <PropertyGroup>
    <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.2619</Version>
+    <Version>1.0.2109.2315</Version>
    <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
  </PropertyGroup>

+  <ItemGroup>
+    <Compile Remove="QuartzHostedService.cs" />
+  </ItemGroup>
+
  <ItemGroup>
    <Content Remove="bundleconfig.json" />
  </ItemGroup>
@@ -13,6 +20,8 @@
  <ItemGroup>
    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS02.pubxml" />
    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfile.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfileLinux.pubxml" />
+    <_WebToolingArtifacts Remove="Properties\PublishProfiles\IISProfileWin.pubxml" />
    <_WebToolingArtifacts Remove="Properties\PublishProfiles\W2019-IIS-DEV.pubxml" />
  </ItemGroup>

@@ -29,25 +38,21 @@
    <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="ElmahCore" Version="2.0.6" />
-    <PackageReference Include="ElmahCore.Common" Version="2.0.6" />
-    <PackageReference Include="ElmahCore.Sql" Version="2.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
+    <PackageReference Include="Blazorise" Version="0.9.4.4" />
+    <PackageReference Include="Blazorise.Bootstrap" Version="0.9.4.4" />
+    <PackageReference Include="Blazorise.Charts" Version="0.9.4.4" />
+    <PackageReference Include="Blazorise.Components" Version="0.9.4.4" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.4.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.12.0" />
-    <PackageReference Include="Quartz" Version="3.3.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" ExcludeAssets="All" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
  </ItemGroup>

  <ItemGroup>
@@ -143,7 +143,7 @@ namespace GWMS.UI.Pages
            NavManager.NavigateTo($"GasStation/{args.BarcodeText}");
        }

-        private async Task reloadData()
+        private async Task ReloadAllData()
        {
            isLoading = true;
            PlantsList = null;
@@ -175,7 +175,7 @@ namespace GWMS.UI.Pages
            MessageService.ShowSearch = false;
            MessageService.PageName = "Stazione";
            MessageService.PageIcon = "fas fa-gas-pump pr-2";
-            await reloadData();
+            await ReloadAllData();
        }

        protected void ResetData()
@@ -24,22 +24,26 @@
        </div>
    </div>
 </div>
-<div class="row">
-    <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.png" />
-        <h4>
-            Sistema di gestione e pianificazione logistica impianti distribuzione metano
-        </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">
-            <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 class="card">
+    <div class="card-body">
+        <div class="row">
+            <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.png" />
+                <h4>
+                    Sistema di gestione e pianificazione logistica impianti distribuzione metano
+                </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">
+                    <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>
    </div>
@@ -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>
@@ -115,8 +115,6 @@ namespace GWMS.UI.Pages
            }
        }

-        private bool ShowCharts { get; set; } = false;
-
        private bool ShowClosed
        {
            get
@@ -308,9 +306,6 @@ namespace GWMS.UI.Pages
        protected void Edit(OrderModel selRecord)
        {
            // rileggo dal DB il record corrente...
-#if false
-            currRecord = selRecord;
-#endif
            var pUpd = Task.Run(async () => currRecord = await DataService.OrderGetByCode(selRecord.OrderCode));
            pUpd.Wait();
        }
@@ -332,13 +327,13 @@ namespace GWMS.UI.Pages
            AppMService.PageName = "Ordini";
            AppMService.PageIcon = "fas fa-file-invoice pr-2";
            AppMService.EA_SearchUpdated += OnSeachUpdated;
+            ShowClosed = false;
            await ReloadAllData();
        }

        protected async Task ReloadAllData()
        {
            isLoading = true;
-            //PlantsList = await DataService.PlantsGetAll();
            SuppliersList = await DataService.SuppliersGetAll();
            PlantsList = null;
            await GetClaimsData();
@@ -358,7 +353,6 @@ namespace GWMS.UI.Pages
                PlantsList = new List<PlantDTO>();
            }
            isLoading = false;
-
            await ReloadData();
        }

@@ -370,6 +364,7 @@ namespace GWMS.UI.Pages

        protected async Task ResetFilter()
        {
+            SelPlantId = 0;
            currRecord = null;
            SearchRecords = null;
            ListRecords = null;
@@ -417,11 +412,8 @@ namespace GWMS.UI.Pages

        public async void OnSeachUpdated()
        {
-            await InvokeAsync(() =>
-            {
-                Task task = UpdateData();
-                StateHasChanged();
-            });
+            await UpdateData();
+            StateHasChanged();
        }

        #endregion Public Methods
@@ -40,7 +40,7 @@
            return;

        processRunning = true;
-        DataService.RegenDB(numDays, stepMin, maxHourRate);
+        //DataService.RegenDB(numDays, stepMin, maxHourRate);
        processRunning = false;
    }

@@ -1,7 +1,190 @@
@page "/PlantAnalisys"

-<h3>PlantAnalisys</h3>
+@using Blazorise.Components
+@using GWMS.UI.Components

-@code {
+<div class="card">
+    <div class="card-header table-primary h3">
+        <div class="row">
+            <div class="col-6 col-lg-2 h3">
+                Dettaglio Impianto
+            </div>
+            <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">
+                            </div>
+                            <div class="custom-control custom-switch">
+                                <input type="checkbox" class="custom-control-input" id="togRefill" title="Solo con Carichi / Mostra tutti" @bind-value="@ShowOnlyRefill" checked="@ShowOnlyRefill" />
+                                <label class="custom-control-label small" for="togRefill"><sub>Consegne</sub></label>
+                            </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">
+                                <span class="input-group-text">inizio:</span>
+                            </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>
+                            </div>
+                            <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">
+                                <span class="input-group-text">
+                                    <span class="fas fa-gas-pump" aria-hidden="true"></span>
+                                </span>
+                            </div>
+                            <select @bind="@SelPlantId" class="form-control form-control-sm">
+                                <option value="0">--- Tutti ---</option>
+                                @if (PlantsList != null)
+                                {
+                                    foreach (var item in PlantsList)
+                                    {
+                                        <option value="@item.PlantId">@item.PlantCode | @item.PlantDesc</option>
+                                    }
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <div class="p-2">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text">
+                                    <span class="fas fa-industry" aria-hidden="true"></span>
+                                </span>
+                            </div>
+                            <select @bind="@SelSupplierId" class="form-control form-control-sm">
+                                <option value="0">--- Tutti ---</option>
+                                @if (SuppliersList != null)
+                                {
+                                    foreach (var item in SuppliersList)
+                                    {
+                                        <option value="@item.SupplierId">@item.SupplierCode | @item.SupplierDesc</option>
+                                    }
+                                }
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="card-body p-1">
+        @if (currRecord != null)
+        {
+            <OrderAdminEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" SupplierId="@currRecord.SupplierId"></OrderAdminEditor>
+        }
+        @if (ListRecords == null)
+        {
+            <LoadingData></LoadingData>
+        }
+        else if (totalCount == 0)
+        {
+            <div class="alert alert-warning text-center display-4">Nessun record trovato</div>
+        }
+        else
+        {
+            <div class="row">
+                <div class="col-12">
+                    <table class="table table-sm table-striped table-responsive-lg">
+                        <thead>
+                            <tr>
+                                <th>Impianto</th>
+                                <th>Data</th>
+                                <th>Livello Apertura</th>
+                                <th>Livello Chiusura</th>
+                                <th class="text-right">Carico <i class="fas fa-truck-moving"></i></th>
+                                <th class="text-right">Ordine <i class="fas fa-file"></i></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var record in ListRecords)
+                            {
+                                @*<tr class="@checkSelect(@record.OrderId)">*@
+                                <tr>
+                                    <td>
+                                        <div>@record.PlantCode</div>
+                                        <div class="small">@record.PlantDesc</div>
+                                    </td>
+                                    <td>
+                                        <div>@record.DataRif.ToString("yyyy.MM.dd")</div>
+                                        <div class="small">@record.DataRif.ToString("dddd")</div>
+                                    </td>
+                                    <td>@record.LevelStart.ToString("N0")</td>
+                                    <td>@record.LevelEnd.ToString("N0")</td>
+                                    <td class="text-right">
+                                        @if (record.HasRefill)
+                                        {
+                                            if (record.HasOrder)
+                                            {
+                                                <span class="text-success">@record.LevelMin.ToString("N0") <i class="fas fa-sort-amount-up"></i> @record.LevelMax.ToString("N0")</span>
+                                            }
+                                            else
+                                            {
+                                                <span class="text-danger">@record.LevelMin.ToString("N0") <i class="fas fa-sort-amount-up"></i> @record.LevelMax.ToString("N0")</span>
+                                            }

-}
+                                        }
+                                    </td>
+                                    <td class="text-right">
+                                        @if (record.HasOrder)
+                                        {
+                                            @if (currRecord == null)
+                                            {
+                                                <button class="btn btn-sm btn-info" @onclick="() => Edit(record)" title="Edit Ordine">
+                                                    <span><i class="fas fa-truck-moving"></i></span>
+                                                </button>
+                                            }
+                                            else
+                                            {
+                                                <button class="btn btn-sm btn-secondary disabled">
+                                                    <span><i class="fas fa-truck-moving"></i></span>
+                                                </button>
+                                            }
+                                        }
+                                        else if (ShowAddNew && record.HasRefill)
+                                        {
+                                            <button class="btn btn-sm btn-success" @onclick="() => CreateNew(record)" title="Aggiunta nuovo Ordine"><i class="far fa-calendar-plus"></i></button>
+                                        }
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        }
+    </div>
+    <div class="card-footer p-1">
+        <DataPager PageSize="numRecord" currPage="currPage" numRecordChanged="ForceReload" numPageChanged="ForceReloadPage" totalCount="totalCount" showLoading="isLoading" />
+    </div>
+</div>
@@ -0,0 +1,436 @@
+using GWMS.Data.DatabaseModels;
+using GWMS.Data.DTO;
+using GWMS.UI.Data;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.JSInterop;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace GWMS.UI.Pages
+{
+    [Authorize(Roles = "SuperAdmin, Admin, User")]
+    public partial class PlantAnalisys : ComponentBase, IDisposable
+    {
+        #region Private Fields
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private bool _ShowOnlyRefill = false;
+        private OrderModel currRecord = null;
+
+        private List<PlantLevSumDTO> ListRecords;
+        private List<PlantDTO> PlantsList;
+        private List<PlantLevSumDTO> SearchRecords;
+        private List<SupplierModel> SuppliersList;
+
+        #endregion Private Fields
+
+        #region Protected Fields
+
+        /// <summary>
+        /// Valore PlantId filtrato da claim
+        /// </summary>
+        protected int ClaimPlantId = -1;
+
+        #endregion Protected Fields
+
+        #region Private Properties
+
+        private int _currPage { get; set; } = 1;
+
+        private int _numRecord { get; set; } = 10;
+
+        private int currPage
+        {
+            get => _currPage;
+            set
+            {
+                if (_currPage != value)
+                {
+                    _currPage = value;
+                    var pUpd = Task.Run(async () => await ReloadData());
+                    pUpd.Wait();
+                }
+            }
+        }
+
+        private bool isLoading { get; set; } = false;
+
+        private int numRecord
+        {
+            get => _numRecord;
+            set
+            {
+                if (_numRecord != value)
+                {
+                    _numRecord = value;
+                    var pUpd = Task.Run(async () => await ReloadData());
+                    pUpd.Wait();
+                }
+            }
+        }
+
+        private int SelPlantId
+        {
+            get
+            {
+                int answ = 0;
+                if (AppMService.Order_Filter != null)
+                {
+                    answ = AppMService.Order_Filter.PlantId;
+                }
+                return answ;
+            }
+            set
+            {
+                if (!AppMService.Order_Filter.PlantId.Equals(value))
+                {
+                    AppMService.Order_Filter.PlantId = value;
+                    var pUpd = Task.Run(async () => await ReloadData());
+                    pUpd.Wait();
+                }
+            }
+        }
+
+        private int SelSupplierId
+        {
+            get
+            {
+                int answ = 0;
+                if (AppMService.Order_Filter != null)
+                {
+                    answ = AppMService.Order_Filter.SupplierId;
+                }
+                return answ;
+            }
+            set
+            {
+                if (!AppMService.Order_Filter.SupplierId.Equals(value))
+                {
+                    AppMService.Order_Filter.SupplierId = value;
+                    var pUpd = Task.Run(async () => await ReloadData());
+                    pUpd.Wait();
+                }
+            }
+        }
+
+        private bool ShowOnlyRefill
+        {
+            get
+            {
+                return _ShowOnlyRefill;
+            }
+            set
+            {
+                _ShowOnlyRefill = value;
+                currPage = 1;
+                var pUpd = Task.Run(async () => await ReloadData());
+                pUpd.Wait();
+            }
+        }
+
+        #endregion Private Properties
+
+        #region Protected Properties
+
+        [Inject]
+        protected MessageService AppMService { get; set; }
+
+        [Inject]
+        protected AuthenticationStateProvider AuthenticationStateProvider { get; set; }
+
+        [Inject]
+        protected GWMSDataService DataService { get; set; }
+
+        protected DateTime DateEnd
+        {
+            get
+            {
+                DateTime answ = DateTime.Today.AddDays(1);
+                if (AppMService.Order_Filter != null)
+                {
+                    answ = AppMService.Order_Filter.DateEnd;
+                }
+                return answ;
+            }
+            set
+            {
+                if (!AppMService.Order_Filter.DateEnd.Equals(value))
+                {
+                    AppMService.Order_Filter.DateEnd = value;
+                    var pUpd = Task.Run(async () => await ReloadData());
+                    pUpd.Wait();
+                }
+            }
+        }
+
+        protected DateTime DateStart
+        {
+            get
+            {
+                DateTime answ = DateTime.Today.AddDays(-1);
+                if (AppMService.Order_Filter != null)
+                {
+                    answ = AppMService.Order_Filter.DateStart;
+                }
+                return answ;
+            }
+            set
+            {
+                if (!AppMService.Order_Filter.DateStart.Equals(value))
+                {
+                    AppMService.Order_Filter.DateStart = value;
+                    var pUpd = Task.Run(async () => await ReloadData());
+                    pUpd.Wait();
+                }
+            }
+        }
+
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; }
+
+        [Inject]
+        protected NavigationManager NavManager { get; set; }
+
+        protected int totalCount
+        {
+            get
+            {
+                int answ = 0;
+                if (SearchRecords != null)
+                {
+                    answ = SearchRecords.Count;
+                }
+                return answ;
+            }
+        }
+
+        #endregion Protected Properties
+
+        #region Public Properties
+
+        public bool ShowAddNew
+        {
+            get
+            {
+                bool answ = false;
+                answ = (SelSupplierId > 0 && SelPlantId > 0);
+                return answ;
+            }
+        }
+
+        #endregion Public Properties
+
+        #region Private Methods
+
+        /// <summary>
+        /// Recupero Claims dell'utente...
+        ///
+        /// https://docs.microsoft.com/it-it/aspnet/core/blazor/security/?view=aspnetcore-5.0
+        /// </summary>
+        /// <returns></returns>
+        private async Task GetClaimsData()
+        {
+            // recupero auth
+            var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+            var user = authState.User;
+            // se autenticato --> controllo i claims
+            if (user.Identity.IsAuthenticated)
+            {
+                // cerco il claim PlantId...
+                var plantClaim = user.FindFirst(c => c.Type == "PlantId")?.Value;
+                int.TryParse(plantClaim, out ClaimPlantId);
+            }
+            else
+            {
+                ClaimPlantId = -1;
+            }
+        }
+
+        private void OnDateEndChanged(DateTime? date)
+        {
+            DateEnd = (DateTime)date;
+        }
+
+        private void OnDateStartChanged(DateTime? date)
+        {
+            DateStart = (DateTime)date;
+        }
+
+        private async Task ReloadData()
+        {
+            isLoading = true;
+            ListRecords = null;
+            try
+            {
+                SearchRecords = await DataService.PlantsAnalisysGetByCode(AppMService.Order_Filter);
+                SearchRecords = SearchRecords.Where(x => x.HasRefill || !_ShowOnlyRefill).ToList();
+                ListRecords = SearchRecords
+
+                                .Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Eccezione in ReloadData:{Environment.NewLine}{exc}");
+            }
+            isLoading = false;
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Creazione nuovo record Ordine
+        /// </summary>
+        protected void CreateNew(PlantLevSumDTO currItem)
+        {
+            var currPlant = PlantsList.Where(x => x.PlantId == SelPlantId).FirstOrDefault();
+            var currSuppl = SuppliersList.Where(x => x.SupplierId == SelSupplierId).FirstOrDefault();
+            if (currPlant != null && currSuppl != null)
+            {
+                DateTime ordDate = currItem.DataRif.AddDays(-1);
+                // creo un nuovo record
+                currRecord = new OrderModel()
+                {
+                    DtOrder = ordDate,
+                    PlantId = SelPlantId,
+                    SupplierId = SelSupplierId,
+                    OrderDesc = $"Ord Man {currPlant.PlantDesc} - {ordDate}",
+                    TransporterId = 1,
+                    OrderCode = $"O{currPlant.PlantCode}{ordDate:yyMMddHHmm}",
+                    LevelStart = Math.Round(currItem.LevelMin),
+                    LevelEnd = Math.Round(currItem.LevelMax),
+                    DtExecStart = currItem.FillStart,
+                    DtExecEnd = currItem.FillEnd,
+                    ExecutionQty = Math.Ceiling((currItem.LevelMax - currItem.LevelMin) / currItem.DeltaMin) * currItem.DeltaMin,
+                    OrderQty = Math.Ceiling((currItem.LevelMax - currItem.LevelMin) / 2000) * 2000
+                };
+                //// aggiorno filtro
+                //AppMService.Order_Filter = SelectOrderData.Init(5, 10);
+            }
+        }
+
+        protected void Edit(PlantLevSumDTO selRecord)
+        {
+            // rileggo dal DB il record corrente...
+            var pUpd = Task.Run(async () =>
+            {
+                currRecord = await DataService.OrderGetById(selRecord.OrdersIds.FirstOrDefault());
+            });
+            pUpd.Wait();
+        }
+
+        protected void ForceReload(int newNum)
+        {
+            numRecord = newNum;
+        }
+
+        protected void ForceReloadPage(int newNum)
+        {
+            currPage = newNum;
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            DataService.ResetController();
+            AppMService.ShowSearch = false;
+            AppMService.PageName = "Ordini";
+            AppMService.PageIcon = "fas fa-file-invoice pr-2";
+            AppMService.EA_SearchUpdated += OnSeachUpdated;
+            await ReloadAllData();
+        }
+
+        protected async Task ReloadAllData()
+        {
+            isLoading = true;
+            SuppliersList = await DataService.SuppliersGetAll();
+            PlantsList = null;
+            await GetClaimsData();
+            // se ho un plantId valido --> altrimenti non abilitato
+            if (ClaimPlantId == 0)
+            {
+                PlantsList = await DataService.PlantsGetAll();
+            }
+            else if (ClaimPlantId > 0)
+            {
+                var rawData = await DataService.PlantsGetAll();
+                PlantsList = rawData.Where(x => x.PlantId == ClaimPlantId).ToList();
+                SelPlantId = ClaimPlantId;
+            }
+            else
+            {
+                PlantsList = new List<PlantDTO>();
+            }
+            isLoading = false;
+            await ReloadData();
+        }
+
+        protected void ResetData()
+        {
+            DataService.rollBackEdit(currRecord);
+            currRecord = null;
+        }
+
+        protected async Task ResetFilter()
+        {
+            SelPlantId = 0;
+            currRecord = null;
+            SearchRecords = null;
+            ListRecords = null;
+            AppMService.Order_Filter = SelectOrderData.Init(5, 10);
+            await DataService.PlantsAnalisysReset(AppMService.Order_Filter);
+            await ReloadAllData();
+        }
+
+        protected void Select(OrderModel selRecord)
+        {
+            // applico filtro da selezione
+            currRecord = selRecord;
+        }
+
+        protected async Task UpdateData()
+        {
+            currRecord = null;
+            DataService.ResetController();
+            await DataService.PlantsAnalisysReset(AppMService.Order_Filter);
+            await ReloadData();
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
+        public string checkSelect(int OrderId)
+        {
+            string answ = "";
+            if (currRecord != null)
+            {
+                try
+                {
+                    answ = (currRecord.OrderId == OrderId) ? "table-info" : "";
+                }
+                catch
+                { }
+            }
+            return answ;
+        }
+
+        public void Dispose()
+        {
+            AppMService.EA_SearchUpdated -= OnSeachUpdated;
+        }
+
+        public async void OnSeachUpdated()
+        {
+            await UpdateData();
+            StateHasChanged();
+        }
+
+        #endregion Public Methods
+    }
+}
@@ -2,7 +2,7 @@

@using GWMS.UI.Components

-<div class="row">
+<div class="row mx-0">
    @if (ListRecords == null)
    {
        <div class="col-12">
@@ -22,7 +22,7 @@
                @foreach (var record in ListRecords)
                {
                    <div class="col-12 col-xl-6 py-2">
-                        <PlantDetail currItem="@record"></PlantDetail>
+                        <PlantOverview currItem="@record"></PlantOverview>
                    </div>
                }
            </div>
@@ -99,7 +99,7 @@ namespace GWMS.UI.Pages
            }
        }

-        private async Task reloadData()
+        private async Task ReloadAllData()
        {
            isLoading = true;
            ListRecords = null;
@@ -131,7 +131,7 @@ namespace GWMS.UI.Pages
            MessageService.PageName = "Impianti";
            MessageService.PageIcon = "fas fa-gas-pump pr-2";
            MessageService.EA_SearchUpdated += OnSeachUpdated;
-            await reloadData();
+            await ReloadAllData();
        }

        protected void Select(PlantDTO selRecord)
@@ -143,7 +143,7 @@ namespace GWMS.UI.Pages
        protected async Task UpdateData()
        {
            currRecord = null;
-            await reloadData();
+            await ReloadAllData();
        }

        #endregion Protected Methods
@@ -157,11 +157,8 @@ namespace GWMS.UI.Pages

        public async void OnSeachUpdated()
        {
-            await InvokeAsync(() =>
-            {
-                Task task = UpdateData();
-                StateHasChanged();
-            });
+            await UpdateData();
+            StateHasChanged();
        }

        #endregion Public Methods
@@ -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>
@@ -76,17 +76,17 @@ namespace GWMS.UI.Pages
            get
            {
                int answ = 0;
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                {
-                    answ = MessageService.Order_Filter.PlantId;
+                    answ = AppMService.Order_Filter.PlantId;
                }
                return answ;
            }
            set
            {
-                if (!MessageService.Order_Filter.PlantId.Equals(value))
+                if (!AppMService.Order_Filter.PlantId.Equals(value))
                {
-                    MessageService.Order_Filter.PlantId = value;
+                    AppMService.Order_Filter.PlantId = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
                }
@@ -98,29 +98,30 @@ namespace GWMS.UI.Pages
            get
            {
                int answ = 0;
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                {
-                    answ = MessageService.Order_Filter.SupplierId;
+                    answ = AppMService.Order_Filter.SupplierId;
                }
                return answ;
            }
            set
            {
-                if (!MessageService.Order_Filter.SupplierId.Equals(value))
+                if (!AppMService.Order_Filter.SupplierId.Equals(value))
                {
-                    MessageService.Order_Filter.SupplierId = value;
+                    AppMService.Order_Filter.SupplierId = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
                }
            }
        }

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

        #region Protected Properties

+        [Inject]
+        protected MessageService AppMService { get; set; }
+
        [Inject]
        protected AuthenticationStateProvider AuthenticationStateProvider { get; set; }

@@ -132,17 +133,17 @@ namespace GWMS.UI.Pages
            get
            {
                DateTime answ = DateTime.Today.AddDays(1);
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                {
-                    answ = MessageService.Order_Filter.DateEnd;
+                    answ = AppMService.Order_Filter.DateEnd;
                }
                return answ;
            }
            set
            {
-                if (!MessageService.Order_Filter.DateEnd.Equals(value))
+                if (!AppMService.Order_Filter.DateEnd.Equals(value))
                {
-                    MessageService.Order_Filter.DateEnd = value;
+                    AppMService.Order_Filter.DateEnd = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
                }
@@ -154,17 +155,17 @@ namespace GWMS.UI.Pages
            get
            {
                DateTime answ = DateTime.Today.AddDays(-1);
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                {
-                    answ = MessageService.Order_Filter.DateStart;
+                    answ = AppMService.Order_Filter.DateStart;
                }
                return answ;
            }
            set
            {
-                if (!MessageService.Order_Filter.DateStart.Equals(value))
+                if (!AppMService.Order_Filter.DateStart.Equals(value))
                {
-                    MessageService.Order_Filter.DateStart = value;
+                    AppMService.Order_Filter.DateStart = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
                }
@@ -174,9 +175,6 @@ namespace GWMS.UI.Pages
        [Inject]
        protected IJSRuntime JSRuntime { get; set; }

-        [Inject]
-        protected MessageService MessageService { get; set; }
-
        [Inject]
        protected NavigationManager NavManager { get; set; }

@@ -241,7 +239,7 @@ namespace GWMS.UI.Pages
        private async Task ReloadData()
        {
            isLoading = true;
-            SearchRecords = await DataService.OrdersGetFilt(MessageService.Order_Filter);
+            SearchRecords = await DataService.OrdersGetFilt(AppMService.Order_Filter);
            ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
            isLoading = false;
        }
@@ -252,7 +250,9 @@ namespace GWMS.UI.Pages

        protected void Edit(OrderModel selRecord)
        {
-            currRecord = selRecord;
+            // rileggo dal DB il record corrente...
+            var pUpd = Task.Run(async () => currRecord = await DataService.OrderGetByCode(selRecord.OrderCode));
+            pUpd.Wait();
        }

        protected void ForceReload(int newNum)
@@ -267,19 +267,21 @@ namespace GWMS.UI.Pages

        protected override async Task OnInitializedAsync()
        {
-            MessageService.ShowSearch = false;
-            MessageService.PageName = "Fornitore";
-            MessageService.PageIcon = "fas fa-industry pr-2";
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
+            DataService.ResetController();
+            AppMService.ShowSearch = false;
+            AppMService.PageName = "Fornitore";
+            AppMService.PageIcon = "fas fa-industry pr-2";
+            AppMService.EA_SearchUpdated += OnSeachUpdated;
            await ReloadAllData();
        }

        protected async Task ReloadAllData()
        {
            isLoading = true;
+            PlantsList = await DataService.PlantsGetAll();
+            SelSupplierId = 0;
            SuppliersList = null;
            await GetClaimsData();
-            PlantsList = await DataService.PlantsGetAll();
            // se ho un plantId valido --> altrimenti non abilitato
            if (ClaimSupplierId == 0)
            {
@@ -310,7 +312,7 @@ namespace GWMS.UI.Pages
            currRecord = null;
            SearchRecords = null;
            ListRecords = null;
-            MessageService.Order_Filter = SelectOrderData.Init(5, 7);
+            AppMService.Order_Filter = SelectOrderData.Init(5, 7);
            await ReloadAllData();
        }

@@ -323,6 +325,7 @@ namespace GWMS.UI.Pages
        protected async Task UpdateData()
        {
            currRecord = null;
+            DataService.ResetController();
            await ReloadData();
        }

@@ -347,16 +350,13 @@ namespace GWMS.UI.Pages

        public void Dispose()
        {
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
+            AppMService.EA_SearchUpdated -= OnSeachUpdated;
        }

        public async void OnSeachUpdated()
        {
-            await InvokeAsync(() =>
-            {
-                Task task = UpdateData();
-                StateHasChanged();
-            });
+            await UpdateData();
+            StateHasChanged();
        }

        #endregion Public Methods
@@ -22,7 +22,6 @@ namespace GWMS.UI.Pages
        private List<OrderModel> ListRecords;
        private List<PlantDTO> PlantsList;
        private List<OrderModel> SearchRecords;
-
        private List<TransporterModel> TransportersList;

        #endregion Private Fields
@@ -100,18 +99,18 @@ namespace GWMS.UI.Pages
            get
            {
                int answ = 0;
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                {
-                    answ = MessageService.Order_Filter.PlantId;
+                    answ = AppMService.Order_Filter.PlantId;
                }
                return answ;
            }
            set
            {
-                if (!MessageService.Order_Filter.PlantId.Equals(value))
+                if (!AppMService.Order_Filter.PlantId.Equals(value))
                {
                    currRecord = null;
-                    MessageService.Order_Filter.PlantId = value;
+                    AppMService.Order_Filter.PlantId = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
                }
@@ -123,18 +122,18 @@ namespace GWMS.UI.Pages
            get
            {
                int answ = 0;
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                {
-                    answ = MessageService.Order_Filter.TransporterId;
+                    answ = AppMService.Order_Filter.TransporterId;
                }
                return answ;
            }
            set
            {
-                if (!MessageService.Order_Filter.TransporterId.Equals(value))
+                if (!AppMService.Order_Filter.TransporterId.Equals(value))
                {
                    currRecord = null;
-                    MessageService.Order_Filter.TransporterId = value;
+                    AppMService.Order_Filter.TransporterId = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
                }
@@ -145,6 +144,9 @@ namespace GWMS.UI.Pages

        #region Protected Properties

+        [Inject]
+        protected MessageService AppMService { get; set; }
+
        [Inject]
        protected AuthenticationStateProvider AuthenticationStateProvider { get; set; }

@@ -156,17 +158,17 @@ namespace GWMS.UI.Pages
            get
            {
                DateTime answ = DateTime.Today.AddDays(1);
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                {
-                    answ = MessageService.Order_Filter.DateEnd;
+                    answ = AppMService.Order_Filter.DateEnd;
                }
                return answ;
            }
            set
            {
-                if (!MessageService.Order_Filter.DateEnd.Equals(value))
+                if (!AppMService.Order_Filter.DateEnd.Equals(value))
                {
-                    MessageService.Order_Filter.DateEnd = value;
+                    AppMService.Order_Filter.DateEnd = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
                }
@@ -178,17 +180,17 @@ namespace GWMS.UI.Pages
            get
            {
                DateTime answ = DateTime.Today.AddDays(-1);
-                if (MessageService.Order_Filter != null)
+                if (AppMService.Order_Filter != null)
                {
-                    answ = MessageService.Order_Filter.DateStart;
+                    answ = AppMService.Order_Filter.DateStart;
                }
                return answ;
            }
            set
            {
-                if (!MessageService.Order_Filter.DateStart.Equals(value))
+                if (!AppMService.Order_Filter.DateStart.Equals(value))
                {
-                    MessageService.Order_Filter.DateStart = value;
+                    AppMService.Order_Filter.DateStart = value;
                    var pUpd = Task.Run(async () => await ReloadData());
                    pUpd.Wait();
                }
@@ -198,9 +200,6 @@ namespace GWMS.UI.Pages
        [Inject]
        protected IJSRuntime JSRuntime { get; set; }

-        [Inject]
-        protected MessageService MessageService { get; set; }
-
        [Inject]
        protected NavigationManager NavManager { get; set; }

@@ -235,6 +234,7 @@ namespace GWMS.UI.Pages
        /// <returns></returns>
        private async Task GetClaimsData()
        {
+            ClaimTransporterId = -1;
            // recupero auth
            var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
            var user = authState.User;
@@ -266,9 +266,8 @@ namespace GWMS.UI.Pages
        private async Task ReloadData()
        {
            isLoading = true;
-            SearchRecords = await DataService.OrdersGetFilt(MessageService.Order_Filter);
+            SearchRecords = await DataService.OrdersGetFilt(AppMService.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;
        }

@@ -278,7 +277,9 @@ namespace GWMS.UI.Pages

        protected void Edit(OrderModel selRecord)
        {
-            currRecord = selRecord;
+            // rileggo dal DB il record corrente...
+            var pUpd = Task.Run(async () => currRecord = await DataService.OrderGetByCode(selRecord.OrderCode));
+            pUpd.Wait();
        }

        protected void ForceReload(int newNum)
@@ -293,12 +294,13 @@ namespace GWMS.UI.Pages

        protected override async Task OnInitializedAsync()
        {
+            DataService.ResetController();
            SelPlantId = 0;
            SelTranspId = 0;
-            MessageService.ShowSearch = false;
-            MessageService.PageName = "Fornitore";
-            MessageService.PageIcon = "fas fa-industry pr-2";
-            MessageService.EA_SearchUpdated += OnSeachUpdated;
+            AppMService.ShowSearch = false;
+            AppMService.PageName = "Fornitore";
+            AppMService.PageIcon = "fas fa-industry pr-2";
+            AppMService.EA_SearchUpdated += OnSeachUpdated;
            await ReloadAllData();
        }

@@ -306,6 +308,7 @@ namespace GWMS.UI.Pages
        {
            isLoading = true;
            PlantsList = await DataService.PlantsGetAll();
+            SelTranspId = 0;
            TransportersList = null;
            await GetClaimsData();
            // se ho un plantId valido --> altrimenti non abilitato
@@ -324,7 +327,6 @@ namespace GWMS.UI.Pages
                PlantsList = new List<PlantDTO>();
            }
            isLoading = false;
-
            await ReloadData();
        }

@@ -339,7 +341,7 @@ namespace GWMS.UI.Pages
            currRecord = null;
            SearchRecords = null;
            ListRecords = null;
-            MessageService.Order_Filter = SelectOrderData.Init(5, 7);
+            AppMService.Order_Filter = SelectOrderData.Init(5, 7);
            await ReloadAllData();
        }

@@ -371,6 +373,7 @@ namespace GWMS.UI.Pages
        protected async Task UpdateData()
        {
            currRecord = null;
+            DataService.ResetController();
            await ReloadData();
        }

@@ -395,16 +398,13 @@ namespace GWMS.UI.Pages

        public void Dispose()
        {
-            MessageService.EA_SearchUpdated -= OnSeachUpdated;
+            AppMService.EA_SearchUpdated -= OnSeachUpdated;
        }

        public async void OnSeachUpdated()
        {
-            await InvokeAsync(() =>
-            {
-                Task task = UpdateData();
-                StateHasChanged();
-            });
+            await UpdateData();
+            StateHasChanged();
        }

        #endregion Public Methods
@@ -141,9 +141,18 @@
                                </button>
                            }
                        </td>
-                        <td>@user.Identity.Id.Substring(0, 4)...</td>
-                        @*<td>@user.UserName</td>*@
-                        <td><span class="badge badge-pill @checkSem(user.Identity.EmailConfirmed)" title="Email validata"><span class="oi oi-check" aria-hidden="true"></span></span> @user.Identity.Email</td>
+                        <td>@user.Identity.Id.Substring(0, 8)...</td>
+                        <td>
+                            @if (user.Identity.EmailConfirmed)
+                            {
+                                <span class="badge badge-pill badge-success" title="Email validata"><span class="oi oi-check" aria-hidden="true"></span></span>
+                            }
+                            else
+                            {
+                                <span class="badge badge-pill badge-danger" title="Email NON ancora validata!"><span class="oi oi-check" aria-hidden="true"></span></span>
+                            }
+                            &nbsp;@user.Identity.Email
+                        </td>
                        <td>
                            @ShowRoles(user.Roles)
                        </td>
@@ -452,11 +452,6 @@ namespace GWMS.UI.Pages

        #region Public Methods

-        public string checkSem(bool valore)
-        {
-            return valore ? "badge-success" : "badge-danger";
-        }
-
        public void Dispose()
        {
            AppMService.EA_SearchUpdated -= OnSeachUpdated;
@@ -509,10 +504,7 @@ namespace GWMS.UI.Pages
        public async void OnSeachUpdated()
        {
            await GetUsers();
-            await InvokeAsync(() =>
-            {
-                StateHasChanged();
-            });
+            StateHasChanged();
        }

        public string ShowClaims(List<System.Security.Claims.Claim> ClaimList)
@@ -243,11 +243,8 @@ namespace GWMS.UI.Pages

        public async void OnSeachUpdated()
        {
-            await InvokeAsync(() =>
-            {
-                Task task = UpdateData();
-                StateHasChanged();
-            });
+            await UpdateData();
+            StateHasChanged();
        }

        #endregion Public Methods
@@ -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>
@@ -67,8 +68,8 @@
                    new QRCode(document.getElementById(elementName),
                        {
                            text: rawData,
-                            width: 400,
-                            height: 400
+                            width: 300,
+                            height: 300
                        });
                    //qrcode.makeCode(rawData);
                }
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAAD+ZfytfJJzf+XzD0ShcSagAAAAAASAAACgAAAAEAAAAAhSlOT4SIk7WdUrN1YS1qMYAAAAGI+89iBgQqaMJeEi4KxlVpTh9PMYTidkFAAAAO7so25722o8lxnn313D6J0eV2MV</EncryptedPassword>
+    <History>False|2021-06-23T12:54:39.3412623Z;</History>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAAAwZbVLPZ+eVCZgVc7GoE8CAAAAAASAAACgAAAAEAAAAEmDwlS8G30J/kR5K+eX8B4YAAAAZ14uy/TVGN4ui4QHWpgdmwaMob7VeTSiFAAAAC/61bXCe/Mgyo7S2QBvJRJ2GUiZ</EncryptedPassword>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <History>True|2021-06-23T13:11:40.1591388Z;</History>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>Package</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <ProjectGuid>5f0dbab0-122f-4a81-be73-161bbefeef59</ProjectGuid>
+    <DesktopBuildPackageLocation>bin\publish\GWMS.UI.zip</DesktopBuildPackageLocation>
+    <PackageAsSingleFile>true</PackageAsSingleFile>
+    <DeployIisAppPath>Default Web Site/GWMS</DeployIisAppPath>
+    <TargetFramework>net5.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>Package</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <ProjectGuid>5f0dbab0-122f-4a81-be73-161bbefeef59</ProjectGuid>
+    <DesktopBuildPackageLocation>bin\publish\GWMS.UI.zip</DesktopBuildPackageLocation>
+    <PackageAsSingleFile>true</PackageAsSingleFile>
+    <DeployIisAppPath>Default Web Site/GWMS</DeployIisAppPath>
+    <TargetFramework>net5.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+  </PropertyGroup>
+</Project>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAxNUOeyL5oUSNi/ISzvJtLgAAAAACAAAAAAADZgAAwAAAABAAAADTQmYF8PrkLa4Xb9E/zxuXAAAAAASAAACgAAAAEAAAADLKIlcnZuaCFkaVmfe382YYAAAADxGWDujdGKLnZ+ycw0Vb2K2g5K0dRHB8FAAAAHB9B2k06W3L+M48vPfUvedJRpJX</EncryptedPassword>
+  </PropertyGroup>
+</Project>
@@ -1,42 +0,0 @@
-using Microsoft.Extensions.Hosting;
-using Quartz;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace GWMS.UI
-{
-    public class QuartzHostedService : IHostedService
-    {
-        #region Private Fields
-
-        private readonly IScheduler _scheduler;
-
-        #endregion Private Fields
-
-        #region Public Constructors
-
-        public QuartzHostedService(IScheduler scheduler)
-        {
-            _scheduler = scheduler;
-        }
-
-        #endregion Public Constructors
-
-        #region Public Methods
-
-        public async Task StartAsync(CancellationToken cancellationToken)
-        {
-            await _scheduler?.Start(cancellationToken);
-        }
-
-        public async Task StopAsync(CancellationToken cancellationToken)
-        {
-            await _scheduler?.Shutdown(cancellationToken);
-        }
-
-        #endregion Public Methods
-    }
-}
@@ -2,6 +2,7 @@

@using GWMS.UI.Data
@using GWMS.UI.Components
+
@inject MessageService MessageService
@implements IDisposable

@@ -52,6 +52,12 @@
                        <span class="@hideText">Stato Impianti</span>
                    </NavLink>
                </li>
+                <li class="nav-item px-3" title="Storico Impianto">
+                    <NavLink class="nav-link" href="PlantAnalisys">
+                        <i class="fas fa-2x fa-history pr-2"></i>
+                        <span class="@hideText">Storico Impianto</span>
+                    </NavLink>
+                </li>
                <li class="nav-item px-3" title="Storico Ordini">
                    <NavLink class="nav-link" href="Orders">
                        <i class="fas fa-2x fa-file-invoice pr-2" aria-hidden="true"></i>
@@ -94,6 +100,12 @@
                        <span class="@hideText">Planner Consegne</span>
                    </NavLink>
                </li>
+                <li class="nav-item px-3" title="Setup Parametri">
+                    <NavLink class="nav-link" href="Parameters">
+                        <i class="fas fa-2x fa-wrench pr-2" aria-hidden="true"></i>
+                        <span class="@hideText">Setup Parametri</span>
+                    </NavLink>
+                </li>
                <li class="nav-item px-3" title="Admin Utenti">
                    <NavLink class="nav-link" href="UserAdmin">
                        <i class="fas fa-2x fa-users pr-2" aria-hidden="true"></i>
@@ -114,12 +126,6 @@
                    <i class="fas fa-2x 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-2x fa-wrench pr-2" aria-hidden="true"></i>
-                    <span class="@hideText">Setup Parametri</span>
-                </NavLink>
            </li>*@
    </ul>
 </div>
@@ -1,7 +1,6 @@
 using Blazorise;
 using Blazorise.Bootstrap;
 using Blazorise.Icons.FontAwesome;
-using ElmahCore.Mvc;
 using GWMS.Data;
 using GWMS.UI.Areas.Identity;
 using GWMS.UI.Data;
@@ -23,8 +22,6 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Hosting;
-using Quartz;
-using Quartz.Impl;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -79,9 +76,9 @@ namespace GWMS.UI
            });
            CultureInfo.DefaultThreadCurrentCulture = CultureInfo.CreateSpecificCulture("it-IT");

-            // Registrazione Elmah:
-            // https://github.com/ElmahCore/ElmahCore
-            app.UseElmah();
+            //// Registrazione Elmah:
+            //// https://github.com/ElmahCore/ElmahCore
+            //app.UseElmah();

            // fix forwarders
            app.UseForwardedHeaders(new ForwardedHeadersOptions
@@ -132,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))
@@ -157,8 +154,8 @@ namespace GWMS.UI
              .AddHealthChecksUI(s =>
              {
                  s.AddHealthCheckEndpoint("GWMS_Services", "health");
-                  s.SetEvaluationTimeInSeconds(15);
-                  s.SetMinimumSecondsBetweenFailureNotifications(60);
+                  s.SetEvaluationTimeInSeconds(60);
+                  s.SetMinimumSecondsBetweenFailureNotifications(120);
                  s.SetApiMaxActiveRequests(5);
                  s.SetHeaderText("GWMS Health Check Status");
              })
@@ -218,8 +215,8 @@ namespace GWMS.UI
           .AddBootstrapProviders()
           .AddFontAwesomeIcons();

-            // Elmah
-            services.AddElmah();
+            //// Elmah
+            //services.AddElmah();
            //string elmaConn = "Data Source=SQL2016DEV;Initial Catalog=Elmah;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=SHERPA.BBM;";
            //services.AddElmah<SqlErrorLog>(options =>
            //{
@@ -34,6 +34,7 @@
    "IntervalMin": 60,
    "MaxLogRecord": 360,
    "ZCodeUrl": "https://qrcode.steamware.net/",
+    "ChartWaitDelay": 10,
    "logo": "img/LogoPizzaferri.jpg",
    "ExternalProviders": {
        "MailKit": {
@@ -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/"
+    }
+  ]
 }
@@ -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;
+}
@@ -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}
@@ -362,6 +362,7 @@ var QRCode;
            this._elImage.src = this._elCanvas.toDataURL("image/png");
            this._elImage.style.display = "block";
            this._elCanvas.style.display = "none";
+            this._elImage.className = "img-fluid";
        }

        // Android 2.1 bug workaround
@@ -471,6 +472,7 @@ var QRCode;
            var nRoundedHeight = Math.round(nHeight);

            _elImage.style.display = "none";
+            _elImage.className = "img-fluid";
            this.clear();

            for (var row = 0; row < nCount; row++) {
@@ -98,4 +98,19 @@ link da approfondire
 - https://github.com/parallelbgls/Modbus.Net
 - http://easymodbustcp.net/en/
 - https://sourceforge.net/p/easymodbustcp/wiki/Home/
- https://techitmore.com/dotnet/modbus-tcp-communication-in-net-c/ 
+- https://techitmore.com/dotnet/modbus-tcp-communication-in-net-c/ 
+
+
+## Appunti
+
+### Linux debug
+
+Questa applicazione viene distribuita (localmente in ufficio ed in ovh x cliente finale) su macchina Linux, tramite dotnetcore.
+
+In particolare su linux x debug dei messaggi di log usare il comando
+
+
+    journalctl -fu  kestrel-app-gwms.service
+
+
+## Versioni
@@ -1,6 +1,6 @@
 <body>
    <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2108.2619</h4>
+    <h4>Versione: 1.0.2109.2315</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-1.0.2108.2619
+1.0.2109.2315
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.2619</version>
+  <version>1.0.2109.2315</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	1d4cc9d174	Merge branch 'release/HistPlantPage'	2021-09-23 15:37:35 +02:00
Samuele Locatelli	19a15ea9f2	Completato editing ed update ordini mancanti	2021-09-23 15:36:49 +02:00
Samuele Locatelli	dd91fe353c	Fix comportamento cambio selezione data	2021-09-23 11:57:56 +02:00
Samuele Locatelli	08df606bf2	Fix display icone con span intorno a fontawesome	2021-09-23 11:24:53 +02:00
Samuele Locatelli	132718ee79	Update identity	2021-09-23 10:53:02 +02:00
Samuele Locatelli	3f35dfe505	Update Nuget MySql	2021-09-23 10:52:31 +02:00
Samuele Locatelli	44a3e2d093	Update Nuget EFCore	2021-09-23 10:52:13 +02:00
Samuele Locatelli	2d32617d3c	NUget Update NLog + Blazorise	2021-09-23 10:51:10 +02:00
Samuele Locatelli	0f8593a4a3	Update x mostrare dati anailsi carichi	2021-09-23 10:50:35 +02:00
Samuele Locatelli	3cad5ac58b	Fix selezione e bozza pagina storico impianti	2021-09-23 10:02:42 +02:00
Samuele Locatelli	a6a1afa826	Aggiunto DTO x calcolo livelli summary quotidiani	2021-09-23 10:02:30 +02:00
Samuele Locatelli	052c56b903	Correzione chiamate InvokeAsync inutili	2021-09-22 19:18:46 +02:00
Samuele Locatelli	1df85b32ee	Merge tag 'PubNexusFix' into develop Fix pubblicazione Nexus (path versioni)	2021-09-22 19:04:00 +02:00
Samuele Locatelli	e1cc60a5c9	Merge branch 'release/PubNexusFix'	2021-09-22 19:03:50 +02:00
Samuele Locatelli	7f7370f6fe	Fix posizione resources x install nexus	2021-09-22 19:02:06 +02:00
Samuele Locatelli	861911eb64	Test deploy unstable	2021-09-22 18:58:20 +02:00
Samuele Locatelli	ed33783f49	Merge tag 'PageMarginFix' into develop Page Margin Fix	2021-09-22 18:29:49 +02:00
Samuele Locatelli	e3433962fa	Merge branch 'release/PageMarginFix'	2021-09-22 18:29:30 +02:00
Samuele Locatelli	442d419460	Update grafico x visualizzazione	2021-09-22 18:28:53 +02:00
Samuele Locatelli	c82cd1ed8b	Refresh layout	2021-09-10 19:30:38 +02:00
Samuele Locatelli	23f7e9c726	Refresh log refresh	2021-09-10 19:30:11 +02:00
Samuele Locatelli	c71a592ab3	Merge tag 'Jenkins2GitLab' into develop Completato porting conf tag win x test nuovi runners	2021-09-02 12:11:43 +02:00
Samuele Locatelli	c848168552	Merge branch 'release/Jenkins2GitLab'	2021-09-02 12:11:24 +02:00
Samuele Locatelli	d95a19af32	Taggato job come "win" x selezionare runners	2021-09-02 11:39:52 +02:00
Samuele Locatelli	c5e4f95b94	update nav menu	2021-09-02 11:30:29 +02:00
Samuele Locatelli	35e00bdb71	Aggiunta update await x lettura in transporters	2021-09-02 11:30:25 +02:00
Samuele Locatelli	8948984b44	Merge tag 'RC11' into develop Test modifica suppliers/transporters	2021-09-01 09:36:47 +02:00
Samuele Locatelli	58f8d2aee3	Merge branch 'release/RC11'	2021-09-01 09:36:38 +02:00
Samuele Locatelli	951a704b52	Pérova modifica reset controller per errore online	2021-09-01 09:36:23 +02:00
Samuele Locatelli	d518861228	Merge tag 'RC10' into develop Test fix catena reload data	2021-09-01 09:04:59 +02:00
Samuele Locatelli	32a0fa1287	Merge branch 'release/RC10'	2021-09-01 09:04:50 +02:00
Samuele Locatelli	33212941c8	Test modifica naming x chiamate che danno errori in OVH	2021-09-01 09:04:34 +02:00
Samuele Locatelli	59975a335d	Merge tag 'RC9' into develop Fix reanming local db context	2021-08-31 16:49:12 +02:00
Samuele Locatelli	390046a0c7	Merge branch 'release/RC9'	2021-08-31 16:49:02 +02:00
Samuele Locatelli	149f6251f7	Renaming localDbCtx	2021-08-31 16:48:48 +02:00
Samuele Locatelli	46a0efe748	Merge tag 'RC8' into develop Fix display grafici su mobile	2021-08-31 16:32:02 +02:00
Samuele Locatelli	ace620b09d	Merge branch 'release/RC8'	2021-08-31 16:31:36 +02:00
Samuele Locatelli	3d87f28004	Fix QRCode size on small device	2021-08-31 16:31:06 +02:00
Samuele Locatelli	b7071dcbe1	Fix display QRCode (test)	2021-08-31 16:26:11 +02:00
Samuele Locatelli	fdf937131c	Fix display grafici	2021-08-31 16:21:57 +02:00
Samuele Locatelli	1b8a19b036	Merge tag 'RC7' into develop Update indicazione aggiornamento dati realtime/vecchi	2021-08-30 12:39:31 +02:00
Samuele Locatelli	86bd0f375c	Merge branch 'release/RC7'	2021-08-30 12:39:06 +02:00
Samuele Locatelli	9e1d437563	Aggiunta indicazione trasmisisone RTime / vecchia	2021-08-30 12:38:20 +02:00
Samuele Locatelli	6bd54468dd	Modifica logging (meno verboso) e rallentamento check UI	2021-08-30 12:13:27 +02:00
Samuele Locatelli	52a71d236d	Merge tag 'RC6' into develop Inserite trappole x log + verboso	2021-08-30 11:58:51 +02:00
Samuele Locatelli	c2fd4870c7	Merge branch 'release/RC6'	2021-08-30 11:58:42 +02:00
Samuele Locatelli	b67fae281b	Aggiunto log livello debug x controllers IOB	2021-08-30 11:58:26 +02:00
Samuele Locatelli	22f4455356	Merge tag 'RC5' into develop Fix problema dimensioen QRCode	2021-08-30 09:42:11 +02:00
Samuele Locatelli	8107ba51b9	Merge branch 'release/RC5'	2021-08-30 09:42:01 +02:00
Samuele Locatelli	b3062b04fc	pulizia varia codice x classi non impiegate	2021-08-30 09:38:49 +02:00
Samuele Locatelli	3739225a28	riduzione canvas QRCode (raw fix)	2021-08-30 09:38:37 +02:00
Samuele Locatelli	2db1fbc8d6	Merge tag 'RC4' into develop Completata migrazione QRCode js + fix vari x check e librerie	2021-08-27 13:03:02 +02:00
Samuele Locatelli	85944da9ed	Merge branch 'release/RC4'	2021-08-27 13:02:40 +02:00
Samuele Locatelli	a598c6793a	Refresh versione delle 13	2021-08-27 13:02:18 +02:00
Samuele Locatelli	bf30e006c3	Merge branch 'feature/QrCodeUpgrade' into develop	2021-08-27 13:01:51 +02:00
Samuele Locatelli	e799fdf10a	Rimozione check x pagina QRCode ext	2021-08-27 13:01:31 +02:00
Samuele Locatelli	34ce093ca9	Completata modifica x riprotare QRCode js (no img ext)	2021-08-27 12:56:56 +02:00
Samuele Locatelli	c1d39b73e9	Integrato localmente JQuery e Popper	2021-08-27 12:42:40 +02:00
Samuele Locatelli	567b966157	COmpleto CHartJs locale + blazorise upgrade	2021-08-27 12:34:25 +02:00
Samuele Locatelli	e076bc3f6b	Upgrade Blazorise NuGet + ChartJs locale	2021-08-27 12:33:50 +02:00
Samuele Locatelli	fd027e424f	Merge tag 'FixOvhRamCpuIssue' into develop Fix gestione ram: parameto ServerGC collector va messo a true x linux virtual (errore RAM/CPU/Disco di OVH)	2021-08-27 12:17:46 +02:00
Samuele Locatelli	3bd8ee233b	Merge branch 'hotfix/FixOvhRamCpuIssue'	2021-08-27 12:17:00 +02:00
Samuele Locatelli	bb9e9ce7d5	Refresh version	2021-08-27 12:16:53 +02:00
Samuele Locatelli	a5f5a55e34	Fix configurazione GC x server (su CPU fisica OK, su OVH c'erano problemi ram/disco)	2021-08-27 12:14:19 +02:00
Samuele Locatelli	2ecc7338e6	Merge tag 'RC3' into develop Riduzione dimensione installer (èacchetti nuget, target framework, code analysis...)	2021-08-27 11:56:36 +02:00
Samuele Locatelli	66c069fb35	Merge branch 'release/RC3'	2021-08-27 11:56:17 +02:00
Samuele Locatelli	361d4338a6	Merge branch 'feature/CodeCleanup' into develop	2021-08-27 11:55:58 +02:00
Samuele Locatelli	9a964330e3	Aggiunta conf x GarbageCollection + restrittiva sui processi	2021-08-27 11:54:13 +02:00
Samuele Locatelli	0e65410340	update Nuget AspNetCore	2021-08-27 11:53:56 +02:00
Samuele Locatelli	b0e5d54061	Rimozione componenti analisi codice	2021-08-27 11:50:12 +02:00
Samuele Locatelli	9c979582d4	test sintassi pubblicazione SOLO linux	2021-08-27 11:41:52 +02:00
Samuele Locatelli	11cae94995	Update NLog	2021-08-27 11:39:45 +02:00
Samuele Locatelli	05ca047b5c	Completo profili compilazione x64 Win/Linux	2021-08-27 11:39:20 +02:00
Samuele Locatelli	cd533c190b	Gestione profili compilazione Win/Linux x64	2021-08-27 11:39:04 +02:00
Samuele Locatelli	efd84437b5	Rimozione elmah e quartz	2021-08-27 10:15:29 +02:00
Samuele Locatelli	1c36305304	Appunti log debug linux	2021-08-27 10:14:48 +02:00
Samuele Locatelli	f1f1e784da	Correzione jscript x generazione img-fluid	2021-08-26 19:41:35 +02:00
Samuele Locatelli	512d25f513	Merge tag 'RC2' into develop Fix display main x spazio orizzontale (HOPE!)	2021-08-26 19:33:13 +02:00
				`@@ -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}