Merge branch 'release/FixDataInsertOverflow'

Miglioramento SIM livello x GWMS

.gitlab-ci.yml

@@ -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

.vscode/launch.json

@@ -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"
+        }
+    ]
+}

.vscode/tasks.json

@@ -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"
+        }
+    ]
+}

GWMS.Data/Controllers/GWMSController.cs

@@ -15,7 +15,6 @@ namespace GWMS.Data.Controllers
         #region Private Fields
 
         private static IConfiguration _configuration;
-        private static GWMSContext dbCtx;
         private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
 
         #endregion Private Fields
@@ -25,118 +24,10 @@ namespace GWMS.Data.Controllers
         public GWMSController(IConfiguration configuration)
         {
             _configuration = configuration;
-            dbCtx = new GWMSContext(configuration);
-            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>
@@ -147,32 +38,57 @@ namespace GWMS.Data.Controllers
         /// <returns></returns>
         public DateTime DateRoundEnd(DateTime dateOrig, int minInt)
         {
-            int minRound = (int)Math.Ceiling((double)dateOrig.Minute / minInt) * minInt;
+            // calcolo con minuto + 0.5 per poter arrotondare in modo corretto sennò se 0 min e qualche secondo --> diventa floor e arrotonda x difetto...
+            int minRound = (int)Math.Ceiling(((double)dateOrig.Minute + 0.5) / minInt) * minInt;
             DateTime roundDate = dateOrig.Date.AddHours(dateOrig.Hour).AddMinutes(minRound);
             return roundDate;
         }
 
+        public bool DbForceMigrate()
+        {
+            bool answ = false;
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                try
+                {
+                    localDbCtx.DbForceMigrate();
+                    answ = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione in DbForceMigrate");
+                }
+            }
+            return answ;
+        }
+
         public void Dispose()
         {
             // Clear database context
-            dbCtx.Dispose();
+            //Log.Info("Dispose di GWMSController");
         }
 
         public List<ConfigModel> GetConfig()
         {
-            var dbResult = dbCtx
+            List<ConfigModel> dbResult = new List<ConfigModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetConfig
                 .ToList();
-
+            }
             return dbResult;
         }
 
         public List<ItemModel> GetItems()
         {
-            var dbResult = dbCtx
+            List<ItemModel> dbResult = new List<ItemModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetItems
                 .ToList();
-
+            }
             return dbResult;
         }
 
@@ -192,9 +108,28 @@ 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
+            List<OrderModel> dbResult = new List<OrderModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetOrders
                 .Where(x => (x.PlantId == PlantId || PlantId == 0) && (x.SupplierId == SupplierId || SupplierId == 0) && (x.TransporterId == TransporterId || TransporterId == 0) && (x.DtOrder >= DtStart && x.DtOrder <= DtEnd) && (x.ExecutionQty == 0 || ShowClosed))
                 .Include(p => p.Plant)
@@ -202,13 +137,16 @@ namespace GWMS.Data.Controllers
                 .Include(t => t.Transporter)
                 .OrderByDescending(x => x.DtOrder)
                 .ToList();
-
+            }
             return dbResult;
         }
 
         public List<OrderModel> GetOrdersOpen(int PlantId)
         {
-            var dbResult = dbCtx
+            List<OrderModel> dbResult = new List<OrderModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetOrders
                 .Where(x => (x.PlantId == PlantId || PlantId == 0) && (x.DtExecStart < x.DtOrder))
                 .Include(p => p.Plant)
@@ -216,17 +154,20 @@ namespace GWMS.Data.Controllers
                 .Include(t => t.Transporter)
                 .OrderByDescending(x => x.DtOrder)
                 .ToList();
-
+            }
             return dbResult;
         }
 
         public PlantDetailModel GetPlant(int PlantId)
         {
-            var dbResult = dbCtx
+            PlantDetailModel dbResult = new PlantDetailModel();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetPlant
                 .Where(x => x.PlantId == PlantId)
                 .FirstOrDefault();
-
+            }
             return dbResult;
         }
 
@@ -239,31 +180,133 @@ namespace GWMS.Data.Controllers
         /// <returns></returns>
         public List<PlantLogModel> GetPlantLog(int PlantId, DateTime DtMaxDate, int numRec)
         {
-            var dbResult = dbCtx
+            List<PlantLogModel> dbResult = new List<PlantLogModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetPlantLog
                 .Where(x => (x.PlantId == PlantId || PlantId == 0) && x.DtEvent <= DtMaxDate)
                 .OrderByDescending(x => x.DtEvent)
                 .Take(numRec)
                 .ToList();
+            }
+            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
+            List<PlantDetailModel> dbResult = new List<PlantDetailModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetPlant
                 .ToList();
-
+            }
             return dbResult;
         }
 
         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();
 
@@ -282,46 +325,58 @@ namespace GWMS.Data.Controllers
         /// <returns></returns>
         public List<RebootLogModel> GetRebootLog(int maxNum = 100)
         {
-            if (maxNum == 0)
+            List<RebootLogModel> dbResult = new List<RebootLogModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                maxNum = dbCtx.DbRebootLog.Count();
+                if (maxNum == 0)
+                {
+                    maxNum = localDbCtx.DbRebootLog.Count();
+                }
+                dbResult = localDbCtx
+                    .DbRebootLog
+                    .OrderByDescending(x => x.DtEvent)
+                    .Take(maxNum)
+                    .ToList();
             }
-            var dbResult = dbCtx
-                .DbRebootLog
-                .OrderByDescending(x => x.DtEvent)
-                .Take(maxNum)
-                .ToList();
-
             return dbResult;
         }
 
         public List<SupplierModel> GetSuppliers()
         {
-            var dbResult = dbCtx
+            List<SupplierModel> dbResult = new List<SupplierModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetSupplier
                 .ToList();
-
+            }
             return dbResult;
         }
 
         public List<TransporterModel> GetTransporters()
         {
-            var dbResult = dbCtx
+            List<TransporterModel> dbResult = new List<TransporterModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetTransporter
                 .ToList();
-
+            }
             return dbResult;
         }
 
         public List<UserModel> GetUsersFilt(UserLevel UsrLvl, int PlantId, int SupplierId, int TransporterId)
         {
-            var dbResult = dbCtx
+            List<UserModel> dbResult = new List<UserModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                dbResult = localDbCtx
                 .DbSetUser
                 .Where(x => (x.Livello == UsrLvl || UsrLvl == UserLevel.ND) && (x.MaskPlantId == PlantId || PlantId == 0) && (x.MaskSupplierId == SupplierId || SupplierId == 0) && (x.MaskTranspId == TransporterId || TransporterId == 0))
                 .OrderBy(x => x.Livello)
                 .ThenBy(x => x.UserName)
                 .ToList();
-
+            }
             return dbResult;
         }
 
@@ -330,7 +385,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)
@@ -343,15 +398,18 @@ namespace GWMS.Data.Controllers
         public bool HasPlantLog()
         {
             bool answ = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                var numRecord = dbCtx
-                    .DbSetPlantLog
-                    .Count();
-                answ = numRecord > 0;
+                try
+                {
+                    var numRecord = localDbCtx
+                        .DbSetPlantLog
+                        .Count();
+                    answ = numRecord > 0;
+                }
+                catch
+                { }
             }
-            catch
-            { }
             return answ;
         }
 
@@ -363,19 +421,28 @@ namespace GWMS.Data.Controllers
         public bool OrderDelete(OrderModel Item2Del)
         {
             bool done = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                if (Item2Del != null)
+                try
                 {
-                    dbCtx
-                        .DbSetOrders
-                        .Remove(Item2Del);
-                    dbCtx.SaveChanges();
-                    done = true;
+                    if (Item2Del != null)
+                    {
+                        var rec2del = localDbCtx
+                                        .DbSetOrders
+                                        .Where(x => x.OrderId == Item2Del.OrderId)
+                                        .FirstOrDefault();
+                        localDbCtx
+                            .DbSetOrders
+                            .Remove(rec2del);
+                        localDbCtx.SaveChanges();
+                        done = true;
+                    }
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione in OrderDelete:{Environment.NewLine}{exc}");
                 }
             }
-            catch (Exception exc)
-            { }
             return done;
         }
 
@@ -387,16 +454,19 @@ namespace GWMS.Data.Controllers
         public bool OrderInsert(List<OrderModel> newItems)
         {
             bool done = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                dbCtx
-                    .DbSetOrders
-                    .AddRange(newItems);
-                dbCtx.SaveChanges();
-                done = true;
+                try
+                {
+                    localDbCtx
+                        .DbSetOrders
+                        .AddRange(newItems);
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                { }
             }
-            catch (Exception exc)
-            { }
             return done;
         }
 
@@ -408,16 +478,16 @@ namespace GWMS.Data.Controllers
         public bool OrderUpdate(OrderModel updItem)
         {
             bool done = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                OrderModel currData = null;
-                currData = dbCtx
-                   .DbSetOrders
-                   .Where(x => x.OrderId == updItem.OrderId)
-                   .FirstOrDefault();
-                if (currData != null)
+                try
                 {
-                    using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+                    OrderModel currData = null;
+                    currData = localDbCtx
+                       .DbSetOrders
+                       .Where(x => x.OrderId == updItem.OrderId)
+                       .FirstOrDefault();
+                    if (currData != null)
                     {
                         // se ho modificato data --> cambio codice ordine!
                         if (!localDbCtx.Entry(updItem).OriginalValues["DtOrder"].Equals(localDbCtx.Entry(updItem).CurrentValues["DtOrder"]))
@@ -428,18 +498,20 @@ namespace GWMS.Data.Controllers
                         localDbCtx.Entry(updItem).State = EntityState.Modified;
                         localDbCtx.SaveChanges();
                     }
+                    else
+                    {
+                        localDbCtx
+                            .DbSetOrders
+                            .Add(updItem);
+                        localDbCtx.SaveChanges();
+                    }
+                    done = true;
                 }
-                else
+                catch (Exception exc)
                 {
-                    dbCtx
-                        .DbSetOrders
-                        .Add(updItem);
-                    dbCtx.SaveChanges();
+                    Log.Error($"Eccezione in OrderUpdate:{Environment.NewLine}{exc}");
                 }
-                done = true;
             }
