Merge branch 'release/FixDataInsertOverflow'

Miglioramento SIM livello x GWMS

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,8 +24,6 @@ namespace GWMS.Data.Controllers
         public GWMSController(IConfiguration configuration)
         {
             _configuration = configuration;
-            dbCtx = new GWMSContext(configuration);
-            //Log.Info("Avviata classe GWMSController");
         }
 
         #endregion Public Constructors
@@ -41,33 +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;
         }
 
@@ -105,7 +126,10 @@ namespace GWMS.Data.Controllers
 
         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)
@@ -113,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)
@@ -127,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;
         }
 
@@ -150,13 +180,16 @@ 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;
         }
 
@@ -258,10 +291,13 @@ namespace GWMS.Data.Controllers
 
         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;
         }
 
@@ -289,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;
         }
 
@@ -350,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;
         }
 
@@ -370,24 +421,27 @@ namespace GWMS.Data.Controllers
         public bool OrderDelete(OrderModel Item2Del)
         {
             bool done = false;
-            try
+            using (GWMSContext localDbCtx = new GWMSContext(_configuration))
             {
-                if (Item2Del != null)
+                try
                 {
-                    var rec2del = dbCtx
-                                    .DbSetOrders
-                                    .Where(x => x.OrderId == Item2Del.OrderId)
-                                    .FirstOrDefault();
-                    dbCtx
-                        .DbSetOrders
-                        .Remove(rec2del);
-                    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)
-            {
-                Log.Error($"Eccezione in OrderDelete:{Environment.NewLine}{exc}");
             }
             return done;
         }
@@ -400,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;
         }
 
@@ -421,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"]))
@@ -441,19 +498,19 @@ 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)
-            {
-                Log.Error($"Eccezione in OrderUpdate:{Environment.NewLine}{exc}");
             }
             return done;
         }
@@ -576,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)
@@ -585,6 +645,7 @@ namespace GWMS.Data.Controllers
                            .GroupBy(g => g.FluxType)
                            .Select(s => s.First())
                            .ToList();
+            }
             return lastRec;
         }
 
@@ -596,43 +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;
         }
 
-        public void ResetController()
-        {
-            dbCtx = new GWMSContext(_configuration);
-        }
-
         /// <summary>
         /// Annulla modifiche su una specifica entity (cancel update)
         /// </summary>
@@ -641,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;
         }
@@ -663,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;
         }
 
@@ -695,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;
         }
 
@@ -718,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/PlantDTO.cs

@@ -24,7 +24,7 @@ namespace GWMS.Data.DTO
         public double LevelAct { get; set; } = 0;
         public double LevelReorder { get; set; } = 0;
         public double OrderQtyStd { get; set; } = 0;
