Merge branch 'release/UpdateDisplayMonOverride'

Fix gestione download csv da datapager (sparito in refactoring...)

MP.Data/Conf/IobTags.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data.Conf
+{
+    /// <summary>
+    /// Struttura conf del file conf TAG x IOB
+    /// </summary>
+    public class IobTags
+    {
+        /// <summary>
+        /// Oggetto dizionario di configurazione x IOB
+        /// </summary>
+        public Dictionary<string, List<TagData>> IobSetup = new Dictionary<string, List<TagData>>();
+    }
+}

MP.Data/Conf/TagData.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data.Conf
+{
+    /// <summary>
+    /// Item da mostrare nei blocchi MON degli impianti come override ai dati MSE
+    /// </summary>
+    public class TagData
+    {
+        /// <summary>
+        /// Indice della colonna (ordine) del dato
+        /// </summary>
+        public int ColNum { get; set; } = 0;
+        /// <summary>
+        /// Indice della riga del dato
+        /// </summary>
+        public int RowNum { get; set; } = 0;
+        /// <summary>
+        /// Override CSS (es fontSmall)
+        /// </summary>
+        public string TagCss { get; set; } = "";
+        /// <summary>
+        /// Etichetta da mostrare
+        /// </summary>
+        public string TagName { get; set; } = "";
+        /// <summary>
+        /// Indicazione della chiave REDIS dove recuperare il tag indicato (già in formato string)
+        /// </summary>
+        public string TagLocation { get; set; } = "";
+
+        /// <summary>
+        /// Clone dell'oggetto
+        /// </summary>
+        /// <returns></returns>
+        public TagData Clone()
+        {
+            return (TagData)this.MemberwiseClone();
+        }
+    }
+}

MP.Data/Constants.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MP.Data
+{
+    public  class Constants
+    {
+
+        // dati conf REDIS Cache
+        public static readonly string BASE_HASH = "MAPO";
+
+        // REDIS KEY Dati correnti
+        public static readonly string CONF_MON_KEY = $"{BASE_HASH}:Conf:MonDispData";
+        public static readonly string ACT_FLUX_DATA_KEY = $"{BASE_HASH}:Current:FluxData";
+
+    }
+}

MP.Mon/Components/DetailMSE.razor

@@ -9,44 +9,107 @@
             <div class="d-flex mb-1 ui-title justify-content-center align-items-center text-uppercase">
                 @CurrRecord.Nome
             </div>
-            <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall text-uppercase">
-                <div class="px-1 pe-0">Art</div>
-                <div class="px-1 ps-0 ui-art">
-                    @if (showArt == "CodArticolo")
+            @if (hasRow(1))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(1))
                     {
-                        <span>@CurrRecord.CodArticolo</span>
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
                     }
-                    else
-                    {
-                        if (string.IsNullOrEmpty(CurrRecord.Disegno))
+                </div>
+            }
+            else
+            {
+                <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall text-uppercase">
+                    <div class="px-1 pe-0">Art</div>
+                    <div class="px-1 ps-0 ui-art">
+                        @if (showArt == "CodArticolo")
                         {
-                            <span>[@CurrRecord.CodArticolo]</span>
+                            <span>@CurrRecord.CodArticolo</span>
                         }
                         else
                         {
-                            <span>@CurrRecord.Disegno</span>
+                            if (string.IsNullOrEmpty(CurrRecord.Disegno))
+                            {
+                                <span>[@CurrRecord.CodArticolo]</span>
+                            }
+                            else
+                            {
+                                <span>@CurrRecord.Disegno</span>
+                            }
                         }
+                    </div>
+                </div>
+            }
+            @if (hasRow(2))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(2))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
                     }
                 </div>