-            catch (Exception exc)
-            { }
             return done;
         }
 
@@ -451,6 +523,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 +534,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 +545,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 +553,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 +561,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 +569,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 +601,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 +610,7 @@ namespace GWMS.Data.Controllers
                 // popolo valolri
                 answ = new PlantDTO()
                 {
+                    LastUpdate = lastRec,
                     PlantId = PlantId,
                     PlantCode = currPlant.PlantCode,
                     PlantDesc = currPlant.PlantDesc,
@@ -557,7 +633,10 @@ namespace GWMS.Data.Controllers
         /// <returns></returns>
         public List<PlantLogModel> PlantLogGetLastByFlux(int PlantId)
         {
-            List<PlantLogModel> lastRec = dbCtx
+            List<PlantLogModel> lastRec = new List<PlantLogModel>();
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                lastRec = localDbCtx
                            .DbSetPlantLog
                            .Where(x => x.PlantId == PlantId)
                            .OrderByDescending(o => o.DtEvent)
@@ -566,6 +645,7 @@ namespace GWMS.Data.Controllers
                            .GroupBy(g => g.FluxType)
                            .Select(s => s.First())
                            .ToList();
+            }
             return lastRec;
         }
 
@@ -577,67 +657,79 @@ namespace GWMS.Data.Controllers
         public bool PlantLogInsertNew(List<PlantLogModel> newItems)
         {
             bool fatto = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                dbCtx
-                .DbSetPlantLog
-                .AddRange(newItems);
-                dbCtx.SaveChanges();
-                fatto = true;
+                try
+                {
+                    localDbCtx
+                    .DbSetPlantLog
+                    .AddRange(newItems);
+                    localDbCtx.SaveChanges();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante PlantLogInsertNew per {newItems.Count} rec{Environment.NewLine}{exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Log.Error(exc, $"Eccezione durante PlantLogInsertNew per {newItems.Count} rec");
-            }
-
             return fatto;
         }
 
+        /// <summary>
+        /// Aggiorna un Plant
+        /// </summary>
+        /// <param name="updItem"></param>
+        /// <returns></returns>
+        public bool PlantUpdate(PlantDTO updItem)
+        {
+            bool done = false;
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
+            {
+                try
+                {
+                    PlantDetailModel currData = localDbCtx
+                       .DbSetPlant
+                       .Where(x => x.PlantId == updItem.PlantId)
+                       .FirstOrDefault();
+                    if (currData != null)
+                    {
+                        // aggiorno valori
+                        currData.LevelReorder = updItem.LevelReorder;
+                        currData.LevelMax = updItem.LevelMax;
+                        localDbCtx.Entry(currData).State = EntityState.Modified;
+                        localDbCtx.SaveChanges();
+                    }
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione in PlantUpdate:{Environment.NewLine}{exc}");
+                }
+            }
+            return done;
+        }
+
         public bool RecordRebootLog(RebootLogModel newItem)
         {
             bool done = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                dbCtx
-                    .DbRebootLog
-                    .Add(newItem);
-                dbCtx.SaveChanges();
-                done = true;
+                try
+                {
+                    localDbCtx
+                        .DbRebootLog
+                        .Add(newItem);
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante RecordRebootLog{Environment.NewLine}{exc}");
+                }
             }
-            catch (Exception exc)
-            { }
             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);
-        }
-
         /// <summary>
         /// Annulla modifiche su una specifica entity (cancel update)
         /// </summary>
@@ -646,16 +738,19 @@ namespace GWMS.Data.Controllers
         public bool rollBackEntity(object item)
         {
             bool answ = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                if (dbCtx.Entry(item).State == EntityState.Deleted || dbCtx.Entry(item).State == EntityState.Modified)
+                try
                 {
-                    dbCtx.Entry(item).Reload();
+                    if (localDbCtx.Entry(item).State == EntityState.Deleted || localDbCtx.Entry(item).State == EntityState.Modified)
+                    {
+                        localDbCtx.Entry(item).Reload();
+                    }
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}");
                 }
-            }
-            catch (Exception exc)
-            {
-                Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}");
             }
             return answ;
         }
@@ -668,27 +763,32 @@ namespace GWMS.Data.Controllers
         public bool UserUpdate(UserModel updItem)
         {
             bool done = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                var currData = dbCtx
-                    .DbSetUser
-                    .Where(x => x.UserId == updItem.UserId)
-                    .FirstOrDefault();
-                if (currData != null)
+                try
                 {
-                    dbCtx.Entry(updItem).State = EntityState.Modified;
-                }
-                else
-                {
-                    dbCtx
+                    var currData = localDbCtx
                         .DbSetUser
-                        .Add(updItem);
+                        .Where(x => x.UserId == updItem.UserId)
+                        .FirstOrDefault();
+                    if (currData != null)
+                    {
+                        localDbCtx.Entry(updItem).State = EntityState.Modified;
+                    }
+                    else
+                    {
+                        localDbCtx
+                            .DbSetUser
+                            .Add(updItem);
+                    }
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante UserUpdate{Environment.NewLine}{exc}");
                 }
-                dbCtx.SaveChanges();
-                done = true;
             }
-            catch (Exception exc)
-            { }
             return done;
         }
 
@@ -700,18 +800,23 @@ namespace GWMS.Data.Controllers
         public bool WeekPlanDelete(WeekPlanModel selRecord)
         {
             bool done = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                var item2del = dbCtx
-                    .DbSetPlantSupplWeekPlan
-                    .Where(x => x.WeekPlanId == selRecord.WeekPlanId)
-                    .FirstOrDefault();
-                dbCtx.DbSetPlantSupplWeekPlan.Remove(item2del);
-                dbCtx.SaveChanges();
-                done = true;
+                try
+                {
+                    var item2del = localDbCtx
+                        .DbSetPlantSupplWeekPlan
+                        .Where(x => x.WeekPlanId == selRecord.WeekPlanId)
+                        .FirstOrDefault();
+                    localDbCtx.DbSetPlantSupplWeekPlan.Remove(item2del);
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante WeekPlanDelete{Environment.NewLine}{exc}");
+                }
             }
-            catch (Exception exc)
-            { }
             return done;
         }
 
@@ -723,27 +828,39 @@ namespace GWMS.Data.Controllers
         public bool WeekPlanUpdate(WeekPlanModel updItem)
         {
             bool done = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                var currData = dbCtx
-                    .DbSetPlantSupplWeekPlan
-                    .Where(x => x.WeekPlanId == updItem.WeekPlanId)
-                    .FirstOrDefault();
-                if (currData != null)
+                try
                 {
-                    dbCtx.Entry(updItem).State = EntityState.Modified;
-                }
-                else
-                {
-                    dbCtx
+                    var currData = localDbCtx
                         .DbSetPlantSupplWeekPlan
-                        .Add(updItem);
+                        .Where(x => x.WeekPlanId == updItem.WeekPlanId)
+                        .FirstOrDefault();
+                    if (currData != null)
+                    {
+                        currData.DayNum = updItem.DayNum;
+                        currData.DeliveryHour = updItem.DeliveryHour;
+                        currData.Note = updItem.Note;
+                        currData.PlantId = updItem.PlantId;
+                        currData.SupplierId = updItem.SupplierId;
+                        currData.TransporterId = updItem.TransporterId;
+
+                        localDbCtx.Entry(currData).State = EntityState.Modified;
+                    }
+                    else
+                    {
+                        localDbCtx
+                            .DbSetPlantSupplWeekPlan
+                            .Add(updItem);
+                    }
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Log.Error($"Eccezione durante WeekPlanUpdate{Environment.NewLine}{exc}");
                 }
-                dbCtx.SaveChanges();
-                done = true;
             }
-            catch (Exception exc)
-            { }
             return done;
         }
 

GWMS.Data/DTO/LevelSummaryDTO.cs

@@ -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
+    }
+}

GWMS.Data/DTO/PlantDTO.cs

@@ -14,16 +14,17 @@ 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;
         public double LevelReorder { get; set; } = 0;
         public double OrderQtyStd { get; set; } = 0;
-        
+
 
         public int LevelRatio
         {
@@ -36,6 +37,21 @@ namespace GWMS.Data.DTO
             }
         }
 
+        public double ReorderRatio
+        {
+            get
+            {
+                double answ = 0;
+                double denom = LevelMax == 0 ? 1 : LevelMax;
+                answ = Math.Round((double)(LevelReorder * 100 / denom), 2);
+                return answ;
+            }
+            set
+            {
+                LevelReorder = value * LevelMax / 100;
+            }
+        }
+
         public List<TSData> LevelTS { get; set; } = new List<TSData>();
 
         public List<TSData> OrderTS { get; set; } = new List<TSData>();

GWMS.Data/GWMS.Data.csproj

@@ -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>

GWMS.Data/GWMSContext.cs

@@ -28,13 +28,6 @@ namespace GWMS.Data
         public GWMSContext(IConfiguration configuration)
         {
             _configuration = configuration;
-            try
-            {
-                // se non ci fosse... crea o migra!
-                Database.Migrate();
-            }
-            catch (Exception exc)
-            { }
         }
 
         public GWMSContext(DbContextOptions<GWMSContext> options) : base(options)
@@ -45,7 +38,9 @@ namespace GWMS.Data
                 Database.Migrate();
             }
             catch (Exception exc)