-        
+
 
         public int LevelRatio
         {
@@ -37,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/GWMSContext.cs

@@ -28,15 +28,6 @@ namespace GWMS.Data
         public GWMSContext(IConfiguration configuration)
         {
             _configuration = configuration;
-            try
-            {
-                // se non ci fosse... crea o migra!
-                Database.Migrate();
-            }
-            catch (Exception exc)
-            {
-                Log.Error(exc, "Exception during context initialization 01");
-            }
         }
 
         public GWMSContext(DbContextOptions<GWMSContext> options) : base(options)
@@ -57,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
@@ -133,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/Components/PlantDetail.razor

@@ -1,88 +0,0 @@
-@using Blazorise
-@using GWMS.UI.Components
-
-<div class="card">
-    <div class="card-header table-primary py-1">
-        @if (currItem != null)
-        {
-            <div class="row py-0">
-                <div class="col-5 pr-0 font-weight-bold">
-                    <h2>@currItem.PlantCode</h2>
-                </div>
-                <div class="col-7 text-right align-bottom">
-                    <h4>@currItem.PlantDesc</h4>
-                </div>
-            </div>
-        }
-    </div>
-    <div class="card-body p-1">
-        <div class="row">
-            <div class="col-4 pr-0">
-                <div class="row">
-                    <div class="col-12">
-                        <ul class="list-group">
-                            <li class="list-group-item d-flex justify-content-between align-items-center p-0 border border-primary">
-                                <img src="./img/Plant/@(currItem.PlantCode).jpg" class="img-fluid" />
-                            </li>
-                            <li class="list-group-item active d-flex justify-content-between align-items-center py-1">PB Alta</li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center small">
-                                <span><i class="fas fa-compress-arrows-alt"></i> Stoccaggio</span> <span><b>@getPressData("BH", "N1")</b> <sub>bar</sub></span>
-                            </li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center small">
-                                <span><i class="fas fa-compress-arrows-alt"></i> Alimentazione</span> <span><b>@getPressData("BHA", "N1")</b> <sub>bar</sub></span>
-                            </li>
-                            <li class="list-group-item active d-flex justify-content-between align-items-center py-1">PB Bassa</li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center small">
-                                <span><i class="fas fa-compress-arrows-alt"></i> Stoccaggio</span> <span><b>@getPressData("BL", "N1")</b> <sub>bar</sub></span>
-                            </li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center small">
-                                <span><i class="fas fa-compress-arrows-alt"></i> Alimentazione</span> <span><b>@getPressData("BLA", "N1")</b> <sub>bar</sub></span>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="col-8 pl-1">
-                <div class="row">
-                    <div class="col-12">
-                        <ul class="list-group">
-                            <li class="list-group-item @headerStatus d-flex justify-content-between align-items-center px-0 py-1 small">
-                                <div class="px-1" title="@checkRTime">
-                                    SERBATOIO Principale <i class="fas fa-play @playStatus"></i>
-                                </div>
-                                <div class="px-1 text-right">
-                                    <span><i class="fas fa-database"></i> Livello:</span><span>@currItem.LevelAct.ToString("N0")/@currItem.LevelMax.ToString("N0")</span> | <span style="font-size:1.2em;"><b>@currItem.LevelRatio</b> <sub>%</sub></span>
-                                </div>
-                            </li>
-                            <li class="list-group-item align-items-center px-1 py-2">
-                                <div class="d-flex flex-column">
-                                    <div class="p-1 flex-grow-1">
-                                        <Progress>
-                                            <ProgressBar Value="@currItem.LevelRatio" Striped="false" Animated="false" />
-                                        </Progress>
-                                    </div>
-                                    <div class="px-1 py-2">
-                                        <LineChart @ref="LevelVal" TItem="double" OptionsObject="lineChartOptions" />
-                                    </div>
-                                </div>
-                            </li>
-                            <li class="list-group-item d-flex justify-content-between align-items-center">
-                                <span><i class="fas fa-compress-arrows-alt"></i> Pressione</span> <span style="font-size:1.2em;"><b>@currItem.PressAct["Main"].ToString("N1")</b> <span class="small"> <sub>bar</sub></span></span>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="card-footer alert alert-primary mb-0 p-1">
-        <div class="d-flex justify-content-between">
-            <div class="py-1 px-2 mb-0">
-                <h4>Ordini aperti: <b>@currItem.OrderTS.Count</b></h4>
-            </div>
-            <div class="py-1 px-2">
-                <button class="btn btn-block btn-primary" title="Mostra Ordini" @onclick="() => ShowOrders(currItem.PlantId)">Mostra Ordini <i class="fas fa-file-invoice"></i></button>
-            </div>
-        </div>
-    </div>
-</div>

GWMS.UI/Components/PlantDetail.razor.cs

@@ -1,263 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using GWMS.UI.Data;
-using GWMS.Data.DTO;
-using Microsoft.AspNetCore.Components;
-using Blazorise.Charts;
-using System.Threading;
-using Microsoft.Extensions.Configuration;
-
-namespace GWMS.UI.Components
-{
-    public partial class PlantDetail
-    {
-        #region Protected Fields
-
-        protected PlantDTO _currItem = new PlantDTO();
-
-        protected LineChart<double> LevelVal = new LineChart<double>();
-
-        protected object lineChartOptions = new
-        {
-            Scales = new
-            {
-                XAxes = new object[]
-                 {
-                     new {
-                         display = true,
-                         //type = "timeseries",
-                         //type = "time",
-                         //Time = new {
-                         //    unit="day"
-                         //}
-                     }
-                 },
-                YAxes = new object[]
-                {
-                    new {
-                        display = true,
-                        position = "right",
-                        //text    = "Kg",
-                        ticks = new {
-                            suggestedMin = 0,
-                            suggestedMax = 10000
-                        }
-                    }
-                }
-            },
-            Tooltips = new
-            {
-                Mode = "nearest",
-                Intersect = false
-            },
-            Hover = new
-            {
-                Mode = "nearest",
-                Intersect = false
-            },
-            Animation = false,
-            Responsive = true,
-            AspectRatio = 2,
-            type = "line",
-            Legend = new
-            {
-                display = false
-            }
-        };
-
-        /// <summary>
-        /// fattore di riduzione x visualizzare meno punti (in base alla numerosità...
-        /// </summary>
-        protected int redFact = 1;
-
-        #endregion Protected Fields
-
-        #region Private Properties
-
-        [Inject]
-        private IConfiguration Configuration { get; set; }
-
-        [Inject]
-        private NavigationManager NavManager { get; set; }
-
-        private int SelPlantId
-        {
-            get
-            {
-                int answ = 0;
-                if (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 Private Properties
-
-        #region Protected Properties
-
-        [Inject]
-        protected GWMSDataService DataService { get; set; }
-
-        [Inject]
-        protected MessageService MessageService { get; set; }
-
-        #endregion Protected Properties
-
-        #region Public Properties
-
-        public string checkRTime
-        {
-            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? $"Mancata ricezione: ultimo aggiornamento {_currItem.LastUpdate}" : $"Dati Realtime aggiornati al {_currItem.LastUpdate}";
-        }
-
-        [Parameter]
-        public PlantDTO currItem
-        {
-            get
-            {
-                return _currItem;
-            }
-            set
-            {
-                _currItem = value;
-                if (value != null)
-                {
-                    var dataReload = Task.Run(async () =>
-                    {
-                        // aggiunta delay o non riesce a disegnare
-                        int ChartWaitDelay = 150;
-                        int.TryParse(Configuration["ChartWaitDelay"], out ChartWaitDelay);
-                        Thread.Sleep(ChartWaitDelay);
-                        await HandleRedraw();
-                    });
-                }
-            }
-        }
-
-        public string headerStatus
-        {
-            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? "text-secondary" : "active";
-        }
-
-        public string playStatus
-        {
-            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? "text-danger" : "text-success";
-        }
-
-        #endregion Public Properties
-
-        #region Private Methods
-
-        private void fixRedFactor()
-        {
-            int answ = 1;
-            int numCount = _currItem.LevelTS.Count;
-            // passo a 2h se > 3 gg
-            if (numCount > 72)
-                answ = 3;
-            // passo a 3h se > 5 gg
-            else if (numCount > 120)
-                answ = 4;
-            // passo a 4h se > 10 gg
-            else if (numCount > 240)
-                answ = 5;
-            redFact = answ;
-        }
-
-        private LineChartDataset<double> GetLineChartDataset()
-        {
-            fixRedFactor();
-            var answ = new LineChartDataset<double>
-            {
-                //Label = "Livello",
-                Data = _currItem.LevelTS.Where((cat, index) => index % redFact == 0).Select(x => x.ValDouble).ToList(),
-                BorderColor = getLineColors(1f),
-                BackgroundColor = getFillColors(0.25f),
-                Fill = true,
-                PointRadius = 3,
-                BorderWidth = 2,
-                LineTension = 0,
-                BorderDash = new List<int> { }
-            };
-            return answ;
-        }
-
-        private List<string> GetLineChartLabels()
-        {
-            fixRedFactor();
-            var answ = _currItem.LevelTS.Where((cat, index) => index % redFact == 0).Select(x => x.DtEvent.ToString("dd/MM HH")).ToList();
-            return answ;
-        }
-
-        #endregion Private Methods
-
-        #region Protected Methods
-
-        /// <summary>
-        /// Genera colori sfondo
-        /// </summary>
-        /// <param name="numRecords"></param>
-        /// <returns></returns>
-        protected List<string> getFillColors(float alpha)
-        {
-            List<string> answ = new List<string>();
-            answ.Add(ChartColor.FromRgba(108, 164, 254, alpha));
-            return answ;
-        }
-
-        /// <summary>
-        /// Genera colori linea
-        /// </summary>
-        /// <param name="numRecords"></param>
-        /// <returns></returns>
-        protected List<string> getLineColors(float alpha)
-        {
-            List<string> answ = new List<string>();
-            answ.Add(ChartColor.FromRgba(54, 82, 254, alpha));
-            return answ;
-        }
-
-        protected async Task HandleRedraw()
-        {
-            if (LevelVal != null)
-            {
-                await LevelVal.Clear();
-                await LevelVal.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset());
-            }
-        }
-
-        protected void ShowOrders(int currPlantId)
-        {
-            SelPlantId = currPlantId;
-            // rimando...
-            NavManager.NavigateTo($"Orders");
-        }
-
-        #endregion Protected Methods
-
-        #region Public Methods
-
-        public string getPressData(string valore, string formato)
-        {
-            string answ = "";
-            if (currItem.PressAct.ContainsKey(valore))
-            {
-                answ = currItem.PressAct[valore].ToString(formato);
-            }
-            return answ;
-        }
-
-        #endregion Public Methods
-    }
-}

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

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

GWMS.UI/Components/PlantOverview.razor.cs

@@ -42,7 +42,7 @@ namespace GWMS.UI.Components
                         //text    = "Kg",
                         ticks = new {
                             suggestedMin = 0,
-                            suggestedMax = 10000
+                            suggestedMax = 30000
                         }
                     }
                 }
@@ -147,7 +147,14 @@ namespace GWMS.UI.Components
 
         public string headerStatus
         {
-            get => DateTime.Now.Subtract(_currItem.LastUpdate).TotalMinutes > 2 ? "text-secondary" : "active";
+            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

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/Controllers/IOBController.cs

@@ -120,7 +120,7 @@ namespace GWMS.UI.Controllers
             fatto = await _DataService.checkLevels();
             if (fatto)
             {
-                return "Ok";
+                return "OK";
             }
             else
             {
@@ -302,7 +302,7 @@ namespace GWMS.UI.Controllers
 
             if (fatto)
             {
-                return "Ok";
+                return "OK";
             }
             else
             {
@@ -330,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
             {

GWMS.UI/Data/GWMSDataService.cs

@@ -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());
             }
         }
 
@@ -254,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>();
@@ -396,6 +379,11 @@ namespace GWMS.UI.Data
             return answ;
         }
 
+        public async Task<bool> DbForceMigrate()
+        {
+            return await Task.FromResult(dbController.DbForceMigrate());
+        }
+
         public void Dispose()
         {
             // Clear database controller
@@ -407,6 +395,20 @@ namespace GWMS.UI.Data
             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());
@@ -468,8 +470,7 @@ namespace GWMS.UI.Data
             try
             {
                 done = dbController.OrderDelete(currItem);
-                invalidateAllCache();
-                dbController.ResetController();
+                InvalidateAllCache();
             }
             catch (Exception exc)
             {
@@ -545,8 +546,7 @@ namespace GWMS.UI.Data
             try
             {
                 done = dbController.OrderUpdate(currItem);
-                invalidateAllCache();
-                dbController.ResetController();
+                InvalidateAllCache();
             }
             catch (Exception exc)
             {
@@ -599,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...
@@ -611,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;
                 }
             }
 
@@ -634,6 +637,7 @@ 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
@@ -715,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
@@ -725,11 +744,6 @@ namespace GWMS.UI.Data
             { }
         }
 