-            </div>
-            <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall">
-                <div class="px-1 text-uppercase"><b>@CurrRecord.DescrizioneStato</b></div>
-                <div class="px-1 ps-0">@getMinSec((decimal)CurrRecord.Durata)</div>
-            </div>
-            <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall text-uppercase">
-                @*<div class="col-6 pe-0">OEE</div>
-                    <div class="col-6 ps-0">xx%</div>*@
-                <div class="px-1 pe-0">TCiclo</div>
-                <div class="px-1 ps-0">std: @getMinSec(@CurrRecord.TCAssegnato)</div>
-                <div class="px-1 ps-0">act: @getMinSec(@CurrRecord.TCLavRT)</div>
-            </div>
-            <div class="d-flex justify-content-between pt-0 pb-0 px-1 fontSmall1 text-uppercase">
-                @*<div class="px-1 pe-0">Pezzi</div>
-                <div class="px-1 ps-0">prod: @CurrRecord.PezziProd</div>
-                <div class="px-1 ps-0">ord: @CurrRecord.NumPezzi</div>*@
-                <div class="px-1 pe-0">Pezzi<sub>(prod/ord)</sub></div>
-                <div class="px-1 ps-0">@CurrRecord.PezziProd / @CurrRecord.NumPezzi</div>
-            </div>
+            }
+            else
+            {
+                <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall">
+                    <div class="px-1 text-uppercase"><b>@CurrRecord.DescrizioneStato</b></div>
+                    <div class="px-1 ps-0">@getMinSec((decimal)CurrRecord.Durata)</div>
+                </div>
+            }
+            @if (hasRow(3))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(3))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
+                    }
+                </div>
+            }
+            else
+            {
+                <div class="d-flex justify-content-between pt-0 pb-2 px-1 fontSmall text-uppercase">
+                    @*<div class="col-6 pe-0">OEE</div>
+            <div class="col-6 ps-0">xx%</div>*@
+                    <div class="px-1 pe-0">TCiclo</div>
+                    <div class="px-1 ps-0">std: @getMinSec(@CurrRecord.TCAssegnato)</div>
+                    <div class="px-1 ps-0">act: @getMinSec(@CurrRecord.TCLavRT)</div>
+                </div>
+            }
+            @if (hasRow(4))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(4))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
+                    }
+                </div>
+            }
+            else
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1 fontSmall1 text-uppercase">
+                    <div class="px-1 pe-0">Pezzi<sub>(prod/ord)</sub></div>
+                    <div class="px-1 ps-0">@CurrRecord.PezziProd / @CurrRecord.NumPezzi</div>
+                </div>
+            }
+            @if (hasRow(5))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(5))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
+                    }
+                </div>
+            }
+            @if (hasRow(6))
+            {
+                <div class="d-flex justify-content-between pt-0 pb-0 px-1">
+                    @foreach (var item in rowValues(6))
+                    {
+                        <div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
+                    }
+                </div>
+            }
         </div>
         <div class="@cssComStatus(CurrRecord.Semaforo, CurrRecord.LastUpdate) p-1">
             <div class="row fontSmaller mt-1">

MP.Mon/Components/DetailMSE.razor.cs

@@ -15,26 +15,186 @@ using MP.Mon;
 using MP.Mon.Shared;
 using MP.Mon.Components;
 using MP.Data.DatabaseModels;