-            { }
+            {
+                Log.Error(exc, "Exception during context initialization 02");
+            }
         }
 
         #endregion Public Constructors
@@ -53,19 +48,29 @@ namespace GWMS.Data
         #region Public Properties
 
         public virtual DbSet<RebootLogModel> DbRebootLog { get; set; }
+
         public virtual DbSet<ConfigModel> DbSetConfig { get; set; }
 
         public virtual DbSet<ItemModel> DbSetItems { get; set; }
 
         public virtual DbSet<AnKeyValModel> DbSetKeyVal { get; set; }
+
         public virtual DbSet<ListValModel> DbSetListVal { get; set; }
+
         public virtual DbSet<OrderModel> DbSetOrders { get; set; }
+
         public virtual DbSet<PlantDetailModel> DbSetPlant { get; set; }
+
         public virtual DbSet<PlantLogModel> DbSetPlantLog { get; set; }
+
         public virtual DbSet<PlantStatusModel> DbSetPlantStatus { get; set; }
+
         public virtual DbSet<WeekPlanModel> DbSetPlantSupplWeekPlan { get; set; }
+
         public virtual DbSet<SupplierModel> DbSetSupplier { get; set; }
+
         public virtual DbSet<TransporterModel> DbSetTransporter { get; set; }
+
         public virtual DbSet<UserModel> DbSetUser { get; set; }
 
         #endregion Public Properties
@@ -129,5 +134,23 @@ namespace GWMS.Data
         }
 
         #endregion Protected Methods
+
+        #region Public Methods
+
+        public void DbForceMigrate()
+        {
+            try
+            {
+                // se non ci fosse... crea o migra!
+                Database.Migrate();
+                Log.Info("DbForceMigrate: done!");
+            }
+            catch (Exception exc)
+            {
+                Log.Error(exc, "DbForceMigrate: Exception during context initialization 01");
+            }
+        }
+
+        #endregion Public Methods
     }
 }

GWMS.UI/App.razor.bak

@@ -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>

GWMS.UI/Components/CmpFooter.razor

@@ -1,4 +1,4 @@
-<div class="row px-1 text-light">
+<div class="form-row text-light">
     <div class="col-5 pr-0 text-left">
         GWMS <span class="small">v.@version</span>
     </div>

GWMS.UI/Components/CmpTop.razor

@@ -6,14 +6,14 @@
 @inject MessageService AppMessages
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
-<div class="row pt-3">
-    <div class="col-6 col-sm-6 col-lg-4 col-xl-3">
+<div class="form-row pt-3">
+    <div class="col-7 col-md-6 col-lg-4 col-xl-3">
         <LoginDisplay></LoginDisplay>
     </div>
     <div class="col-12 col-lg-4 col-xl-6 d-none d-lg-block text-center h4 text-truncate">
         <span class="@PageIcon" aria-hidden="true"></span> @PageName
     </div>
-    <div class="col-6 col-sm-6 col-lg-4 col-xl-3 text-right">
+    <div class="col-5 col-md-6 col-lg-4 col-xl-3 text-right">
         @if (ShowSearch)
         {
             <SearchMod></SearchMod>

GWMS.UI/Components/LoginDisplay.razor

@@ -8,8 +8,13 @@
             <div class="input-group-prepend">
                 <a title="LogOut" href="Identity/Account/LogOut" class="btn btn-sm btn-danger"><i class="fas fa-sign-out-alt"></i></a>
             </div>
-            <a title="Manage" href="Identity/Account/Manage" class="btn btn-sm btn-outline-dark mx-0 px-1">
-                <i class="fas fa-user-alt"></i>&nbsp;@userName.Substring(0, 10)&nbsp;...
+            <a title="Gestione account @userName" href="Identity/Account/Manage" class="btn btn-sm btn-outline-dark mx-0 px-1">
+                <div class="d-none d-sm-block">
+                    <i class="fas fa-user-alt"></i> @StringLim(userName, 30)
+                </div>
+                <div class="d-block d-sm-none">
+                    <i class="fas fa-user-alt"></i> @StringLim(userName, 15)
+                </div>
             </a>
         </div>
     </Authorized>
@@ -48,4 +53,9 @@
         }
     }
 
+    protected string StringLim(string original, int maxLen)
+    {
+        return original.Length <= maxLen ? original : $"{original.Substring(0, maxLen - 3)}...";
+    }
+
 }

GWMS.UI/Components/OrderAdminEditor.razor

@@ -20,7 +20,8 @@
             <DataAnnotationsValidator />
             <div class="row">
                 <div class="col-12 col-lg-1">
-                    <img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />
+                    <div id="qrCodeImg"></div>
+                    @*<img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />*@
                 </div>
                 <div class="col-12 col-lg-9 align-items-center">
                     <div class="row">
@@ -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;
+    //}
 
 }

GWMS.UI/Components/OrderSupplierEditor.razor

@@ -8,6 +8,7 @@
 @inject MessageService AppMService
 @inject GWMSDataService DataService
 @inject IConfiguration Configuration
+@inject IJSRuntime JSRuntime
 
 <div class="card">
     <div class="card-header bg-info text-light">
@@ -17,10 +18,11 @@
         <EditForm Model="@_currItem">
             <DataAnnotationsValidator />
             <div class="row">
-                <div class="col-12 col-lg-2">
-                    <img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />
+                <div class="col-12 col-lg-1">
+                    <div id="qrCodeImg"></div>
+                    @*<img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />*@
                 </div>
-                <div class="col-12 col-lg-8 align-items-center">
+                <div class="col-12 col-lg-9 align-items-center">
                     <div class="row">
                         <div class="col-8">
                             <div class="input-group">
@@ -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;
+    //}
 
 }

GWMS.UI/Components/OrderTranspEditor.razor

@@ -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;
+    //}
 
 }

GWMS.UI/Components/PlantEditor.razor

@@ -0,0 +1,79 @@
+@using Blazorise
+@using GWMS.UI.Components
+@using Microsoft.AspNetCore.Components.Authorization
+@using GWMS.UI.Data
+@using Microsoft.Extensions.Configuration
+@using Microsoft.AspNetCore.Components.Authorization
+
+<div class="card">
+    <div class="card-header bg-info text-light">
+        <b>Modifica</b>
+    </div>
+    <div class="card-body small p-1">
+        <EditForm Model="@_currItem">
+            <DataAnnotationsValidator />
+            <div class="row">
+                <div class="col-12 col-lg-10 align-items-center">
+                    <div class="row">
+                        <div class="col-3">
+                            <h3>@_currItem.PlantCode</h3>
+                        </div>
+                        <div class="col-9 text-right">
+                            <b>@_currItem.PlantDesc</b>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text">
+                                        Livello Riordino
+                                    </span>
+                                </div>
+                                <InputNumber @bind-Value="@_currItem.LevelReorder" class="form-control text-right"></InputNumber>
+                                <div class="input-group-append">
+                                    <span class="input-group-text" title="Livello Riordino kg">kg</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text">
+                                        Riordino
+                                    </span>
+                                </div>
+                                <InputNumber @bind-Value="@_currItem.ReorderRatio" class="form-control text-right"></InputNumber>
+                                <div class="input-group-append">
+                                    <span class="input-group-text" title="% Riordino">%</span>
+                                </div>
+                            </div>
+                        </div>
+                        @if (editAll)
+                        {
+                            <div class="col">
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text">
+                                            Capacità Massima
+                                        </span>
+                                    </div>
+                                    <InputNumber @bind-Value="@_currItem.LevelMax" class="form-control text-right"></InputNumber>
+                                    <div class="input-group-append">
+                                        <span class="input-group-text" title="Capacità Massima">kg</span>
+                                    </div>
+                                </div>
+                            </div>
+                        }
+                    </div>
+                </div>
+                <div class="col-12 col-lg-2">
+                    <button type="button" class="btn btn-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel <i class="fas fa-ban"></i></button>
+                    <div class="mt-2">
+                        <button type="button" class="btn btn-success btn-block" value="Save" @onclick="saveUpdate">Save <i class="far fa-save"></i></button>
+                    </div>
+                </div>
+            </div>
+        </EditForm>
+    </div>
+</div>

GWMS.UI/Components/PlantEditor.razor.cs

