Merge branch 'release/Jenkins2GitLab'

Taggato job come "win" x selezionare runners
update nav menu
2021-09-02 12:11:24 +02:00 · 2021-09-02 11:39:52 +02:00 · 2021-09-02 11:30:29 +02:00 · 2021-09-02 11:30:25 +02:00 · 2021-09-01 09:36:47 +02:00 · 2021-09-01 09:36:38 +02:00
25 changed files with 245 additions and 307 deletions
@@ -70,6 +70,8 @@ stages:

 build:
  stage: build
+  tags:
+    - win
  before_script:
    - *nuget-fix
    - dotnet restore GWMS.sln
@@ -78,6 +80,8 @@ build:

 test:
  stage: test
+  tags:
+    - win
  only:
    - develop
  needs: ["build"]
@@ -110,6 +114,8 @@ test:

 installer:
  stage: installer
+  tags:
+    - win
  only:
    - develop
    - master
@@ -127,6 +133,8 @@ installer:

 release:
  stage: release
+  tags:
+    - win
  only:
    #- feature/Deploy_CI_CD
    # - master
@@ -26,117 +26,11 @@ namespace GWMS.Data.Controllers
        {
            _configuration = configuration;
            dbCtx = new GWMSContext(configuration);
-            Log.Info("Avviata classe GWMSController");
+            //Log.Info("Avviata classe GWMSController");
        }

        #endregion Public Constructors

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

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

        public List<ConfigModel> GetConfig()
@@ -261,9 +156,9 @@ namespace GWMS.Data.Controllers
        public List<PlantDTO> GetPlantsDTO(int maxRecords)
        {
            List<PlantDTO> dbResult = new List<PlantDTO>();
-            using (GWMSContext dbCtxMult = new GWMSContext(_configuration))
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
            {
-                var plantList = dbCtxMult
+                var plantList = localDbCtx
                    .DbSetPlant
                    .ToList();

@@ -330,7 +225,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)
@@ -451,6 +346,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 +357,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 +368,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 +376,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 +384,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 +392,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 +424,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 +433,7 @@ namespace GWMS.Data.Controllers
                // popolo valolri
                answ = new PlantDTO()
                {
+                    LastUpdate = lastRec,
                    PlantId = PlantId,
                    PlantCode = currPlant.PlantCode,
                    PlantDesc = currPlant.PlantDesc,
@@ -609,30 +508,6 @@ namespace GWMS.Data.Controllers
            return done;
        }

-        /// <summary>
-        /// Rigenera intero DB se riceve ID di un plant SIM...
-        /// </summary>
-        /// <param name="PlantId"></param>
-        public bool RegenDB(int PlantId, int numDays, int stepMin, int maxHourRate)
-        {
-            bool answ = false;
-            var currPlant = GetPlant(PlantId);
-            if (currPlant.PlantCode.StartsWith("PIZ"))
-            {
-                Log.Info("Inizio RegenDB");
-
-                DbAdmin.resetPlantLogTable();
-
-                ResetController();
-
-                CreateSimData(numDays, stepMin, maxHourRate);
-                Log.Info("Dati SIM generati");
-
-                answ = true;
-            }
-            return answ;
-        }
-
        public void ResetController()
        {
            dbCtx = new GWMSContext(_configuration);
@@ -18,6 +18,8 @@ namespace GWMS.Data.DTO
        public string PlantCode { get; set; } = "";
        public string PlantDesc { get; set; } = "";

+        public DateTime LastUpdate { get; set; } = DateTime.Today.AddDays(DateTime.Today.DayOfYear);
+
        public double LevelMax { get; set; } = 99999;

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

        #region Public Properties

+        public string checkRTime
+        {
+            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? $"Mancata ricezione: ultimo aggiornamento {_currItem.LastUpdate}" : $"Dati Realtime aggiornati al {_currItem.LastUpdate}";
+        }
+
        [Parameter]
        public PlantDTO currItem
        {
@@ -140,6 +145,16 @@ namespace GWMS.UI.Components
            }
        }

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

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

@@ -61,7 +61,7 @@
            return;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                // verifico SE c'è MainPress
@@ -394,6 +396,12 @@ namespace GWMS.UI.Data
            return answ;
        }