+using MP.Data.Conf;
 
 namespace MP.Mon.Components
 {
     public partial class DetailMSE
     {
+        #region Protected Fields
 
         protected string baseCss = "sem";
-        protected bool dataLoaded { get; set; } = false;
         protected int kaFactor = 60 / 2;
 
+        #endregion Protected Fields
+
+        #region Private Fields
+
+        private static System.Timers.Timer aTimer = new System.Timers.Timer(60 * 1000);
+
+        #endregion Private Fields
+
+        #region Public Properties
+
+        [Parameter]
+        public MappaStatoExpl? CurrRecord { get; set; } = null;
+
+        [Parameter]
+        public List<TagData>? currTagConf { get; set; } = null;
+
+        [Parameter]
+        public Dictionary<string, string> currTagVal { get; set; } = new Dictionary<string, string>();
+
         [Parameter]
         public bool doAnimate { get; set; } = true;
 
         [Parameter]
-        public string showArt { get; set; } = "";
+        public int keepAliveMin { get; set; } = 5;
 
         [Parameter]
-        public int keepAliveMin { get; set; } = 5;
-        [Parameter]
-        public MappaStatoExpl? CurrRecord { get; set; } = null;
+        public string showArt { get; set; } = "";
+
+        #endregion Public Properties
+
+        /// <summary>
+        /// Verifica se ci sia un override per la riga indicata
+        /// </summary>
+        /// <param name="numRow"></param>
+        /// <returns></returns>
+        protected bool hasRow(int numRow)
+        {
+            bool answ = false;
+            if (currTagConf != null)
+            {
+                if (currTagConf.Count > 0)
+                {
+                    var currVals = rowValues(numRow);
+                    answ = currVals.Count > 0;
+                }
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Restituisce (se presenti) valori di override per la riga indicata
+        /// </summary>
+        /// <param name="numRow"></param>
+        /// <returns></returns>
+        protected List<TagData> rowValues(int numRow)
+        {
+            List<TagData>? rowVals = null;
+            if (currTagConf != null)
+            {
+                if (currTagConf.Count > 0)
+                {
+                    //cerco solo la riga corrente...
+                    rowVals = currTagConf.Where(x => x.RowNum == numRow).ToList();
+                }
+            }
+            if (rowVals == null)
+            {
+                rowVals = new List<TagData>();
+            }
+            return rowVals;
+        }
+
+        /// <summary>
+        /// restituisce il valore data la tagLocation
+        /// </summary>
+        /// <param name="tagLocation"></param>
+        /// <returns></returns>
+        protected string currVal(string tagLocation)
+        {
+            string answ = "";
+            if (currTagVal.ContainsKey(tagLocation))
+            {
+                answ = currTagVal[tagLocation];
+            }
+            return answ;
+        }
+
+        #region Protected Properties
+
+        protected string codIOB
+        {
+            get
+            {
+                string answ = "";
+                if (CurrRecord != null)
+                {
+                    answ = CurrRecord.IdxMacchina;
+                }
+                return answ;
+            }
+        }
+
+        protected bool dataLoaded { get; set; } = false;
+
+        #endregion Protected Properties
+
+        #region Public Methods
+
+        public void Dispose()
+        {
+            aTimer.Stop();
+            aTimer.Dispose();
+        }
+
+        public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e)
+        {
+            var pUpd = Task.Run(async () =>
+            {
+                await Task.Delay(1);
+                await InvokeAsync(StateHasChanged);
+            });
+            pUpd.Wait();
+        }
+
+        public void StartTimer()
+        {
+            int tOutPeriod = 1000;
+            //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
+            aTimer = new System.Timers.Timer(tOutPeriod);
+            aTimer.Elapsed += ElapsedTimer;
+            aTimer.Enabled = true;
+            aTimer.Start();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Methods
+
+        protected override async Task OnInitializedAsync()
+        {
+            StartTimer();
+            Random rnd = new Random();
+            //await Task.Delay(rnd.Next(500));
+            dataLoaded = true;
+            setupConf();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Methods
+
+        private string cssComStatus(string semaforo, DateTime? lastUpdateN)
+        {
+            DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
+            string answ = cssStatus(semaforo);
+            if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor))
+            {
+                answ = $"{baseCss}Ro";
+                // blink se secondo pari...
+                DateTime adesso = DateTime.Now;
+                int resto = 0;
+                Math.DivRem(adesso.Second, 2, out resto);
+                if (resto == 0)
+                {
+                    answ += "_b";
+                }
+            }
+            return answ;
+        }
 
         private string cssStatus(string codSemaforo)
         {
@@ -59,47 +219,6 @@ namespace MP.Mon.Components
             return answ;
         }
 
-        private string cssComStatus(string semaforo, DateTime? lastUpdateN)
-        {
-            DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
-            string answ = cssStatus(semaforo);
-            if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor))
-            {
-                answ = $"{baseCss}Ro";
-                // blink se secondo pari...
-                DateTime adesso = DateTime.Now;
-                int resto = 0;
-                Math.DivRem(adesso.Second, 2, out resto);
-                if (resto == 0)
-                {
-                    answ += "_b";
-                }
-            }
-            return answ;
-        }
-        protected override async Task OnInitializedAsync()
-        {
-            StartTimer();
-            Random rnd = new Random();
-            //await Task.Delay(rnd.Next(500));
-            dataLoaded = true;
-            setupConf();
-        }
-        private void setupConf()
-        {
-            //baseCss = doAnimate ? "semBlink" : "sem";
-        }
-        private bool showComErr(DateTime? lastUpdateN)
-        {
-            DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
-            bool answ = false;
-            if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor))
-            {
-                answ = true;
-            }
-            return answ;
-        }
-
         private string getMinSec(decimal? currTimeMin)
         {
             string answ = "nd";
@@ -113,32 +232,23 @@ namespace MP.Mon.Components
             { }
             return answ;
         }
-        public void Dispose()
+
+        private void setupConf()
         {
-            aTimer.Stop();
-            aTimer.Dispose();
+            //baseCss = doAnimate ? "semBlink" : "sem";
         }
 
-        private static System.Timers.Timer aTimer = new System.Timers.Timer(60 * 1000);
-
-        public void StartTimer()
+        private bool showComErr(DateTime? lastUpdateN)
         {
-            int tOutPeriod = 1000;
-            //int.TryParse(Configuration["ReloadStatusTimer"], out tOutPeriod);
-            aTimer = new System.Timers.Timer(tOutPeriod);
-            aTimer.Elapsed += ElapsedTimer;
-            aTimer.Enabled = true;
-            aTimer.Start();
-        }
-
-        public void ElapsedTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            var pUpd = Task.Run(async () =>
+            DateTime lastUpdate = lastUpdateN.HasValue ? (DateTime)lastUpdateN : DateTime.Now.AddHours(-1);
+            bool answ = false;
+            if (DateTime.Now.Subtract(lastUpdate).TotalSeconds > (keepAliveMin * kaFactor))
             {
-                await Task.Delay(1);
-                await InvokeAsync(StateHasChanged);
-            });
-            pUpd.Wait();
+                answ = true;
+            }
+            return answ;
         }