@@ -0,0 +1,121 @@
+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;
+using Microsoft.JSInterop;
+using Microsoft.AspNetCore.Identity;
+
+namespace GWMS.UI.Components
+{
+    public partial class PlantEditor
+    {
+        #region Protected Fields
+
+        protected PlantDTO _currItem = new PlantDTO();
+
+        #endregion Protected Fields
+
+        #region Private Properties
+
+        [Inject]
+        private IConfiguration Configuration { get; set; }
+
+        [Inject]
+        private IJSRuntime JSRuntime { get; set; }
+
+        [Inject]
+        private NavigationManager NavManager { get; set; }
+
+        #endregion Private Properties
+
+        #region Protected Properties
+
+        [Inject]
+        protected UserManager<IdentityUser> _UserManager { get; set; }
+
+        [Inject]
+        protected GWMSDataService DataService { get; set; }
+
+        protected bool editAll
+        {
+            get
+            {
+                bool answ = false;
+                var currMode = GetQueryParm("currMode");
+                if (!string.IsNullOrEmpty(currMode))
+                {
+                    answ = currMode.Equals("debug");
+                }
+                return answ;
+            }
+        }
+
+        [Inject]
+        protected MessageService MessageService { get; set; }
+
+        #endregion Protected Properties
+
+        #region Public Properties
+
+        [Parameter]
+        public PlantDTO currItem
+        {
+            get
+            {
+                return _currItem;
+            }
+            set
+            {
+                _currItem = value;
+            }
+        }
+
+        [Parameter]
+        public EventCallback<int> DataReset { get; set; }
+
+        [Parameter]
+        public EventCallback<int> DataUpdated { get; set; }
+
+        #endregion Public Properties
+
+        #region Private Methods
+
+        private async Task cancelUpdate()
+        {
+            await DataReset.InvokeAsync(0);
+        }
+
+        private async Task saveUpdate()
+        {
+            if (_currItem != null)
+            {
+                await DataService.PlantUpdate(_currItem);
+                await DataUpdated.InvokeAsync(0);
+            }
+            else
+            {
+                Console.WriteLine("Order null!");
+            }
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        // Blazor: get query parm from the URL
+        protected string GetQueryParm(string parmName)
+        {
+            var uriBuilder = new UriBuilder(NavManager.Uri);
+            var q = System.Web.HttpUtility.ParseQueryString(uriBuilder.Query);
+            return q[parmName] ?? "";
+        }
+
+        #endregion Protected Methods
+    }
+}

GWMS.UI/Components/PlantOverview.razor

@@ -6,11 +6,13 @@
         @if (currItem != null)
         {
             <div class="row py-0">
-                <div class="col-5 pr-0 font-weight-bold">
+                <div class="col-8 pr-0 font-weight-bold">
                     <h2>@currItem.PlantCode</h2>
                 </div>
-                <div class="col-7 text-right">
-                    <h4>@currItem.PlantDesc</h4>
+                <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>
         }
@@ -31,7 +33,7 @@
                             <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 active d-flex justify-content-between align-items-center py-1">PB Media</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>
@@ -46,31 +48,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>

GWMS.UI/Components/PlantOverview.razor.cs

@@ -7,10 +7,11 @@ 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 PlantDetail
+    public partial class PlantOverview
     {
         #region Protected Fields
 
@@ -41,7 +42,7 @@ namespace GWMS.UI.Components
                         //text    = "Kg",
                         ticks = new {
                             suggestedMin = 0,
-                            suggestedMax = 10000
+                            suggestedMax = 30000
                         }
                     }
                 }
@@ -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; }
 
@@ -83,17 +87,17 @@ namespace GWMS.UI.Components
             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;
                 }
             }
         }
@@ -103,15 +107,20 @@ namespace GWMS.UI.Components
         #region Protected Properties
 
         [Inject]
-        protected GWMSDataService DataService { get; set; }
+        protected MessageService AppMService { get; set; }
 
         [Inject]
-        protected MessageService MessageService { get; set; }
+        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
         {
@@ -127,13 +136,32 @@ 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
+            {
+                string answ = "";
+                int TimeoutOffline = 5;
+                int.TryParse(Configuration["TimeoutOffline"], out TimeoutOffline);
+                answ = DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > TimeoutOffline ? "text-secondary" : "active";
+                return answ;
+            }
+        }
+
+        public string playStatus
+        {
+            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? "text-danger" : "text-success";
+        }
+
         #endregion Public Properties
 
         #region Private Methods
@@ -144,13 +172,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;
         }
 
@@ -216,6 +244,13 @@ namespace GWMS.UI.Components
             }
         }
 
+        protected void ShowDetail(int currPlantId)
+        {
+            SelPlantId = currPlantId;
+            // rimando...
+            NavManager.NavigateTo($"PlantAnalisys");
+        }
+
         protected void ShowOrders(int currPlantId)
         {
             SelPlantId = currPlantId;

GWMS.UI/Components/SetupDiagnostics.razor

@@ -90,7 +90,7 @@
     protected async Task ReloadData()
     {
         var resultUser = await Health.Checks.DbUserApp(DbConfig.DATABASE_NAME);
-        var resultLog = await Health.Checks.DbPlantLogTable(DbConfig.DATABASE_NAME);
+        var resultLog = await Health.Checks.DbPlantTable(DbConfig.DATABASE_NAME);
         var resultIden = await Health.Checks.DbIdentity(DbConfig.DATABASE_NAME);
         DbUserTableOk = (resultUser.Status == HealthStatus.Healthy);
         DbLogOk = (resultLog.Status == HealthStatus.Healthy);

GWMS.UI/Components/SetupSim.razor

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

GWMS.UI/Controllers/IOBController.cs

@@ -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,12 +114,13 @@ 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();
             if (fatto)
             {
-                return "Ok";
+                return "OK";
             }
             else
             {
@@ -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)
@@ -283,7 +302,7 @@ namespace GWMS.UI.Controllers
 
             if (fatto)
             {
-                return "Ok";
+                return "OK";
             }
             else
             {
@@ -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))
@@ -310,16 +330,19 @@ namespace GWMS.UI.Controllers
                 {
                     // conversione dati
                     List<PlantLogModel> plData = rawData.fluxData.Select(jpl => _DataService.convertFluxToPL(currPlant.PlantId, jpl)).ToList();
+                    Log.Trace($"flogJson | {id} | Convertiti {plData.Count} record");
                     //insert!
                     fatto = await _DataService.PlantLogInsert(plData);
+                    Log.Trace($"flogJson | {id} | PlantLogInsert --> esito: {fatto}");
 
                     // effettuo SEMPRE verifica per ricalcolo ordini...
                     await _DataService.checkLevels();
+                    Log.Trace($"flogJson | {id} | chiamata checkLevels");
                 }
             }
             if (fatto)
             {
-                return "Ok";
+                return "OK";
             }
             else
             {
@@ -338,6 +361,7 @@ namespace GWMS.UI.Controllers
         [HttpPost("forceSplitOdl/{id}")]
         public string forceSplitOdl(string id)
         {
+            //Log.Debug($"Chiamata forceSplitOdl | {id}");
             return "OK";
         }
 
@@ -356,6 +380,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 +393,7 @@ namespace GWMS.UI.Controllers
         [HttpGet]
         public string Get()
         {
+            //Log.Debug("Chiamata Get");
             return "OK";
         }
 
@@ -381,6 +407,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("{id}")]
         public string Get(int id)
         {
+            //Log.Debug($"Chiamata Get | {id}");
             return "OK";
         }
 
@@ -395,6 +422,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getCounter/{id}")]
         public string getCounter(string id)
         {
+            //Log.Debug($"Chiamata getCounter | {id}");
             return "0";
         }
 
@@ -409,6 +437,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getCounterTCRec/{id}")]
         public string getCounterTCRec(string id)
         {
+            //Log.Debug($"Chiamata getCounterTCRec | {id}");
             return "0";
         }
 
@@ -423,6 +452,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getCurrData/{id}")]
         public string getCurrData(string id)
         {
+            //Log.Debug($"Chiamata getCurrData | {id}");
             return $"{id}";
         }
 
@@ -437,6 +467,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getCurrODL/{id}")]
         public string getCurrODL(string id)
         {
+            //Log.Debug($"Chiamata getCurrODL | {id}");
             return "1";
         }
 
@@ -449,6 +480,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getCurrOdlRow/{id}")]
         public string getCurrOdlRow(string id)
         {
+            //Log.Debug($"Chiamata getCurrOdlRow | {id}");
             return "";
         }
 
@@ -461,6 +493,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getCurrOdlStart/{id}")]
         public string getCurrOdlStart(string id)
         {
+            //Log.Debug($"Chiamata getCurrOdlStart | {id}");
             return $"{DateTime.Now}";
         }
 
@@ -473,6 +506,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getCurrStatoRow/{id}")]
         public string getCurrStatoRow(string id)
         {
+            //Log.Debug($"Chiamata getCurrStatoRow | {id}");
             return "";
         }
 
@@ -485,6 +519,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getFiles/{id}")]
         public string getFiles(string id)
         {
+            //Log.Debug($"Chiamata getFiles | {id}");
             return "";
         }
 
@@ -497,6 +532,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getIdlePeriod/{id}")]
         public int getIdlePeriod(string id)
         {
+            //Log.Debug($"Chiamata getIdlePeriod | {id}");
             return 0;
         }
 
@@ -508,6 +544,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getIob2call/{id}")]
         public string getIob2call(string id)
         {
+            //Log.Debug($"Chiamata getIob2call | {id}");
             return "";
         }
 
@@ -519,6 +556,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getM2IOB/{id}")]
         public string getM2IOB(string id)
         {
+            //Log.Debug($"Chiamata getM2IOB | {id}");
             return "";
         }
 
@@ -531,6 +569,7 @@ namespace GWMS.UI.Controllers
         [HttpGet("getObjItems/{id}")]
         public string getObjItems(string id)
         {
+            //Log.Debug($"Chiamata getObjItems | {id}");
             return "";
         }
 
@@ -545,6 +584,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 +616,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 +628,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 +648,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 +735,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 +791,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 +940,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 +983,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 +1136,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 +1175,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 +1203,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 +1233,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...

GWMS.UI/Controllers/PlantDataController.cs

@@ -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

GWMS.UI/Controllers/PlantLogController.cs

@@ -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

GWMS.UI/Data/GWMSDataService.cs

@@ -19,7 +19,7 @@ using System.Globalization;
 
 namespace GWMS.UI.Data
 {
-    public class GWMSDataService
+    public class GWMSDataService : IDisposable
     {
         #region Private Fields
 
@@ -73,9 +73,6 @@ namespace GWMS.UI.Data
             else
             {
                 dbController = new GWMS.Data.Controllers.GWMSController(configuration);
-                StringBuilder sb = new StringBuilder();
-                sb.AppendLine($"DbController OK");
-                _logger.LogInformation(sb.ToString());
             }
         }
 
@@ -97,6 +94,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 +119,7 @@ namespace GWMS.UI.Data
                 if (lastLev != null)
                 {
                     currDto.LevelAct = lastLev.ValNumber;
+                    currDto.LastUpdate = adesso;
                 }
 
                 // verifico SE c'è MainPress
@@ -252,20 +251,6 @@ namespace GWMS.UI.Data
             return answ;
         }
 
