Inizio update MON

2025-03-11 17:39:29 +01:00
parent a77d77fcfa
commit 6ca217d76e
11 changed files with 83 additions and 22 deletions
@@ -4,7 +4,7 @@
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.16.2411.1209</Version>
+    <Version>6.16.2503.1117</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -5,13 +5,13 @@
 <PageTitle>MP MON</PageTitle>

 <div class="row statusMap mx-1 my-1">
-    @if (listMSE == null)
+    @if (ListMSE == null)
    {
        <div class="col-12">
            <LoadingData></LoadingData>
        </div>
    }
-    else if (listMSE.Count == 0)
+    else if (ListMSE.Count == 0)
    {
        <div class="col-12">
            <div class="alert alert-warning">
@@ -21,22 +21,46 @@
    }
    else
    {
+         int mseIdx = 0;
+        for (int i = 0; i < mapNRow; i++)
+        {
+            <div class="row statusMap mx-1 my-1">
+                @for (int j = 0; j < mapNCol; j++)
+                {
+                    var currMse = MseById(mseIdx);
+                    mseIdx++;
+                    if (currMse != null)
+                    {
+                        <DetailMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink"></DetailMSE>
+                    }
+                    else
+                    {
+                        <div class="col machBlock">&nbsp;</div>
+                    }
+                }
+            </div>
+        }
+
+        <hr />
+
        int currIdx = 0;
-        foreach (var recordIob in listMSE)
+        foreach (var recordIob in ListMSE)
        {
            <DetailMSE CurrRecord="@recordIob" currTagConf="@getIobTag(recordIob.IdxMacchina)" currTagVal="@getTagVal(recordIob.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink"></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...
        int currNum = (currIdx % maxCol);
        while (currNum < (maxCol))
        {
-            @((MarkupString)"<div class=\"col machBlock\">&nbsp;</div>");
+            @((MarkupString)"<div class=\"col machBlock\">&nbsp;</div>")
+            ;
            currNum++;

        }
@@ -24,7 +24,7 @@ namespace MP.Mon.Pages

        public async void ElapsedSlowTimer(object? source, System.Timers.ElapsedEventArgs e)
        {
-            listMSE = null;
+            ListMSE = null;
            await Task.Delay(10);
            Log.Info("Elapsed Slow Timer --> full page reload");
            // dispongo i vari timers...
@@ -181,12 +181,49 @@ namespace MP.Mon.Pages
        private static System.Timers.Timer slowTimer = new System.Timers.Timer(300000);
        private List<ConfigModel>? CurrConfig = null;
        private bool doBlink = false;
-        private List<MappaStatoExpl>? listMSE = null;
+        private List<MappaStatoExpl>? ListMSE = null;
        private List<Macchine> listMacchine = new List<Macchine>();
        private Random rnd = new Random();

        #endregion Private Fields

+        /// <summary>
+        /// Numero righe mappa: calcolato da num elementi e numMax x riga...
+        /// </summary>
+        protected int mapNRow
+        {
+            get
+            {
+                int answ = 1;
+                int numElems = ListMSE != null ? ListMSE.Count : 1;
+                answ = (int)Math.Ceiling((double)numElems / mapNCol);
+                return answ;
+            }
+        }
+
+        /// <summary>
+        /// restituisce MSE dato indice
+        /// </summary>
+        /// <param name="mseIdx">Indice MSE richiesto</param>
+        /// <returns></returns>
+        protected MappaStatoExpl? MseById(int mseIdx)
+        {
+            MappaStatoExpl? answ = null;
+            if (ListMSE != null && ListMSE.Count > mseIdx)
+            {
+                answ = ListMSE[mseIdx];
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Numero colonne mappa: calcolato larghezza riga...
+        /// </summary>
+        protected int mapNCol
+        {
+            get => maxCol;
+        }
+
        #region Private Methods

        /// <summary>
@@ -249,16 +286,16 @@ namespace MP.Mon.Pages
                            dataList = listaFilt;
                        } 

-#if DEBUG
+#if DEBUG && false
                        // hack: legge 3 volte i dati x stressare sistema
                        var singleData = dataList;
-                        listMSE = new List<MappaStatoExpl>();
+                        ListMSE = new List<MappaStatoExpl>();
                        for (int i = 0; i < 3; i++)
                        {
-                            listMSE.AddRange(singleData);
+                            ListMSE.AddRange(singleData);
                        }
 #else
-                listMSE = dataList;
+                ListMSE = dataList;
 #endif
                    }
                }
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.16.2411.1209</h4>
+    <h4>Versione: 6.16.2503.1117</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.16.2411.1209
+6.16.2503.1117
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2411.1209</version>
+  <version>6.16.2503.1117</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>
@@ -386,10 +386,10 @@ namespace MP.Stats.Components

        private string CssBtn(PeriodoSel reqMode)
        {
-            string answ = "btn-outline-dark";
+            string answ = "btn-outline-primary";
            if (reqMode == pSel)
            {
-                answ = "btn-dark text-light";
+                answ = "btn-primary text-light";
            }
            return answ;
        }
@@ -4,8 +4,8 @@
        <TargetFramework>net6.0</TargetFramework>
        <RootNamespace>MP.Stats</RootNamespace>
        <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2503.1019</Version>
-        <Version>6.16.2503.1019</Version>
+        <Version>6.16.2503.1116</Version>
+        <Version>6.16.2503.1116</Version>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <NoWarn>$(NoWarn);1591</NoWarn>
        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2503.1019</h4>
+    <h4>Versione: 6.16.2503.1116</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.16.2503.1019
+6.16.2503.1116
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2503.1019</version>
+  <version>6.16.2503.1116</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>