+
+        #endregion Private Methods
     }
 }

MP.Mon/Conf/iobTagsConf.json

@@ -0,0 +1,90 @@
+{
+  "IobSetup": {
+    "***": [
+      {
+        "ColNum": 1,
+        "RowNum": 5,
+        "TagCss": "fontSmall",
+        "TagName": "Feed Over",
+        "TagLocation": "MoonPro:SQL2016DEV:MoonPro:FLOG:***:FEED_OVER"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 5,
+        "TagCss": "fontSmall",
+        "TagName": "Rapid Over",
+        "TagLocation": "MoonPro:SQL2016DEV:MoonPro:FLOG:***:RAPID_OVER"
+      }
+    ],
+    "SIMUL_01": [
+      {
+        "ColNum": 1,
+        "RowNum": 6,
+        "TagCss": "fontSmall",
+        "TagName": "Power",
+        "TagLocation": "MoonPro:SQL2016DEV:MoonPro:FLOG:SIMUL_01:POWER_01"
+      }
+    ],
+    "SIMUL_02": [
+      {
+        "ColNum": 1,
+        "RowNum": 6,
+        "TagCss": "fontSmall",
+        "TagName": "Power",
+        "TagLocation": "MoonPro:SQL2016DEV:MoonPro:FLOG:SIMUL_02:POWER_01"
+      }
+    ],
+    "GIACO_ICOEL_001": [
+      {
+        "ColNum": 1,
+        "RowNum": 1,
+        "TagName": "Vel",
+        "TagLocation": "FluxData:TonnOra"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 1,
+        "TagName": "Vel",
+        "TagLocation": "FluxData:PezziMin"
+      },
+      {
+        "ColNum": 1,
+        "RowNum": 2,
+        "TagName": "Batch SX",
+        "TagLocation": "FluxData:BatchL1"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 2,
+        "TagName": "Batch DX",
+        "TagLocation": "FluxData:BatchL2"
+      }
+    ],
+    "GIACO_ICOEL_002": [
+      {
+        "ColNum": 1,
+        "RowNum": 1,
+        "TagName": "Vel",
+        "TagLocation": "FluxData:TonnOra"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 1,
+        "TagName": "Vel",
+        "TagLocation": "FluxData:PezziMin"
+      },
+      {
+        "ColNum": 1,
+        "RowNum": 2,
+        "TagName": "Batch SX",
+        "TagLocation": "FluxData:BatchL1"
+      },
+      {
+        "ColNum": 2,
+        "RowNum": 2,
+        "TagName": "Batch DX",
+        "TagLocation": "FluxData:BatchL2"
+      }
+    ]
+  }
+}

MP.Mon/Data/MpDataService.cs

@@ -1,29 +1,53 @@
-using MP.Data.DatabaseModels;
+using MP.Data.Conf;
+using MP.Data.DatabaseModels;
+using Newtonsoft.Json;
+using NLog;
+using StackExchange.Redis;
 using System.Text;
 
 namespace MP.Mon.Data
 {
     public class MpDataService : IDisposable
     {
-        #region Private Fields
-
-        private static IConfiguration _configuration;
-        private static ILogger<MpDataService> _logger;
-
-        #endregion Private Fields
-
         #region Public Fields
 
         public static MP.Data.Controllers.MpMonController dbController;
 
         #endregion Public Fields
 
+        #region Private Fields
+
+        private static IConfiguration _configuration;
+        private static ILogger<MpDataService> _logger;
+
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// Oggetto per connessione a REDIS
+        /// </summary>
+        private ConnectionMultiplexer redisConn = null!;
+
+        //ISubscriber sub = redis.GetSubscriber();
+        /// <summary>
+        /// Oggetto DB redis da impiegare x chiamate R/W
+        /// </summary>
+        private IDatabase redisDb = null!;
+
+        #endregion Private Fields
+
         #region Public Constructors
 
         public MpDataService(IConfiguration configuration, ILogger<MpDataService> logger)
         {
             _logger = logger;
             _configuration = configuration;
+
+            // setup compoenti REDIS
+            this.redisConn = ConnectionMultiplexer.Connect(_configuration.GetConnectionString("Redis"));
+            this.redisDb = this.redisConn.GetDatabase();
+            //// setup canali pub/sub
+            //actLogPipe = new MessagePipe(redisConn, Constants.ACT_LOG_M_QUEUE);
+
             // conf DB
             string connStr = _configuration.GetConnectionString("Mp.Mon");
             if (string.IsNullOrEmpty(connStr))
@@ -38,10 +62,22 @@ namespace MP.Mon.Data
                 //sb.AppendLine($"CST: {dbController.CustomersCount()} | CNT: {dbController.CountersCount()} | BSK: {dbController.BasketsCount()} | NGT: {dbController.NegotiationsCount()} | DOC: {dbController.DocsCount()} | ITM: {dbController.ItemsCount()} | RES: {dbController.ResourcesCount()}");
                 _logger.LogInformation(sb.ToString());
             }
+
+            // setup conf IOB da dizionario
+            tryLoadIobTags();
         }
 
         #endregion Public Constructors
 
+        #region Public Properties
+
+        /// <summary>
+        /// Dizionario dei tag configurati per IOB
+        /// </summary>
+        public Dictionary<string, List<TagData>> currTagConf { get; set; } = new Dictionary<string, List<TagData>>();
+
+        #endregion Public Properties
+
         #region Public Methods
 
         public Task<List<ConfigModel>> ConfigGetAll()
@@ -55,6 +91,23 @@ namespace MP.Mon.Data
             dbController.Dispose();
         }
 