-        /// <summary>
-        /// invalida tutta la cache in caso di update
-        /// </summary>
-        /// <returns></returns>
-        protected async void invalidateAllCache()
-        {
-            await distributedCache.RemoveAsync("DATA:CONFIG");
-            await distributedCache.RemoveAsync("DATA:CHECKLEVEL");
-            await distributedCache.RemoveAsync("DATA:PLANTS:ListDTO");
-            await distributedCache.RemoveAsync("DATA:SUPPL:List");
-            await distributedCache.RemoveAsync("DATA:TRANSP:List");
-            await distributedCache.RemoveAsync("DATA:WEEKPLAN:List");
-        }
-
         protected async Task<List<PlantLogModel>> PlantLogGetLastByFlux(int PlantId)
         {
             List<PlantLogModel> lastValues = new List<PlantLogModel>();
@@ -289,7 +274,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 +354,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,11 +379,36 @@ namespace GWMS.UI.Data
             return answ;
         }
 
+        public async Task<bool> DbForceMigrate()
+        {
+            return await Task.FromResult(dbController.DbForceMigrate());
+        }
+
+        public void Dispose()
+        {
+            // Clear database controller
+            dbController.Dispose();
+        }
+
         public async Task<bool> HasPlantLog()
         {
             return await Task.FromResult(dbController.HasPlantLog());
         }
 
+        /// <summary>
+        /// invalida tutta la cache in caso di update
+        /// </summary>
+        /// <returns></returns>
+        public async Task InvalidateAllCache()
+        {
+            await distributedCache.RemoveAsync("DATA:CONFIG");
+            await distributedCache.RemoveAsync("DATA:CHECKLEVEL");
+            await distributedCache.RemoveAsync("DATA:PLANTS:ListDTO");
+            await distributedCache.RemoveAsync("DATA:SUPPL:List");
+            await distributedCache.RemoveAsync("DATA:TRANSP:List");
+            await distributedCache.RemoveAsync("DATA:WEEKPLAN:List");
+        }
+
         public async Task<List<GWMS.Data.DatabaseModels.ItemModel>> ItemsGetAll()
         {
             //return Task.FromResult(dbController.ActionsGetAll());
@@ -421,7 +431,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 +464,19 @@ 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);
-                invalidateAllCache();
-                dbController.ResetController();
+                done = dbController.OrderDelete(currItem);
+                InvalidateAllCache();
             }
-            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 +488,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 +516,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 +535,24 @@ 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);
-                invalidateAllCache();
-                dbController.ResetController();
+                done = dbController.OrderUpdate(currItem);
+                InvalidateAllCache();
             }
-            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);
         }
@@ -571,6 +599,7 @@ namespace GWMS.UI.Data
                                         .GroupBy(g => g.FluxType)
                                         .Select(s => s.First().FluxType)
                                         .ToList();
+
             foreach (var item in fluxList)
             {
                 // cerco se c'è valore...
@@ -583,17 +612,19 @@ namespace GWMS.UI.Data
                 }
 
                 // cerco se ho record > valore minimo x ogni flusso ricevuto
-                List<PlantLogModel> insCandidates = newItems.Where(x => x.FluxType == item && x.DtEvent >= dateLimit).ToList();
+                List<PlantLogModel> insCandidates = newItems.Where(x => x.FluxType == item && x.DtEvent >= dateLimit).OrderBy(x => x.DtEvent).ToList();
 
-                while (insCandidates.Count > 0)
+                int num2ins = insCandidates.Count;
+                while (num2ins > 0)
                 {
                     var newRec = insCandidates.First();
                     // il primo lo accodo da inserire
                     item2insert.Add(newRec);
                     // calcolo nuovo veto
                     dateLimit = dbController.DateRoundEnd(newRec.DtEvent, IntervalMin);
-                    // ...e se ho record accodo
-                    insCandidates = newItems.Where(x => x.FluxType == item && x.DtEvent >= dateLimit).ToList();
+                    // ...e se ho record > data limite accodo
+                    insCandidates = newItems.Where(x => x.FluxType == item && x.DtEvent > dateLimit).OrderBy(x => x.DtEvent).ToList();
+                    num2ins = insCandidates.Count;
                 }
             }
 
@@ -606,12 +637,48 @@ namespace GWMS.UI.Data
                 // invalido i vari valori in cache
                 await distributedCache.RemoveAsync($"DATA:PLANTS:LastFlux:{PlantId}");
                 await distributedCache.RemoveAsync($"DATA:PLANTS:ListDTO");
+                Log.Trace($"PlantLogInsert | PlantId: {PlantId} | Completato insert {item2insert.Count} rec");
             }
 
             // restituisco
             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 +702,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);
         }
@@ -652,6 +719,21 @@ namespace GWMS.UI.Data
             return await Task.FromResult(answ);
         }
 
+        public async Task<bool> PlantUpdate(PlantDTO currItem)
+        {
+            bool done = false;
+            try
+            {
+                done = dbController.PlantUpdate(currItem);
+                InvalidateAllCache();
+            }
+            catch (Exception exc)
+            {
+                Log.Error($"Eccezione in OrderUpdate:{Environment.NewLine}{exc}");
+            }
+            return await Task.FromResult(done);
+        }
+
         public void RebootLogInsert(RebootLogModel newItem)
         {
             try
@@ -662,16 +744,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();
-        }
-
         public void rollBackEdit(object item)
         {
             dbController.rollBackEntity(item);
@@ -698,7 +770,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 +796,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 +810,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 +849,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);
         }
 

GWMS.UI/Data/SelectData.cs

@@ -24,9 +24,7 @@ namespace GWMS.UI.Data
         /// <returns></returns>
         public static SelectData Init(int minRound, int numDayPrev)
         {
-            TimeSpan DayElapsed = DateTime.Now.Subtract(DateTime.Today);
-            int minDay = (int)((DayElapsed.TotalMinutes / minRound) + 1) * minRound;
-            DateTime endRounded = DateTime.Today.AddMinutes(minDay);
+            DateTime endRounded = DateTime.Today.AddDays(1);
             SelectData answ = new SelectData()
             {
                 DateEnd = endRounded,

GWMS.UI/GWMS.UI.csproj

@@ -2,10 +2,18 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.2618</Version>
+    <Version>1.0.2110.0119</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="QuartzHostedService.cs" />
+    <Compile Remove="Services\BlazorTimer.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Remove="bundleconfig.json" />
   </ItemGroup>
@@ -13,6 +21,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 +39,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>

GWMS.UI/Health/Checks.cs

@@ -56,26 +56,26 @@ namespace GWMS.UI.Health
             }
         }
 