+        public void Dispose()
+        {
+            // Clear database controller
+            dbController.Dispose();
+        }
+
        public async Task<bool> HasPlantLog()
        {
            return await Task.FromResult(dbController.HasPlantLog());
@@ -662,11 +670,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();
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.2713</Version>
+    <Version>1.0.2109.0211</Version>
    <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
    <EnableNETAnalyzers>true</EnableNETAnalyzers>
    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
@@ -143,7 +143,7 @@ namespace GWMS.UI.Pages
            NavManager.NavigateTo($"GasStation/{args.BarcodeText}");
        }

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

        protected void ResetData()
@@ -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();
        }
@@ -338,8 +333,8 @@ namespace GWMS.UI.Pages
        protected async Task ReloadAllData()
        {
            isLoading = true;
-            //PlantsList = await DataService.PlantsGetAll();
            SuppliersList = await DataService.SuppliersGetAll();
+            SelPlantId = 0;
            PlantsList = null;
            await GetClaimsData();
            // se ho un plantId valido --> altrimenti non abilitato
@@ -358,7 +353,6 @@ namespace GWMS.UI.Pages
                PlantsList = new List<PlantDTO>();
            }
            isLoading = false;
-
            await ReloadData();
        }

@@ -40,7 +40,7 @@
            return;

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

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

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

        #region Protected Properties

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

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

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

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

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

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

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

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

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

@@ -347,7 +350,7 @@ namespace GWMS.UI.Pages

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

        public async void OnSeachUpdated()
@@ -22,7 +22,6 @@ namespace GWMS.UI.Pages
        private List<OrderModel> ListRecords;
        private List<PlantDTO> PlantsList;
        private List<OrderModel> SearchRecords;
-
        private List<TransporterModel> TransportersList;

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

        #region Protected Properties

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

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

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

@@ -235,6 +234,7 @@ namespace GWMS.UI.Pages
        /// <returns></returns>
        private async Task GetClaimsData()
        {
+            ClaimTransporterId = -1;
            // recupero auth
            var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
            var user = authState.User;
@@ -266,9 +266,8 @@ namespace GWMS.UI.Pages
        private async Task ReloadData()
        {
            isLoading = true;
-            SearchRecords = await DataService.OrdersGetFilt(MessageService.Order_Filter);
+            SearchRecords = await DataService.OrdersGetFilt(AppMService.Order_Filter);
            ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
-            //ListRecords = SearchRecords.Where(x => x.TransporterId == TransporterIdFilt).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
            isLoading = false;
        }

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

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

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

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

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

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

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

@@ -395,7 +398,7 @@ namespace GWMS.UI.Pages

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

        public async void OnSeachUpdated()
@@ -68,8 +68,8 @@
                    new QRCode(document.getElementById(elementName),
                        {
                            text: rawData,
-                            width: 400,
-                            height: 400
+                            width: 300,
+                            height: 300
                        });
                    //qrcode.makeCode(rawData);
                }
@@ -94,6 +94,12 @@
                        <span class="@hideText">Planner Consegne</span>
                    </NavLink>
                </li>
+                <li class="nav-item px-3" title="Setup Parametri">
+                    <NavLink class="nav-link" href="Parameters">
+                        <i class="fas fa-2x fa-wrench pr-2" aria-hidden="true"></i>
+                        <span class="@hideText">Setup Parametri</span>
+                    </NavLink>
+                </li>
                <li class="nav-item px-3" title="Admin Utenti">
                    <NavLink class="nav-link" href="UserAdmin">
                        <i class="fas fa-2x fa-users pr-2" aria-hidden="true"></i>
@@ -114,12 +120,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>
@@ -154,8 +154,8 @@ namespace GWMS.UI
              .AddHealthChecksUI(s =>
              {
                  s.AddHealthCheckEndpoint("GWMS_Services", "health");
-                  s.SetEvaluationTimeInSeconds(15);
-                  s.SetMinimumSecondsBetweenFailureNotifications(60);
+                  s.SetEvaluationTimeInSeconds(60);
+                  s.SetMinimumSecondsBetweenFailureNotifications(120);
                  s.SetApiMaxActiveRequests(5);
                  s.SetHeaderText("GWMS Health Check Status");
              })
@@ -1,6 +1,6 @@
 <body>
    <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2108.2713</h4>