+        /// <summary>
+        /// restituisce il valore da REDIS associato al tag richeisto
+        /// </summary>
+        /// <param name="redKey">Chiave in cui cercare il valore</param>
+        /// <returns></returns>
+        public string getTagConf(string redKey)
+        {
+            string outVal = "";
+            // cerco in REDIS la conf x l'IOB
+            string rawData = redisDb.StringGet(redKey);
+            if (!string.IsNullOrEmpty(rawData))
+            {
+                outVal = rawData;
+            }
+            return outVal;
+        }
+
         public Task<List<Macchine>> MacchineGetAll()
         {
             return Task.FromResult(dbController.MacchineGetAll().ToList());
@@ -71,5 +124,92 @@ namespace MP.Mon.Data
         }
 
         #endregion Public Methods
+
+        #region Private Methods
+
+        /// <summary>
+        /// Prova a caricare da file la conf degli IOB se presente
+        /// </summary>
+        private void tryLoadIobTags()
+        {
+            Dictionary<string, List<TagData>> currConf = new Dictionary<string, List<TagData>>();
+            string strExeFilePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
+            if (!string.IsNullOrEmpty(strExeFilePath))
+            {
+                string? strWorkPath = Path.GetDirectoryName(strExeFilePath);
+                if (!string.IsNullOrEmpty(strWorkPath))
+                {
+                    string filePath = $"{strWorkPath}/Conf/iobTagsConf.json";
+                    if (File.Exists(filePath))
+                    {
+                        string rawData = File.ReadAllText(filePath);
+                        if (!string.IsNullOrEmpty(rawData))
+                        {
+                            var fileConfData = JsonConvert.DeserializeObject<IobTags>(rawData);
+                            if (fileConfData != null)
+                            {
+                                // effettuo esplosione conf SE contenesse il valore "***" = tutti gli IOB
+                                if (fileConfData.IobSetup.ContainsKey("***"))
+                                {
+                                    // recupero elenco macchine...
+                                    var elencoMacc = dbController.MacchineGetAll();
+                                    // x ogni macchina creo le righe standard da conf...
+                                    var baseConf = fileConfData.IobSetup.Where(x => x.Key == "***").FirstOrDefault();
+                                    foreach (var item in elencoMacc)
+                                    {
+                                        if (!string.IsNullOrEmpty(item.IdxMacchina))
+                                        {
+                                            // converto i valori x la macchina corrente...
+                                            // clono in nuovo oggetto
+                                            var specVal = baseConf.Value.Select(i => i.Clone()).ToList();
+                                            // sostituisco segnaposto
+                                            foreach (var singleVal in specVal)
+                                            {
+                                                singleVal.TagLocation = singleVal.TagLocation.Replace("***", item.IdxMacchina);
+                                            }
+                                            // ora aggiungo eventuali valori in override...
+                                            if (fileConfData.IobSetup.ContainsKey(item.IdxMacchina))
+                                            {
+                                                var otConf = fileConfData.IobSetup.Where(x => x.Key == item.IdxMacchina).FirstOrDefault();
+                                                //verifico x ogni valore other...
+                                                foreach (var otTag in otConf.Value)
+                                                {
+                                                    var ovrTag = specVal.Where(x => x.ColNum == otTag.ColNum && x.RowNum == otTag.RowNum).FirstOrDefault();
+                                                    // se contiene --> sovrascrivo
+                                                    if (ovrTag != null)
+                                                    {
+                                                        //ovrTag = otTag.Clone();
+                                                        specVal.Remove(ovrTag);
+                                                        specVal.Add(otTag.Clone());
+                                                    }
+                                                    // se non contiene --> aggiungo
+                                                    else
+                                                    {
+                                                        specVal.Add(otTag);
+                                                    }
+                                                }
+                                            }
+                                            currConf.Add(item.IdxMacchina, specVal);
+                                        }
+                                    }
+
+                                }
+                                // altrimenti copio ed ho finito
+                                else
+                                {
+                                    currConf = fileConfData.IobSetup;
+                                }
+                            }
+                        }
+                    }
+                    if (currConf != null)
+                    {
+                        currTagConf = currConf;
+                    }
+                }
+            }
+        }
+
+        #endregion Private Methods
     }
 }