-        public static async Task<HealthCheckResult> DbPlantLogTable(string dbName)
+        public static async Task<HealthCheckResult> DbPlantTable(string dbName)
         {
             using (var appDb = new GWMSContext())
             {
                 string description = "Try check Table PlantLog";
-                List<GWMS.Data.DatabaseModels.PlantLogModel> recordList = new List<GWMS.Data.DatabaseModels.PlantLogModel>();
+                List<GWMS.Data.DatabaseModels.PlantDetailModel> recordList = new List<GWMS.Data.DatabaseModels.PlantDetailModel>();
                 var healthCheckData = new Dictionary<string, object>();
                 try
                 {
                     // provo a controllare se ho tab utenti
-                    recordList = await Task.FromResult(appDb.DbSetPlantLog.ToList()).ConfigureAwait(false);
+                    recordList = await Task.FromResult(appDb.DbSetPlant.ToList()).ConfigureAwait(false);
                     if (recordList.Count > 0)
                     {
-                        description = $"Check PlantLog table, found {recordList.Count} records";
+                        description = $"Check PlantDetail table, found {recordList.Count} records";
                         return HealthCheckResult.Healthy(description, healthCheckData);
                     }
                 }
                 catch (Exception exc)
                 {
-                    Log.Error(exc, "Errore in esecuzione DbPlantLogTable");
+                    Log.Error(exc, "Errore in esecuzione PlantDetail Table");
                 }
 
                 return HealthCheckResult.Degraded(description + $" {dbName}", null, healthCheckData);

GWMS.UI/Pages/GasStation.razor

@@ -1,5 +1,6 @@
 @page "/GasStation"
 @page "/GasStation/{OrderCode}"
+@page "/GasStationLoad/{OrderCode}"
 
 @using Blazorise.Components
 @using GWMS.UI.Components

GWMS.UI/Pages/GasStation.razor.cs

@@ -140,10 +140,10 @@ namespace GWMS.UI.Pages
         private void LocalReceivedBarcodeText(BarcodeReceivedEventArgs args)
         {
             // rimando a pagina con  codice ordine....
-            NavManager.NavigateTo($"GasStation/{args.BarcodeText}");
+            NavManager.NavigateTo($"GasStationLoad/{SelPlantId}/{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()

GWMS.UI/Pages/GasStationLoad.razor

@@ -0,0 +1,94 @@
+@page "/GasStationLoad"
+@page "/GasStationLoad/{PlantCode}/{OrderCode}"
+
+@using Blazorise.Components
+@using GWMS.UI.Components
+@using BlazorBarcodeScanner.ZXing.JS
+
+<div class="card">
+    <div class="card-header table-primary mb-0">
+        <div class="row">
+            <div class="col-12">
+                <div class="row">
+                    <div class="col-6 col-lg-8 h4">
+                        QRCode
+                    </div>
+                    <div class="col-6 col-lg-2">
+                        @if (string.IsNullOrEmpty(OrderCode))
+                        {
+                            <button class="btn btn-sm btn-block btn-info" @onclick="() => ToggleShowCam()" title="reload"><i class="fas fa-camera"></i>&nbsp;show select</button>
+                        }
+                        else
+                        {
+                            <button class="btn btn-sm btn-block btn-success" @onclick="() => ToggleBCode()" title="reload"><i class="fas fa-qrcode"></i>&nbsp;re-scan</button>
+                        }
+                    </div>
+                    <div class="col-12">
+                        <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>
+            </div>
+            <div class="col-12 text-right">
+            </div>
+        </div>
+    </div>
+    <div class="card-body p-1">
+        <div class="row small">
+            <div class="col-12 text-center">
+                <div class="form-group">
+                    @if (SelPlantId == 0)
+                    {
+                        <h2 class="alert alert-danger">Manca Stazione</h2>
+                    }
+                    else
+                    {
+                        @if (string.IsNullOrEmpty(OrderCode))
+                        {
+                            <BlazorBarcodeScanner.ZXing.JS.BarcodeReader Title=""
+                                                                         StartCameraAutomatically="true"
+                                                                         ShowStart="false"
+                                                                         ShowReset="false"
+                                                                         ShowToggleTorch="false"
+                                                                         ShowVideoDeviceList="@showCamera"
+                                                                         ShowResult="false"
+                                                                         OnBarcodeReceived="LocalReceivedBarcodeText" />
+                        }
+                        else
+                        {
+                            <OrderLoad OrderCode="@OrderCode" PlantId="@SelPlantId"></OrderLoad>
+                        }
+                    }
+                </div>
+            </div>
+        </div>
+
+        @*<p class="small">
+
+                Work IN progress, links:
+                <ul>
+                    <li>https://github.com/sabitertan/BlazorBarcodeScanner</li>
+                    <li>https://github.com/tallichet/ZXingBlazor</li>
+                    <li>https://github.com/LorsSilvermort/BlazorBarcodeReader</li>
+                    <li>https://www.bing.com/search?q=blazor+server+qrcode+scanner&qs=n&form=QBRE&sp=-1&pq=blazor+server+qrcode+scanner&sc=0-28&sk=&cvid=D827470C199B47BDB39F277EFC72A266</li>
+                </ul>
+            </p>*@
+    </div>
+    @*<div class="card-footer p-1">
+        </div>*@
+</div>

GWMS.UI/Pages/GasStationLoad.razor.cs

@@ -0,0 +1,206 @@
+using BlazorBarcodeScanner.ZXing.JS;
+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 System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace GWMS.UI.Pages
+{
+    [Authorize(Roles = "SuperAdmin, Admin, User")]
+    public partial class GasStationLoad : ComponentBase, IDisposable
+    {
+        #region Private Fields
+
+        private List<PlantDTO> PlantsList;
+
+        #endregion Private Fields
+
+        #region Protected Fields
+
+        /// <summary>
+        /// Valore PlantId filtrato da claim
+        /// </summary>
+        protected int ClaimPlantId = -1;
+
+        #endregion Protected Fields
+
+        #region Private Properties
+
+        private bool isLoading { get; set; } = false;
+
+        #endregion Private Properties
+
+        #region Protected Properties
+
+        protected string _plantCode { get; set; } = "";
+
+        [Inject]
+        protected AuthenticationStateProvider AuthenticationStateProvider { get; set; }
+
+        [Inject]
+        protected GWMSDataService DataService { get; set; }
+
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; }
+
+        [Inject]
+        protected MessageService MessageService { get; set; }
+
+        [Inject]
+        protected NavigationManager NavManager { get; set; }
+
+        protected bool showCamera { get; set; } = false;
+
+        #endregion Protected Properties
+
+        #region Public Properties
+
+        public string BarcodeText { get; set; } = "";
+
+        [Parameter]
+        public string OrderCode
+        {
+            get
+            {
+                return BarcodeText;
+            }
+            set
+            {
+                BarcodeText = $"{value}";
+            }
+        }
+
+        [Parameter]
+        public string PlantCode
+        {
+            get
+            {
+                return _plantCode;
+            }
+            set
+            {
+                _plantCode = $"{value}";
+            }
+        }
+
+        [Parameter]
+        public int SelPlantId
+        {
+            get
+            {
+                int answ = 0;
+                if (MessageService.Order_Filter != null)
+                {
+                    answ = MessageService.Order_Filter.PlantId;
+                }
+                return answ;
+            }
+            set
+            {
+                if (!MessageService.Order_Filter.PlantId.Equals(value))
+                {
+                    MessageService.Order_Filter.PlantId = value;
+                }
+            }
+        }
+
+        #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 LocalReceivedBarcodeText(BarcodeReceivedEventArgs args)
+        {
+            // rimando a pagina con  codice ordine....
+            NavManager.NavigateTo($"GasStationLoad/{SelPlantId}/{args.BarcodeText}");
+        }
+
+        private async Task ReloadAllData()
+        {
+            isLoading = true;
+            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;
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        protected override async Task OnInitializedAsync()
+        {
+            MessageService.ShowSearch = false;
+            MessageService.PageName = "Stazione";
+            MessageService.PageIcon = "fas fa-gas-pump pr-2";
+            await ReloadAllData();
+        }
+
+        protected void ResetData()
+        {
+        }
+
+        protected void ToggleBCode()
+        {
+            NavManager.NavigateTo("GasStation");
+        }
+
+        protected void ToggleShowCam()
+        {
+            showCamera = !showCamera;
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
+        public void Dispose()
+        {
+        }
+
+        #endregion Public Methods
+    }
+}

GWMS.UI/Pages/Index.razor

@@ -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>

GWMS.UI/Pages/Orders.razor

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

GWMS.UI/Pages/Orders.razor.cs

@@ -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();
         }
@@ -327,18 +322,17 @@ namespace GWMS.UI.Pages
 
         protected override async Task OnInitializedAsync()
         {
-            DataService.ResetController();
             AppMService.ShowSearch = false;
             AppMService.PageName = "Ordini";
             AppMService.PageIcon = "fas fa-file-invoice pr-2";
             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 +352,6 @@ namespace GWMS.UI.Pages
                 PlantsList = new List<PlantDTO>();
             }
             isLoading = false;
-
             await ReloadData();
         }
 
@@ -370,6 +363,7 @@ namespace GWMS.UI.Pages
 
         protected async Task ResetFilter()
         {
+            SelPlantId = 0;
             currRecord = null;
             SearchRecords = null;
             ListRecords = null;
@@ -387,7 +381,6 @@ namespace GWMS.UI.Pages
         protected async Task UpdateData()
         {
             currRecord = null;
-            DataService.ResetController();
             await ReloadData();
         }
 
@@ -417,11 +410,8 @@ namespace GWMS.UI.Pages
 
         public async void OnSeachUpdated()
         {
-            await InvokeAsync(() =>
-            {
-                Task task = UpdateData();
-                StateHasChanged();
-            });
+            await UpdateData();
+            StateHasChanged();
         }
 
         #endregion Public Methods

GWMS.UI/Pages/Parameters.razor

@@ -1,53 +0,0 @@
-@page "/Parameters"
-
-@using GWMS.UI.Data
-@using GWMS.UI.Components
-
-@inject GWMSDataService DataService
-@inject MessageService AppMService
-@inject IJSRuntime JSRuntime
-
-<div class="card">
-    <div class="card-header table-primary h3">
-        <h2>Setup Parametri</h2>
-    </div>
-    <div class="card-body">
-        <div class="row">
-            <div class="col-12">
-                @if (processRunning)
-                {
-                    <LoadingData></LoadingData>
-                }
-            </div>
-            <div class="col-12">
-                @*<SetupSim />*@
-            </div>
-        </div>
-    </div>
-</div>
-
-@code {
-
-    protected int numDays { get; set; } = 7;
-    protected int stepMin { get; set; } = 30;
-    protected int maxHourRate { get; set; } = 800;
-
-    protected bool processRunning { get; set; } = false;
-
-    protected async Task resetDB()
-    {
-        if (!await JSRuntime.InvokeAsync<bool>("confirm", "Sicuro di voler risimulare l'intero set di dati?"))
-            return;
-
-        processRunning = true;
-        DataService.RegenDB(numDays, stepMin, maxHourRate);
-        processRunning = false;
-    }
-
-    protected override async Task OnInitializedAsync()
-    {
-        AppMService.ShowSearch = false;
-        AppMService.PageName = "Setup Parametri";
-        AppMService.PageIcon = "fas fa-wrench pr-2";
-    }
-}

GWMS.UI/Pages/PlantAnalisys.razor

@@ -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>

GWMS.UI/Pages/PlantAnalisys.razor.cs

@@ -0,0 +1,434 @@
+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()
+        {
+            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;
+            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
+    }
+}

GWMS.UI/Pages/PlantSetup.razor

@@ -0,0 +1,87 @@
+@page "/PlantSetup"
+
+@using GWMS.UI.Data
+@using GWMS.UI.Components
+
+<div class="card">
+    <div class="card-header table-primary h3">
+        <h2>Dettaglio Parametri</h2>
+    </div>
+    <div class="card-body">
+        <div class="row">
+            <div class="col-12">
+                @if (currRecord != null)
+                {
+                    <PlantEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData"></PlantEditor>
+                }
+                @if (ListRecords == null)
+                {
+                    <LoadingData></LoadingData>
+                }
+                else if (totalCount == 0)
+                {
+                    <div class="alert alert-warning text-center display-4">Nessun record trovato</div>
+                }
+                else
+                {
+                    <table class="table table-sm table-striped table-responsive-lg">
+                        <thead>
+                            <tr>
+                                <th></th>
+                                <th>Codice</th>
+                                <th>Impianto</th>
+                                <th>Livello</th>
+                                <th class="text-right">Soglia Riordino</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var record in ListRecords)
+                            {
+                                <tr class="@checkSelect(@record.PlantId)">
+                                    <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>
+                                        <span>@record.PlantCode</span>
+                                    </td>
+                                    <td>
+                                        <span>@record.PlantDesc</span>
+                                    </td>
+                                    <td>
+                                        <div class="row">
+                                            <div class="col-6">
+                                                <b>@record.LevelAct.ToString("N0")</b> kg
+                                            </div>
+                                            <div class="col-6 text-right">
+                                                <span>@record.LevelMax.ToString("N0")</span>
+                                            </div>
+                                            <div class="col-12">
+                                                <Progress>
+                                                    <ProgressBar Value="@record.LevelRatio" Striped="false" Animated="false" />
+                                                </Progress>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td class="text-right">
+                                        <span>@record.ReorderRatio.ToString("N1") % = <b>@record.LevelReorder.ToString("N0")</b> kg</span>
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                }
+            </div>
+        </div>
+    </div>
+</div>

GWMS.UI/Pages/PlantSetup.razor.cs

@@ -0,0 +1,170 @@
+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 System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace GWMS.UI.Pages
+{
+    [Authorize(Roles = "SuperAdmin, Admin")]
+    public partial class PlantSetup : ComponentBase, IDisposable
+    {
+        #region Private Fields
+
+        private PlantDTO currRecord = null;
+
+        private List<PlantDTO> ListRecords;
+
+        #endregion Private Fields
+
+        #region Protected Fields
+
+        /// <summary>
+        /// Valore PlantId filtrato da claim
+        /// </summary>
+        protected int ClaimPlantId = -1;
+
+        #endregion Protected Fields
+
+        #region Protected Properties
+
+        [Inject]
+        protected MessageService AppMService { get; set; }
+
+        [Inject]
+        protected AuthenticationStateProvider AuthenticationStateProvider { get; set; }
+
+        [Inject]
+        protected GWMSDataService DataService { get; set; }
+
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; }
+
+        protected int maxHourRate { get; set; } = 800;
+        protected int numDays { get; set; } = 7;
+        protected int stepMin { get; set; } = 30;
+
+        protected int totalCount
+        {
+            get
+            {
+                int answ = 0;
+                if (ListRecords != null)
+                {
+                    answ = ListRecords.Count;
+                }
+                return answ;
+            }
+        }
+
+        #endregion Protected 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 async Task ReloadAllData()
+        {
+            ListRecords = null;
+            await GetClaimsData();
+            // se ho un plantId valido --> altrimenti non abilitato
+            if (ClaimPlantId == 0)
+            {
+                ListRecords = await DataService.PlantsGetAll();
+            }
+            else if (ClaimPlantId > 0)
+            {
+                var rawData = await DataService.PlantsGetAll();
+                ListRecords = rawData.Where(x => x.PlantId == ClaimPlantId).ToList();
+            }
+            else
+            {
+                ListRecords = new List<PlantDTO>();
+            }
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        protected void Edit(PlantDTO selRecord)
+        {
+            // rileggo dal DB il record corrente...
+            var pUpd = Task.Run(async () => currRecord = await DataService.PlantsGetByCode(selRecord.PlantCode));
+            pUpd.Wait();
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            AppMService.ShowSearch = false;
+            AppMService.PageName = "Setup Impianti";
+            AppMService.PageIcon = "fas fa-wrench pr-2";
+            await ReloadAllData();
+        }
+
+        protected void ResetData()
+        {
+            DataService.rollBackEdit(currRecord);
+            currRecord = null;
+        }
+
+        protected async Task UpdateData()
+        {
+            currRecord = null;
+            await DataService.InvalidateAllCache();
+            await ReloadAllData();
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
+        public string checkSelect(int PlantId)
+        {
+            string answ = "";
+            if (currRecord != null)
+            {
+                try
+                {
+                    answ = (currRecord.PlantId == PlantId) ? "table-info" : "";
+                }
+                catch
+                { }
+            }
+            return answ;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        #endregion Public Methods
+    }
+}

GWMS.UI/Pages/PlantStatus.razor

@@ -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>

GWMS.UI/Pages/PlantStatus.razor.cs

@@ -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

GWMS.UI/Pages/Suppliers.razor

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

GWMS.UI/Pages/Suppliers.razor.cs

@@ -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,20 @@ 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;
+            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 +311,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();
         }
 
@@ -347,16 +348,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

GWMS.UI/Pages/Test.razor

@@ -0,0 +1,31 @@
+@page "/Test"
+
+@using GWMS.UI.Components
+
+<div class="row mx-0">
+    @if (ListRecords == null)
+    {
+        <div class="col-12">
+            <LoadingData></LoadingData>
+        </div>
+    }
+    else if (totalCount == 0)
+    {
+        <div class="col-12">
+            <div class="alert alert-warning text-center display-4">Nessun record trovato</div>
+        </div>
+    }
+    else
+    {
+        <div class="col-12">
+            <div class="row">
+                @foreach (var record in ListRecords)
+                {
+                    <div class="col-12 col-xl-6 py-2">
+                        <PlantOverview currItem="@record"></PlantOverview>
+                    </div>
+                }
+            </div>
+        </div>
+    }
+</div>

GWMS.UI/Pages/Test.razor.cs

@@ -0,0 +1,147 @@
+using GWMS.Data.DTO;
+using GWMS.UI.Data;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using Microsoft.JSInterop;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace GWMS.UI.Pages
+{
+    [AllowAnonymous]
+    public partial class Test : ComponentBase, IDisposable
+    {
+        #region Private Fields
+
+        private PlantDTO currRecord = null;
+
+        private List<PlantDTO> ListRecords;
+
+        #endregion Private Fields
+
+        #region Protected Fields
+
+        /// <summary>
+        /// Valore PlantId filtrato da claim
+        /// </summary>
+        protected int ClaimPlantId = -1;
+
+        #endregion Protected Fields
+
+        #region Private Properties
+
+        private bool isLoading { get; set; } = false;
+
+        private bool ShowCharts { get; set; } = false;
+
+        #endregion Private Properties
+
+        #region Protected Properties
+
+        [Inject]
+        protected GWMSDataService DataService { get; set; }
+
+        [Inject]
+        protected IJSRuntime JSRuntime { get; set; }
+
+        [Inject]
+        protected MessageService MessageService { get; set; }
+
+        [Inject]
+        protected NavigationManager NavManager { get; set; }
+
+        protected int totalCount
+        {
+            get
+            {
+                int answ = 0;
+                if (ListRecords != null)
+                {
+                    answ = ListRecords.Count;
+                }
+                return answ;
+            }
+        }
+
+        #endregion Protected 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()
+        {
+            ClaimPlantId = 0;
+        }
+
+        private async Task ReloadAllData()
+        {
+            isLoading = true;
+            ListRecords = null;
+            await GetClaimsData();
+            // se ho un plantId valido --> altrimenti non abilitato
+            if (ClaimPlantId == 0)
+            {
+                ListRecords = await DataService.PlantsGetAll();
+            }
+            else if (ClaimPlantId > 0)
+            {
+                var rawData = await DataService.PlantsGetAll();
+                ListRecords = rawData.Where(x => x.PlantId == ClaimPlantId).ToList();
+            }
+            else
+            {
+                ListRecords = new List<PlantDTO>();
+            }
+            isLoading = false;
+        }
+
+        #endregion Private Methods
+
+        #region Protected Methods
+
+        protected override async Task OnInitializedAsync()
+        {
+            MessageService.ShowSearch = false;
+            MessageService.PageName = "Impianti";
+            MessageService.PageIcon = "fas fa-gas-pump pr-2";
+            MessageService.EA_SearchUpdated += OnSeachUpdated;
+            await ReloadAllData();
+        }
+
+        protected void Select(PlantDTO selRecord)
+        {
+            // applico filtro da selezione
+            currRecord = selRecord;
+        }
+
+        protected async Task UpdateData()
+        {
+            currRecord = null;
+            await ReloadAllData();
+        }
+
+        #endregion Protected Methods
+
+        #region Public Methods
+
+        public void Dispose()
+        {
+            MessageService.EA_SearchUpdated -= OnSeachUpdated;
+        }
+
+        public async void OnSeachUpdated()
+        {
+            await UpdateData();
+            StateHasChanged();
+        }
+
+        #endregion Public Methods
+    }
+}

GWMS.UI/Pages/Transporters.razor

@@ -8,15 +8,15 @@
         <div class="row">
             <div class="col-12">
                 <div class="row">
-                    <div class="col-6 pr-0 col-lg-8 h3">
+                    <div class="col-6 pr-0 col-lg-8 h3 mb-0">
                         Consegne
                     </div>
                     <div class="col-6 col-lg-4">
                         <div class="row">
-                            <div class="col-6 px-1">
+                            <div class="col-6">
                                 <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltPeriod()"><i class="far fa-calendar-alt"></i> <i class="@icnFiltTime"></i></button>
                             </div>
-                            <div class="col-6 px-1">
+                            <div class="col-6">
                                 <button class="btn btn-sm btn-block btn-secondary" @onclick="() => ToggleFiltDest()"><i class="fas fa-gas-pump"></i> <i class="@icnFiltDest"></i></button>
                             </div>
                         </div>
@@ -87,7 +87,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body p-1">
+    <div class="card-body">
         @if (currRecord != null)
         {
             <OrderTranspEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" SupplierId="@currRecord.SupplierId"></OrderTranspEditor>

GWMS.UI/Pages/Transporters.razor.cs

@@ -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)
@@ -295,10 +296,10 @@ namespace GWMS.UI.Pages
         {
             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 +307,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 +326,6 @@ namespace GWMS.UI.Pages
                 PlantsList = new List<PlantDTO>();
             }
             isLoading = false;
-
             await ReloadData();
         }
 
@@ -339,7 +340,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();
         }
 
@@ -395,16 +396,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

GWMS.UI/Pages/UserAdmin.razor

@@ -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>

GWMS.UI/Pages/UserAdmin.razor.cs

@@ -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)

GWMS.UI/Pages/UserManager.razor.cs

@@ -243,11 +243,8 @@ namespace GWMS.UI.Pages
 
         public async void OnSeachUpdated()
         {
-            await InvokeAsync(() =>
-            {
-                Task task = UpdateData();
-                StateHasChanged();
-            });
+            await UpdateData();
+            StateHasChanged();
         }
 
         #endregion Public Methods

GWMS.UI/Pages/_Host.cshtml

@@ -19,6 +19,7 @@
 
     <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" />
     <link rel="stylesheet" href="font-awesome/css/fontawesome.min.css" />
+    <link rel="stylesheet" href="Chart.js/Chart.min.css" />
     <link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
     <link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
 
@@ -41,9 +42,9 @@
     </div>
 
     <!-- inside of body section and after the div/app tag  -->
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js@2.8.0"></script>
+    <script src="jquery/jquery.min.js"></script>
+    <script src="Chart.js/Chart.min.js"></script>
+    <script src="popper.js/umd/popper.min.js"></script>
     <script src="bootstrap/js/bootstrap.min.js"></script>
 
     <script src="_content/Blazorise/blazorise.js"></script>
@@ -67,8 +68,8 @@
                     new QRCode(document.getElementById(elementName),
                         {
                             text: rawData,
-                            width: 400,
-                            height: 400
+                            width: 300,
+                            height: 300
                         });
                     //qrcode.makeCode(rawData);
                 }