-        public void ResetController()
-        {
-            dbController.ResetController();
-        }
-
         public void rollBackEdit(object item)
         {
             dbController.rollBackEntity(item);

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,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2109.2315</Version>
+    <Version>1.0.2110.0119</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <Compile Remove="QuartzHostedService.cs" />
+    <Compile Remove="Services\BlazorTimer.cs" />
   </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,7 +140,7 @@ 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 ReloadAllData()

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/Orders.razor.cs

@@ -322,7 +322,6 @@ 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";
@@ -382,7 +381,6 @@ namespace GWMS.UI.Pages
         protected async Task UpdateData()
         {
             currRecord = null;
-            DataService.ResetController();
             await ReloadData();
         }
 

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.cs

@@ -337,7 +337,6 @@ 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";
@@ -396,7 +395,6 @@ namespace GWMS.UI.Pages
         protected async Task UpdateData()
         {
             currRecord = null;
-            DataService.ResetController();
             await DataService.PlantsAnalisysReset(AppMService.Order_Filter);
             await ReloadData();
         }

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/Suppliers.razor.cs

@@ -267,7 +267,6 @@ namespace GWMS.UI.Pages
 
         protected override async Task OnInitializedAsync()
         {
-            DataService.ResetController();
             AppMService.ShowSearch = false;
             AppMService.PageName = "Fornitore";
             AppMService.PageIcon = "fas fa-industry pr-2";
@@ -325,7 +324,6 @@ namespace GWMS.UI.Pages
         protected async Task UpdateData()
         {
             currRecord = null;
-            DataService.ResetController();
             await ReloadData();
         }
 

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.cs

@@ -294,7 +294,6 @@ namespace GWMS.UI.Pages
 
         protected override async Task OnInitializedAsync()
         {
-            DataService.ResetController();
             SelPlantId = 0;
             SelTranspId = 0;
             AppMService.ShowSearch = false;
@@ -373,7 +372,6 @@ namespace GWMS.UI.Pages
         protected async Task UpdateData()
         {
             currRecord = null;
-            DataService.ResetController();
             await ReloadData();
         }
 

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/NavMenu.razor

@@ -100,10 +100,10 @@
                         <span class="@hideText">Planner Consegne</span>
                     </NavLink>
                 </li>
-                <li class="nav-item px-3" title="Setup Parametri">
-                    <NavLink class="nav-link" href="Parameters">
+                <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 Parametri</span>
+                        <span class="@hideText">Setup Impianti</span>
                     </NavLink>
                 </li>
                 <li class="nav-item px-3" title="Admin Utenti">

GWMS.UI/Startup.cs

@@ -122,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(60);
-                  s.SetMinimumSecondsBetweenFailureNotifications(120);
-                  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>();
@@ -237,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,6 +31,8 @@
         "nKey": "PZZFRR",
         "sKey": "M3T@n0"
     },
+    "TimeoutOffline": 3,
+    //"IntervalMin": 2,
     "IntervalMin": 60,
     "MaxLogRecord": 360,
     "ZCodeUrl": "https://qrcode.steamware.net/",

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

Resources/ChangeLog.html

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

Resources/VersNum.txt

@@ -1 +1 @@
-1.0.2109.2315
+1.0.2110.0119

Resources/manifest.xml

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