MP.Mon/MP.Mon.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.15.2205.219</Version>
+    <Version>6.15.2206.616</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,6 +37,12 @@
   <ItemGroup>
     <ProjectReference Include="..\MP.Data\MP.Data.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="logs\.placeholder">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
   </Target>

MP.Mon/Pages/Index.razor

@@ -24,15 +24,14 @@
     else
     {
         int currIdx = 0;
-        foreach (var macchina in ListMSE)
+        foreach (var recordIob in ListMSE)
         {
-            <DetailMSE CurrRecord="@macchina" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt"></DetailMSE>
+            <DetailMSE CurrRecord="@recordIob" currTagConf="@getIobTag(recordIob.IdxMacchina)" currTagVal="@getTagVal(recordIob.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt"></DetailMSE>
             currIdx++;
             if (currIdx >= maxCol)
             {
                 currIdx = 0;
-                @((MarkupString)"</div><div class=\"row statusMap mx-1 my-1\">")
-                ;
+                @((MarkupString)"</div><div class=\"row statusMap mx-1 my-1\">");
             }
         }
         // controllo se devo "chiudere riga...

MP.Mon/Pages/Index.razor.cs

@@ -1,21 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using System.Net.Http;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.AspNetCore.Components.Web;
-using Microsoft.AspNetCore.Components.Web.Virtualization;
-using Microsoft.JSInterop;
-using MP.Mon;
-using MP.Mon.Shared;
-using MP.Mon.Components;
+using MP.Data.Conf;
 using MP.Data.DatabaseModels;
-using MP.Mon.Components;
 using MP.Mon.Data;
 using NLog;
 
@@ -23,65 +8,112 @@ namespace MP.Mon.Pages
 {
     public partial class Index : IDisposable
     {
-        protected List<MappaStatoExpl>? ListMSE = null;
-        List<ConfigModel>? CurrConfig = null;
-
-
-        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        protected int keepAliveMin = 1;
-
-        protected int maxCol = 4;
+        #region Protected Fields
 
         protected bool doAnimate = true;
-
-        protected string showArt = "";
-
-        protected int slowRefreshSec = 300;
         protected int fastRefreshSec = 10;
+        protected int keepAliveMin = 1;
+        protected List<MappaStatoExpl>? ListMSE = null;
+        protected int maxCol = 4;
+        protected string showArt = "";
+        protected int slowRefreshSec = 300;
 
+        #endregion Protected Fields
+
+        #region Private Fields
+
+        private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
+        private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
+        private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
+        private List<ConfigModel>? CurrConfig = null;
+
+        #endregion Private Fields
+
+        #region Protected Properties
 
-        protected int slowRefreshMs
-        {
-            get => 1000 * slowRefreshSec;
-        }
         protected int fastRefreshMs
         {
             get => 1000 * fastRefreshSec;
         }
 
-        protected override async Task OnInitializedAsync()
-        {
-            await setupConf();
-            await ReloadData();
-            StartTimer();
-        }
-
-
         [Inject]
         protected MpDataService MMDataService { get; set; } = null!;
 
         [Inject]
         protected NavigationManager NavManager { get; set; } = null!;
 
-        private async Task setupConf()
+        protected int slowRefreshMs
         {
-            CurrConfig = await MMDataService.ConfigGetAll();
+            get => 1000 * slowRefreshSec;
+        }
+
+        #endregion Protected Properties
+
+        #region Public Methods
+
+        public void Dispose()
+        {
+            fastTimer.Stop();
+            fastTimer.Dispose();
+            slowTimer.Stop();
+            slowTimer.Dispose();
+        }
+
+        public void ElapsedFastTimer(Object source, System.Timers.ElapsedEventArgs e)
+        {
+            var pUpd = Task.Run(async () =>
+            {
+                await ReloadData();
+                //await Task.Delay(1);
+                await InvokeAsync(StateHasChanged);
+            });
+            pUpd.Wait();
+        }
+
+        public async void ElapsedSlowTimer(Object source, System.Timers.ElapsedEventArgs e)
+        {
+            ListMSE = null;
+            NavManager.NavigateTo(NavManager.Uri);
+        }
+
+        public void StartTimer()
+        {
+            // timer veloce
+            fastTimer = new System.Timers.Timer(fastRefreshMs);
+            fastTimer.Elapsed += ElapsedFastTimer;
+            fastTimer.Enabled = true;
+            fastTimer.Start();
+            // timer lento
+            slowTimer = new System.Timers.Timer(slowRefreshMs);
+            slowTimer.Elapsed += ElapsedSlowTimer;
+            slowTimer.Enabled = true;
+            slowTimer.Start();
+        }
+
+        #endregion Public Methods
+
+        #region Protected Methods
+
+        /// <summary>
+        /// Recupera il valore e se trovato aggiorna
+        /// </summary>
+        /// <param name="chiave">Valore da cercare</param>
+        /// <param name="varObj">String in cui salvare il valore se trovato</param>
+        /// <returns></returns>
+        protected bool getConfVal(string chiave, ref string varObj)
+        {
+            bool answ = false;
             if (CurrConfig != null && CurrConfig.Count > 0)
             {
                 // sistemo i parametri opzionali...
-
-                getConfValInt("keepAliveMin", ref keepAliveMin);
-                getConfValInt("MON_maxCol", ref maxCol);
-                int intDoAnim = 0;
-                getConfValInt("doAnimate", ref intDoAnim);
-                doAnimate = intDoAnim == 1;
-                getConfValInt("pageRefreshSec", ref slowRefreshSec);
-                getConfValInt("MSE_cacheDuration", ref fastRefreshSec);
-                getConfVal("sART", ref showArt);
-
-                Log.Info($"Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshSec: {fastRefreshSec}");
+                ConfigModel? risultato = CurrConfig.FirstOrDefault(x => x.Chiave == chiave);
+                if (risultato != null)
+                {
+                    varObj = risultato.Valore;
+                    answ = !string.IsNullOrEmpty(risultato.Valore);
+                }
             }
+            return answ;
         }
 
         /// <summary>
@@ -106,72 +138,78 @@ namespace MP.Mon.Pages
         }
 
         /// <summary>
-        /// Recupera il valore e se trovato aggiorna
+        /// Recupera da conf eventuale setup tag dell'IOB indicato
         /// </summary>
-        /// <param name="chiave">Valore da cercare</param>
-        /// <param name="varObj">String in cui salvare il valore se trovato</param>
+        /// <param name="codIob"></param>
         /// <returns></returns>
-        protected bool getConfVal(string chiave, ref string varObj)
+        protected List<TagData>? getIobTag(string codIob)
         {
-            bool answ = false;
-            if (CurrConfig != null && CurrConfig.Count > 0)
+            List<TagData>? answ = null;
+            if (MMDataService.currTagConf != null)
             {
-                // sistemo i parametri opzionali...
-                ConfigModel? risultato = CurrConfig.FirstOrDefault(x => x.Chiave == chiave);
-                if (risultato != null)
+                // cerco x chiave IOB...
+                if (MMDataService.currTagConf.ContainsKey(codIob))
                 {
-                    varObj = risultato.Valore;
-                    answ = !string.IsNullOrEmpty(risultato.Valore);
+                    answ = MMDataService.currTagConf[codIob];
                 }
             }
             return answ;
         }
 
+        /// <summary>
+        /// Recupera da redis (in una chiamata soltanto) tutti i valori richiesti e compone un dizionario x ottimizzare visualizzazione
+        /// </summary>
+        /// <param name="codIob"></param>
+        /// <returns></returns>
+        protected Dictionary<string, string> getTagVal(string codIob)
+        {
+            Dictionary<string, string> answ = new Dictionary<string, string>();
+            // recupero conf tags...
+            var currTags = getIobTag(codIob);
+            if (currTags != null && currTags.Count > 0)
+            {
+                // FIXME TODO !!!! FARE !!!! - da verificare
+                answ = currTags.ToDictionary(x => x.TagLocation, x => MMDataService.getTagConf(x.TagLocation));
+            }
+            return answ;
+        }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await setupConf();
+            await ReloadData();
+            StartTimer();
+        }
+
+        #endregion Protected Methods
+
+        #region Private Methods
+
         private async Task ReloadData()
         {
             ListMSE = await MMDataService.MseGetAll();
         }
 
-        public void Dispose()
+        private async Task setupConf()
         {
-            fastTimer.Stop();
-            fastTimer.Dispose();
-            slowTimer.Stop();
-            slowTimer.Dispose();
-        }
-
-        private static System.Timers.Timer fastTimer = new System.Timers.Timer(4000);
-        private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
-
-        public void StartTimer()
-        {
-            // timer veloce
-            fastTimer = new System.Timers.Timer(fastRefreshMs);
-            fastTimer.Elapsed += ElapsedFastTimer;
-            fastTimer.Enabled = true;
-            fastTimer.Start();
-            // timer lento
-            slowTimer = new System.Timers.Timer(slowRefreshMs);
-            slowTimer.Elapsed += ElapsedSlowTimer;
-            slowTimer.Enabled = true;
-            slowTimer.Start();
-        }
-
-        public void ElapsedFastTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            var pUpd = Task.Run(async () =>
+            CurrConfig = await MMDataService.ConfigGetAll();
+            if (CurrConfig != null && CurrConfig.Count > 0)
             {
-                await ReloadData();
-                //await Task.Delay(1);
-                await InvokeAsync(StateHasChanged);
-            });
-            pUpd.Wait();
+                // sistemo i parametri opzionali...
+
+                getConfValInt("keepAliveMin", ref keepAliveMin);
+                getConfValInt("MON_maxCol", ref maxCol);
+                int intDoAnim = 0;
+                getConfValInt("doAnimate", ref intDoAnim);
+                doAnimate = intDoAnim == 1;
+                getConfValInt("pageRefreshSec", ref slowRefreshSec);
+                getConfValInt("MSE_cacheDuration", ref fastRefreshSec);
+                getConfVal("sART", ref showArt);
+
+                Log.Info($"Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshSec: {fastRefreshSec}");
+            }
         }
 