GWMS.UI/Properties/PublishProfiles/IIS01.pubxml.user

@@ -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>

GWMS.UI/Properties/PublishProfiles/IIS02.pubxml.user

@@ -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>

GWMS.UI/Properties/PublishProfiles/IISProfile.pubxml.user

@@ -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>

GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml

@@ -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>

GWMS.UI/Properties/PublishProfiles/IISProfileLinux.pubxml.user

@@ -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>

GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml

@@ -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>

GWMS.UI/Properties/PublishProfiles/IISProfileWin.pubxml.user

@@ -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>

GWMS.UI/Properties/PublishProfiles/W2019-IIS-DEV.pubxml.user

@@ -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>

GWMS.UI/QuartzHostedService.cs

@@ -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
-    }
-}

GWMS.UI/Services/BlazorTimer.cs

@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Timers;
-
-namespace GWMS.UI.Services
-{
-    /// <summary>
-    /// Timer a consumo
-    /// https://wellsb.com/csharp/aspnet/blazor-timer-navigate-programmatically/
-    /// (da verificare)
-    /// </summary>
-    public class BlazorTimer
-    {
-        #region Private Fields
-
-        private Timer _timer;
-
-        #endregion Private Fields
-
-        #region Public Events
-
-        public event Action OnElapsed;
-
-        #endregion Public Events
-
-        #region Private Methods
-
-        private void NotifyTimerElapsed(Object source, ElapsedEventArgs e)
-        {
-            OnElapsed?.Invoke();
-            _timer.Dispose();
-        }
-
-        #endregion Private Methods
-
-        #region Public Methods
-
-        public void SetTimer(double interval)
-        {
-            _timer = new Timer(interval);
-            _timer.Elapsed += NotifyTimerElapsed;
-            _timer.Enabled = true;
-        }
-
-        #endregion Public Methods
-    }
-}

