From cb4085e28e8a158563486d67b75ec73d91b316a9 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 17 May 2024 19:00:45 +0200
Subject: [PATCH] MON: - fix display titolo (scroll) - num pezzi prod/ord -
 stato text-truncate TAB: - fix ordinamento fermate

---
 MP-TAB3/MP-TAB3.csproj                    |  2 +-
 MP-TAB3/Pages/ProdStop.razor.cs           |  3 +-
 MP-TAB3/Resources/ChangeLog.html          |  2 +-
 MP-TAB3/Resources/VersNum.txt             |  2 +-
 MP-TAB3/Resources/manifest.xml            |  2 +-
 MP.Mon/Components/DetailMSE.razor         | 10 +++---
 MP.Mon/Components/DetailMSE.razor.cs      | 34 +++++++++---------
 MP.Mon/Components/DetailMSE.razor.css     | 42 +++++++++++++++++++++++
 MP.Mon/Components/DetailMSE.razor.less    | 31 ++++++++++-------
 MP.Mon/Components/DetailMSE.razor.min.css |  1 +
 MP.Mon/MP.Mon.csproj                      |  2 +-
 MP.Mon/Resources/ChangeLog.html           |  2 +-
 MP.Mon/Resources/VersNum.txt              |  2 +-
 MP.Mon/Resources/manifest.xml             |  2 +-
 MP.Mon/appsettings.Production.json        |  3 +-
 MP.Mon/appsettings.json                   |  3 +-
 MP.Mon/compilerconfig.json                |  4 +++
 17 files changed, 102 insertions(+), 45 deletions(-)
 create mode 100644 MP.Mon/Components/DetailMSE.razor.css
 create mode 100644 MP.Mon/Components/DetailMSE.razor.min.css
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index 11d43632..4c5f1216 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2405.909</Version>
+      <Version>6.16.2405.1717</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB3</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB3/Pages/ProdStop.razor.cs b/MP-TAB3/Pages/ProdStop.razor.cs
index 82bf43aa..ee4a41c0 100644
--- a/MP-TAB3/Pages/ProdStop.razor.cs
+++ b/MP-TAB3/Pages/ProdStop.razor.cs
@@ -241,7 +241,8 @@ namespace MP_TAB3.Pages
                     var eventsAll = await TabDServ.AnagEventiGetByMacch(IdxMacc);
                     if (eventsAll != null)
                     {
-                        events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.label).ToList();
+                        events2show = eventsAll.Where(x => x.EventoTablet).ToList();
+                        //events2show = eventsAll.Where(x => x.EventoTablet).OrderBy(x => x.label).ToList();
                     }
                 }
                 catch (Exception exc)
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index de3800de..4dcd01aa 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2405.909</h4>
+    <h4>Versione: 6.16.2405.1717</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index d36c84d8..a84c9343 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2405.909
+6.16.2405.1717
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index 38257034..b4436bfe 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2405.909</version>
+  <version>6.16.2405.1717</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Mon/Components/DetailMSE.razor b/MP.Mon/Components/DetailMSE.razor
index 74a435d1..8a655bf8 100644
--- a/MP.Mon/Components/DetailMSE.razor
+++ b/MP.Mon/Components/DetailMSE.razor
@@ -7,7 +7,7 @@
     {
         <div class="@cssStatus(CurrRecord.Semaforo) p-1 @overlayCss">
             <div class="d-flex ui-title justify-content-center align-items-center text-uppercase">
-                <div class="px-0 @textDescrCss">
+                <div class="px-0 @textDescrCss(@CurrRecord.Nome)">
                     <span>@CurrRecord.Nome</span>
                 </div>
             </div>
@@ -70,9 +70,9 @@
             }
             else
             {
-                <div class="d-flex justify-content-between pt-0 mt-1 pb-2 px-1 fontSmall">
-                    <div class="px-1 text-uppercase"><b>@CurrRecord.DescrizioneStato</b></div>
-                    <div class="px-1 ps-0">@getMinSec(getDecimal(@CurrRecord.Durata))</div>
+                <div class="d-flex justify-content-between pt-0 mt-1 pb-2 px-1 fontSmall text-uppercase">
+                    <div class="px-1 text-truncate col-8">@CurrRecord.DescrizioneStato</div>
+                    <div class="px-1 ps-0 text-nowrap">@getMinSec(getDecimal(@CurrRecord.Durata))</div>
                 </div>
             }
             @if (hasRow(4))
@@ -104,7 +104,7 @@
             else
             {
                 <div class="d-flex justify-content-between py-0 px-1 fontSmall1 text-uppercase">
-                    <div class="px-1 pe-0">Pezzi<sub>(prod/ord)</sub></div>
+                    <div class="px-1 pe-0">Pezzi<small class="small"><sub>p/o</sub></small></div>
                     <div class="px-1 ps-0">@CurrRecord.PezziProd / @CurrRecord.NumPezzi</div>
                 </div>
             }