-        public async void ElapsedSlowTimer(Object source, System.Timers.ElapsedEventArgs e)
-        {
-            ListMSE = null;
-            NavManager.NavigateTo(NavManager.Uri);
-        }
+        #endregion Private Methods
     }
 }

MP.Mon/Program.cs

@@ -21,7 +21,6 @@ string redisSrvAddr = connStringRedis.Substring(0, connStringRedis.IndexOf(":"))
 // avvio oggetto shared x redis...
 var redisMultiplexer = ConnectionMultiplexer.Connect(connStringRedis);
 
-
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();

MP.Mon/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.15.2205.219</h4>
+    <h4>Versione: 6.15.2206.616</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.Mon/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2205.219
+6.15.2206.616

MP.Mon/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2205.219</version>
+  <version>6.15.2206.616</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>

MP.Mon/appsettings.Production.json

@@ -0,0 +1,17 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "CodApp": "MP.MON",
+  "ConnectionStrings": {
+    "MP.Mon": "Server=localhost\\SQLEXPRESS;Database=MoonPro; User ID=steamware;Password=viadante16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
+    "MP.Stats": "Server=localhost\\SQLEXPRESS;Database=MoonPro_STATS; User ID=steamware;Password=viadante16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
+    "Redis": "localhost:6379,DefaultDatabase=13,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
+  }
+}