+    <h4>Versione: 1.0.2109.0211</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-1.0.2108.2713
+1.0.2109.0211
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.2713</version>
+  <version>1.0.2109.0211</version>
  <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
  <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
Author	SHA1	Message	Date
Samuele Locatelli	c848168552	Merge branch 'release/Jenkins2GitLab'	2021-09-02 12:11:24 +02:00
Samuele Locatelli	d95a19af32	Taggato job come "win" x selezionare runners	2021-09-02 11:39:52 +02:00
Samuele Locatelli	c5e4f95b94	update nav menu	2021-09-02 11:30:29 +02:00
Samuele Locatelli	35e00bdb71	Aggiunta update await x lettura in transporters	2021-09-02 11:30:25 +02:00
Samuele Locatelli	8948984b44	Merge tag 'RC11' into develop Test modifica suppliers/transporters	2021-09-01 09:36:47 +02:00
Samuele Locatelli	58f8d2aee3	Merge branch 'release/RC11'	2021-09-01 09:36:38 +02:00
Samuele Locatelli	951a704b52	Pérova modifica reset controller per errore online	2021-09-01 09:36:23 +02:00
Samuele Locatelli	d518861228	Merge tag 'RC10' into develop Test fix catena reload data	2021-09-01 09:04:59 +02:00
Samuele Locatelli	32a0fa1287	Merge branch 'release/RC10'	2021-09-01 09:04:50 +02:00
Samuele Locatelli	33212941c8	Test modifica naming x chiamate che danno errori in OVH	2021-09-01 09:04:34 +02:00
Samuele Locatelli	59975a335d	Merge tag 'RC9' into develop Fix reanming local db context	2021-08-31 16:49:12 +02:00
Samuele Locatelli	390046a0c7	Merge branch 'release/RC9'	2021-08-31 16:49:02 +02:00
Samuele Locatelli	149f6251f7	Renaming localDbCtx	2021-08-31 16:48:48 +02:00
Samuele Locatelli	46a0efe748	Merge tag 'RC8' into develop Fix display grafici su mobile	2021-08-31 16:32:02 +02:00
Samuele Locatelli	ace620b09d	Merge branch 'release/RC8'	2021-08-31 16:31:36 +02:00
Samuele Locatelli	3d87f28004	Fix QRCode size on small device	2021-08-31 16:31:06 +02:00
Samuele Locatelli	b7071dcbe1	Fix display QRCode (test)	2021-08-31 16:26:11 +02:00
Samuele Locatelli	fdf937131c	Fix display grafici	2021-08-31 16:21:57 +02:00
Samuele Locatelli	1b8a19b036	Merge tag 'RC7' into develop Update indicazione aggiornamento dati realtime/vecchi	2021-08-30 12:39:31 +02:00
Samuele Locatelli	86bd0f375c	Merge branch 'release/RC7'	2021-08-30 12:39:06 +02:00
Samuele Locatelli	9e1d437563	Aggiunta indicazione trasmisisone RTime / vecchia	2021-08-30 12:38:20 +02:00
Samuele Locatelli	6bd54468dd	Modifica logging (meno verboso) e rallentamento check UI	2021-08-30 12:13:27 +02:00
Samuele Locatelli	52a71d236d	Merge tag 'RC6' into develop Inserite trappole x log + verboso	2021-08-30 11:58:51 +02:00
Samuele Locatelli	c2fd4870c7	Merge branch 'release/RC6'	2021-08-30 11:58:42 +02:00
Samuele Locatelli	b67fae281b	Aggiunto log livello debug x controllers IOB	2021-08-30 11:58:26 +02:00
Samuele Locatelli	22f4455356	Merge tag 'RC5' into develop Fix problema dimensioen QRCode	2021-08-30 09:42:11 +02:00
Samuele Locatelli	8107ba51b9	Merge branch 'release/RC5'	2021-08-30 09:42:01 +02:00
Samuele Locatelli	b3062b04fc	pulizia varia codice x classi non impiegate	2021-08-30 09:38:49 +02:00
Samuele Locatelli	3739225a28	riduzione canvas QRCode (raw fix)	2021-08-30 09:38:37 +02:00
Samuele Locatelli	2db1fbc8d6	Merge tag 'RC4' into develop Completata migrazione QRCode js + fix vari x check e librerie	2021-08-27 13:03:02 +02:00