diff --git a/MP.Mon/Components/DetailMSE.razor.cs b/MP.Mon/Components/DetailMSE.razor.cs
index d0a99243..85b79107 100644
--- a/MP.Mon/Components/DetailMSE.razor.cs
+++ b/MP.Mon/Components/DetailMSE.razor.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.FileSystemGlobbing;
 using MP.Data.Conf;
 using MP.Data.DatabaseModels;
 using NLog;
@@ -75,21 +76,6 @@ namespace MP.Mon.Components
             pUpd.Wait();
         }
 
-        ///// <summary>
-        ///// CSS class x testo (se descr lunga scorre...)
-        ///// </summary>
-        //protected string textDescrCss
-        //{
-        //    get
-        //    {
-        //        string answ = "text-nowrap";
-        //        if (CurrRecord != null && CurrRecord.DescrizioneStato.Length > 7)
-        //        {
-        //            answ = " scroll-left";
-        //        }
-        //        return answ;
-        //    }
-        //}
         public void StartTimer()
         {
             int tOutPeriod = 1000;
@@ -108,8 +94,6 @@ namespace MP.Mon.Components
 
         protected int kaFactor = 60 / 2;
 
-        protected string textDescrCss = "";
-
         #endregion Protected Fields
 
         #region Protected Properties
@@ -127,6 +111,20 @@ namespace MP.Mon.Components
             }
         }
 
+
+        /// <summary>
+        /// CSS class x testo (se descr lunga scorre...)
+        /// </summary>
+        protected string textDescrCss(string currText)
+        {
+            string answ = "text-nowrap";
+            if (currText.Length > maxChar4Scroll)
+            {
+                answ = " scroll-left";
+            }
+            return answ;
+        }
+
         protected bool dataLoaded { get; set; } = false;
 
         /// <summary>
@@ -192,11 +190,13 @@ namespace MP.Mon.Components
             Random rnd = new Random();
             await Task.Delay(rnd.Next(5));
             cssOverlayOff = config.GetValue<string>("ServerConf:cssOverlayOff");
+            maxChar4Scroll = config.GetValue<int>("ServerConf:maxChar4Scroll");
             setupConf();
             dataLoaded = true;
         }
 
         private string cssOverlayOff = "bg-dark text-light opacity-100";
+        private int maxChar4Scroll = 20;
 
         /// <summary>
         /// Restituisce (se presenti) valori di override per la riga indicata
diff --git a/MP.Mon/Components/DetailMSE.razor.css b/MP.Mon/Components/DetailMSE.razor.css
new file mode 100644
index 00000000..04f76376
--- /dev/null
+++ b/MP.Mon/Components/DetailMSE.razor.css
@@ -0,0 +1,42 @@
+﻿/* gestione scroll testo */
+.scroll-left {
+  height: 1.5em;
+  overflow: hidden;
+  position: relative;
+  width: 100%;
+  white-space: nowrap;
+}
+.scroll-left span {
+  /*display: inline-block;*/
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  line-height: 1.5em;
+  /* Starting position */
+  -moz-transform: translateX(-50%);
+  -webkit-transform: translateX(-50%);
+  transform: translateX(-50%);
+  /* Apply animation to this element */
+  -moz-animation: scroll-left 20s ease infinite;
+  -webkit-animation: scroll-left 20s ease infinite;
+  animation: scroll-left 20s ease infinite;
+}
+/* Move it (define the animation) */
+@keyframes scroll-left {
+  0% {
+    transform: translateX(-50%);
+  }
+  25% {
+    transform: translateX(-30%);
+  }
+  50% {
+    transform: translateX(-50%);
+  }
+  75% {
+    transform: translateX(-70%);
+  }
+  100% {
+    transform: translateX(-50%);
+  }
+}
\ No newline at end of file
diff --git a/MP.Mon/Components/DetailMSE.razor.less b/MP.Mon/Components/DetailMSE.razor.less
index a631b140..9ef253fc 100644
--- a/MP.Mon/Components/DetailMSE.razor.less
+++ b/MP.Mon/Components/DetailMSE.razor.less
@@ -4,9 +4,8 @@
     height: 1.5em;
     overflow: hidden;
     position: relative;
-    width: 70%;
+    width: 100%;
     white-space: nowrap;