MP.Mon/appsettings.json

@@ -10,6 +10,6 @@
   "ConnectionStrings": {
     "MP.Mon": "Server=SQL2016DEV;Database=MoonPro; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
     "MP.Stats": "Server=SQL2016DEV;Database=MoonPro_STATS; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=Blazor.ServerApp;",
-    "Redis": "localhost:6379,DefaultDatabase=13,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
+    "Redis": "localhost:6379,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false"
   }
 }

MP.Stats/Components/DataPager.razor

@@ -36,6 +36,17 @@
                 {
                     <span>@totalCount records</span>
                 }
+                @if (totalCount > 0)
+                {
+                    if (!fileExist)
+                    {
+                        <button class="btn btn-block btn-sm btn-primary" @onclick="() => requestSave()"><span class="oi oi-wrench"></span> Prepare Data</button>
+                    }
+                    else
+                    {
+                        <a target="_blank" href="Download?fileName=@fileName" class="btn btn-block btn-sm btn-success"><span class="oi oi-cloud-download"></span> Download Data</a>
+                    }
+                }
             </div>
             <div class="p-1 flex-fill text-right small">
                 @if (totalCount > 0)

MP.Stats/MP.Stats.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Stats</RootNamespace>
         <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.15.2204.1416</Version>
+        <Version>6.15.2205.2311</Version>
     </PropertyGroup>
 
     <ItemGroup>

MP.Stats/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.15.2204.1416</h4>
+    <h4>Versione: 6.15.2205.2311</h4>
     <br />
     Note di rilascio:
     <ul>

MP.Stats/Resources/VersNum.txt

@@ -1 +1 @@
-6.15.2204.1416
+6.15.2205.2311

MP.Stats/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.15.2204.1416</version>
+  <version>6.15.2205.2311</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>