GWMS.UI/Shared/MainLayout.razor

@@ -2,6 +2,7 @@
 
 @using GWMS.UI.Data
 @using GWMS.UI.Components
+
 @inject MessageService MessageService
 @implements IDisposable
 
@@ -11,11 +12,11 @@
     </div>
 
     <CascadingValue Name="ShowSearch" Value=@ShowSearch>
-        <div class="main">
-            <div class="top-row px-0">
+        <div class="main mr-1">
+            <div class="top-row">
                 <CmpTop></CmpTop>
             </div>
-            <div class="content pt-1 pt-lg-2 px-2 mb-5">
+            <div class="content pt-1 pt-lg-2 mb-5">
                 @Body
             </div>
             <div class="fixed-bottom bottom-row">

GWMS.UI/Shared/MainLayout.razor.css

@@ -16,9 +16,9 @@
     background-color: #f7f7f7;
     border-bottom: 1px solid #d6d5d5;
     height: 3.5rem;
+    align-items: center;
     /*justify-content: space-evenly;
     display: flex;*/
-    align-items: center;
 }
 
     .top-row ::deep a, .top-row .btn-link {
@@ -34,37 +34,10 @@
 .bottom-row {
     color: #dedede;
     background-color: #000000;
-    /*border-bottom: 1px solid #313131;*/
-    /*justify-content: flex-end;*/
     height: 2rem;
-    /*display: flex;*/
     align-items: center;
 }
 
-    .bottom-row ::deep a, .top-row .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-    }
-
-    .bottom-row a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-/*
-@media (max-width: 640.98px) {
-    .top-row:not(.auth) {
-        display: none;
-    }
-
-    .top-row.auth {
-        justify-content: space-between;
-    }
-
-    .top-row a, .top-row .btn-link {
-        margin-left: 0;
-}
-}*/
-
 @media (min-width: 641px) {
     .page {
         flex-direction: row;

GWMS.UI/Shared/NavMenu.razor

@@ -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 Impianti">
+                    <NavLink class="nav-link" href="PlantSetup">
+                        <i class="fas fa-2x fa-wrench pr-2" aria-hidden="true"></i>
+                        <span class="@hideText">Setup Impianti</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>

GWMS.UI/Startup.cs

@@ -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
@@ -125,44 +122,38 @@ namespace GWMS.UI
             // inizializzo il DB e creo (se necessario) l'utente
             DbConfig.CheckUser(nKey, sKey);
             // verifico se serve applicazione migrazioni
-            //DbConfig.ExecMigrationMain();
+            DbConfig.ExecMigrationMain();
             //DbConfig.ExecMigrationIdentity();
 
             // altri parametri per check vari
             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;
 
             // 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))
                 .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)
                 .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))
-                .AddAsyncCheck($"MySql PlantLog", () => Health.Checks.DbPlantLogTable(DbConfig.DATABASE_NAME))
+                .AddAsyncCheck($"MySql PlantLog", () => Health.Checks.DbPlantTable(DbConfig.DATABASE_NAME))
                 ;
-            //.AddDiskStorageHealthCheck(s => s.AddDrive("C:\\", 1024)) // 1024 MB (1 GB) free minimum
-            //.AddProcessHealthCheck("ProcessName", p => p.Length > 0) // check if process is running
-            //.AddWindowsServiceHealthCheck("someservice", s => s.Status == ServiceControllerStatus.Running);
 
             services
-              .AddHealthChecksUI(s =>
-              {
-                  s.AddHealthCheckEndpoint("GWMS_Services", "health");
-                  s.SetEvaluationTimeInSeconds(15);
-                  s.SetMinimumSecondsBetweenFailureNotifications(60);
-                  s.SetApiMaxActiveRequests(5);
-                  s.SetHeaderText("GWMS Health Check Status");
-              })
-              .AddInMemoryStorage();
+                  .AddHealthChecksUI(s =>
+                  {
+                      s.AddHealthCheckEndpoint("GWMS_Services", "health");
+                      s.SetEvaluationTimeInSeconds(30);
+                      //s.SetEvaluationTimeInSeconds(60);
+                      s.SetMinimumSecondsBetweenFailureNotifications(120);
+                      s.SetApiMaxActiveRequests(5);
+                      s.SetHeaderText("GWMS Health Check Status");
+                  })
+                  .AddInMemoryStorage();
 
             // abilitazione x email management con MailKit
             services.AddTransient<IEmailSender, MailKitEmailSender>();
@@ -218,8 +209,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 =>
             //{
@@ -240,19 +231,9 @@ namespace GWMS.UI
             services.AddScoped<AuthenticationStateProvider, RevalidatingIdentityAuthenticationStateProvider<IdentityUser>>();
             services.AddDatabaseDeveloperPageExceptionFilter();
             services.AddSingleton<IConfiguration>(Configuration);
-            //services.AddTransient<Services.BlazorTimer>();
-
             //services.AddSingleton<GWMSDataService>();
             services.AddScoped<GWMSDataService>();
             services.AddScoped<MessageService>();
-
-#if false
-            // aggiunta quartz scheduler
-            var scheduler = StdSchedulerFactory.GetDefaultScheduler().GetAwaiter().GetResult();
-            services.AddSingleton(scheduler);
-            services.AddHostedService<QuartzHostedService>();
-
-#endif
         }
 
         #endregion Public Methods

GWMS.UI/appsettings.Production.json

@@ -1,7 +1,7 @@
 {
     "Logging": {
         "LogLevel": {
-            "Default": "Trace",
+            "Default": "Information",
             "Microsoft": "Warning",
             "Microsoft.Hosting.Lifetime": "Information"
         }

GWMS.UI/appsettings.json

@@ -31,9 +31,12 @@
         "nKey": "PZZFRR",
         "sKey": "M3T@n0"
     },
+    "TimeoutOffline": 3,
+    //"IntervalMin": 2,
     "IntervalMin": 60,
     "MaxLogRecord": 360,
     "ZCodeUrl": "https://qrcode.steamware.net/",
+    "ChartWaitDelay": 10,
     "logo": "img/LogoPizzaferri.jpg",
     "ExternalProviders": {
         "MailKit": {

GWMS.UI/libman.json

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

GWMS.UI/post-build.ps1

@@ -28,7 +28,4 @@ Set-Content -Path $FileManOut -Value $manData
 # replace x ChangeLog
 $clogData = Get-Content $FileCLogIn
 $clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum
-# $clogData = $clogData -replace "{{DIRNAME}}", "MP-STATS"
-# $clogData = $clogData -replace "{{BRANCHNAME}}", "stable"
-# $clogData = $clogData -replace "{{PACKNAME}}", "GWMS.UI"
 Set-Content -Path $FileCLogOut -Value $clogData

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

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

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

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

GWMS.UI/wwwroot/lib/qrcode.js

@@ -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++) {