-    /*display: inline-block;*/
 }
 
 .scroll-left span {
@@ -17,25 +16,33 @@
     margin: 0;
     line-height: 1.5em;
     /* Starting position */
-    -moz-transform: translateX(0%);
-    -webkit-transform: translateX(0%);
-    transform: translateX(0%);
+    -moz-transform: translateX(-50%);
+    -webkit-transform: translateX(-50%);
+    transform: translateX(-50%);
     /* Apply animation to this element */
-    -moz-animation: scroll-left 8s ease infinite;
-    -webkit-animation: scroll-left 8s ease infinite;
-    animation: scroll-left 8s ease infinite;
+    -moz-animation: scroll-left 20s ease infinite;
+    -webkit-animation: scroll-left 20s ease infinite;
+    animation: scroll-left 20s ease infinite;
 }
 /* Move it (define the animation) */
 @keyframes scroll-left {
     0% {
-        transform: translateX(0%);
+        transform: translateX(-50%);
     }
 
-    30% {
-        transform: translateX(0%);
+    25% {
+        transform: translateX(-30%);
     }
 
-    80% {
+    50% {
+        transform: translateX(-50%);
+    }
+
+    75% {
+        transform: translateX(-70%);
+    }
+
+    100% {
         transform: translateX(-50%);
     }
 }
diff --git a/MP.Mon/Components/DetailMSE.razor.min.css b/MP.Mon/Components/DetailMSE.razor.min.css
new file mode 100644
index 00000000..c469600b
--- /dev/null
+++ b/MP.Mon/Components/DetailMSE.razor.min.css
@@ -0,0 +1 @@
+﻿.scroll-left{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left 20s ease infinite;-webkit-animation:scroll-left 20s ease infinite;animation:scroll-left 20s ease infinite;}@keyframes scroll-left{0%{transform:translateX(-50%);}25%{transform:translateX(-30%);}50%{transform:translateX(-50%);}75%{transform:translateX(-70%);}100%{transform:translateX(-50%);}}
\ No newline at end of file
diff --git a/MP.Mon/MP.Mon.csproj b/MP.Mon/MP.Mon.csproj
index 1218efa6..bee37567 100644
--- a/MP.Mon/MP.Mon.csproj
+++ b/MP.Mon/MP.Mon.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>6.16.2403.417</Version>
+    <Version>6.16.2405.1719</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.Mon/Resources/ChangeLog.html b/MP.Mon/Resources/ChangeLog.html
index be6fc273..cdebf4c7 100644
--- a/MP.Mon/Resources/ChangeLog.html
+++ b/MP.Mon/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MON MAPO</i>
-    <h4>Versione: 6.16.2403.417</h4>
+    <h4>Versione: 6.16.2405.1719</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.Mon/Resources/VersNum.txt b/MP.Mon/Resources/VersNum.txt
index 598c2025..0678146b 100644
--- a/MP.Mon/Resources/VersNum.txt
+++ b/MP.Mon/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2403.417
+6.16.2405.1719
diff --git a/MP.Mon/Resources/manifest.xml b/MP.Mon/Resources/manifest.xml
index 3800737a..e6c55cc4 100644
--- a/MP.Mon/Resources/manifest.xml
+++ b/MP.Mon/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2403.417</version>
+  <version>6.16.2405.1719</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>
diff --git a/MP.Mon/appsettings.Production.json b/MP.Mon/appsettings.Production.json
index 83f72695..1e7ffaa9 100644
--- a/MP.Mon/appsettings.Production.json
+++ b/MP.Mon/appsettings.Production.json
@@ -16,6 +16,7 @@
   },
   "ServerConf": {
     "maxAge": "2000",
-    "cssOverlayOff": "bg-dark text-light bg-opacity-50"
+    "cssOverlayOff": "bg-dark text-light bg-opacity-50",
+    "maxChar4Scroll": 20
   }
 }
diff --git a/MP.Mon/appsettings.json b/MP.Mon/appsettings.json
index 2c39e694..52783bef 100644
--- a/MP.Mon/appsettings.json
+++ b/MP.Mon/appsettings.json
@@ -14,6 +14,7 @@
   },
   "ServerConf": {
     "maxAge": "2000",
-    "cssOverlayOff": "bg-dark text-light bg-opacity-50"
+    "cssOverlayOff": "bg-dark text-light bg-opacity-50",
+    "maxChar4Scroll": 20
   }
 }
diff --git a/MP.Mon/compilerconfig.json b/MP.Mon/compilerconfig.json
index caa3f6ec..16f25062 100644
--- a/MP.Mon/compilerconfig.json
+++ b/MP.Mon/compilerconfig.json
@@ -6,5 +6,9 @@
   {
     "outputFile": "wwwroot/css/fonts.css",
     "inputFile": "wwwroot/css/fonts.less"
+  },
+  {
+    "outputFile": "Components/DetailMSE.razor.css",
+    "inputFile": "Components/DetailMSE.razor.less"
   }
 ]
\ No newline at end of file
